From 25c04cac4bb13e0068cc1cb066a9cecf9b50bcde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=BA=D0=BB=D1=8F=D1=80=D0=B5=D0=BD=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=9F=D0=B0=D0=B2=D0=B5=D0=BB?= <pskliarenko@bsh.ru>
Date: Mon, 6 Nov 2023 17:24:25 +0000
Subject: [PATCH] Hp comware display interface

---
 .../templates/hp_comware_display_interface.textfsm        | 4 ++--
 .../display_interface/hp_comware_display_interface.yml    | 8 ++++----
 .../display_interface/hp_comware_display_interface1.yml   | 2 +-
 .../display_interface/hp_comware_display_interface2.yml   | 6 +++---
 .../display_interface/hp_comware_display_interface3.yml   | 2 +-
 .../display_interface/hp_comware_display_interface4.yml   | 4 ++--
 .../display_interface/hp_comware_display_interface5.yml   | 2 +-
 .../display_interface/hp_comware_display_interface6.yml   | 2 +-
 .../display_interface/hp_comware_display_interface7.yml   | 2 +-
 .../display_interface/hp_comware_display_interface8.yml   | 6 +++---
 .../display_interface/hp_comware_display_interface9.yml   | 4 ++--
 11 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/ntc_templates/templates/hp_comware_display_interface.textfsm b/ntc_templates/templates/hp_comware_display_interface.textfsm
index a02694ae0a..6a06f3273e 100644
--- a/ntc_templates/templates/hp_comware_display_interface.textfsm
+++ b/ntc_templates/templates/hp_comware_display_interface.textfsm
@@ -10,7 +10,7 @@ Value BANDWIDTH (.*)
 Value DUPLEX (\S+)
 Value SPEED (\S+)
 Value PORT_LINK_TYPE (\S+)
-Value UNTAGGED_VLAN (\d+)
+Value UNTAGGED_VLAN_ID (\d+)
 Value VLAN_NATIVE (\d+)
 Value List VLAN_PASSING ([^,]+)
 Value List VLAN_PERMITTED ([^,]+)
@@ -38,7 +38,7 @@ Start
   ^\s*${SPEED},\s+${DUPLEX},\s+link\s+type
   ^\s*PVID:\s+${VLAN_NATIVE}
   ^\s*Port\s+link-type:\s+${PORT_LINK_TYPE}
-  ^\s*Un[Tt]agged\s+VLAN\s+ID\s*:\s*${UNTAGGED_VLAN}
+  ^\s*Un[Tt]agged\s+VLAN\s+ID\s*:\s*${UNTAGGED_VLAN_ID}
   # Trunk - Passing VLANs (parsing multiple times with Continue)
   ^\s+VLAN\s+[Pp]assing\s*:\s+${VLAN_PASSING},* -> Continue
   # Skip initial VLANs and read the Nth + 1
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface.yml b/tests/hp_comware/display_interface/hp_comware_display_interface.yml
index f82c87a5a4..d524930322 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface.yml
@@ -15,7 +15,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP"
     speed: ""
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
@@ -32,7 +32,7 @@ parsed_sample:
     port_link_type: "Trunk"
     protocol_status: "UP"
     speed: "40Gbps-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing:
       - "1(default vlan)"
@@ -55,7 +55,7 @@ parsed_sample:
     port_link_type: "Trunk"
     protocol_status: "DOWN"
     speed: "Unknown-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "2190"
     vlan_passing:
       - "2000"
@@ -77,7 +77,7 @@ parsed_sample:
     port_link_type: "Access"
     protocol_status: "DOWN"
     speed: "Unknown-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing: []
     vlan_permitted: []
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface1.yml b/tests/hp_comware/display_interface/hp_comware_display_interface1.yml
index 290aac0295..de09338d8e 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface1.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface1.yml
@@ -13,7 +13,7 @@ parsed_sample:
     port_link_type: "Trunk"
     protocol_status: ""
     speed: "160Gbps-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing:
       - "2-21"
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface2.yml b/tests/hp_comware/display_interface/hp_comware_display_interface2.yml
index 7c8e07268d..57c051e05f 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface2.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface2.yml
@@ -13,7 +13,7 @@ parsed_sample:
     port_link_type: "Access"
     protocol_status: "DOWN"
     speed: "Unknown-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing: []
     vlan_permitted: []
@@ -29,7 +29,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP(spoofing)"
     speed: ""
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
@@ -47,7 +47,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "DOWN"
     speed: "Unknown-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface3.yml b/tests/hp_comware/display_interface/hp_comware_display_interface3.yml
index 6875a29753..04fae527d5 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface3.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface3.yml
@@ -13,7 +13,7 @@ parsed_sample:
     port_link_type: "Trunk"
     protocol_status: ""
     speed: "20Gbps-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing:
       - "1(default vlan)"
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface4.yml b/tests/hp_comware/display_interface/hp_comware_display_interface4.yml
index 007ecbd7af..3aaeccc961 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface4.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface4.yml
@@ -13,7 +13,7 @@ parsed_sample:
     port_link_type: "trunk"
     protocol_status: ""
     speed: "20Gbps-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing:
       - "1(default vlan)"
@@ -37,7 +37,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP"
     speed: ""
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface5.yml b/tests/hp_comware/display_interface/hp_comware_display_interface5.yml
index 7a1d95bd55..acec875d20 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface5.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface5.yml
@@ -14,7 +14,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP"
     speed: "1000Mb/s"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface6.yml b/tests/hp_comware/display_interface/hp_comware_display_interface6.yml
index 2e729b40ad..12c464b637 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface6.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface6.yml
@@ -13,7 +13,7 @@ parsed_sample:
     port_link_type: "access"
     protocol_status: ""
     speed: "10Gbps-speed"
-    untagged_vlan: "1"
+    untagged_vlan_id: "1"
     vlan_native: "1"
     vlan_passing: []
     vlan_permitted: []
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface7.yml b/tests/hp_comware/display_interface/hp_comware_display_interface7.yml
index 11f6e69b43..beddd75f41 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface7.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface7.yml
@@ -13,7 +13,7 @@ parsed_sample:
     port_link_type: "Trunk"
     protocol_status: "UP"
     speed: "1000Mbps-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: "1"
     vlan_passing:
       - "4050"
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface8.yml b/tests/hp_comware/display_interface/hp_comware_display_interface8.yml
index 40c2755e58..baf98008e2 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface8.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface8.yml
@@ -12,7 +12,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: ""
     speed: ""
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
@@ -31,7 +31,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP"
     speed: "1000Mbps-speed"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
@@ -48,7 +48,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP"
     speed: ""
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
diff --git a/tests/hp_comware/display_interface/hp_comware_display_interface9.yml b/tests/hp_comware/display_interface/hp_comware_display_interface9.yml
index 20d649e578..cb36174850 100644
--- a/tests/hp_comware/display_interface/hp_comware_display_interface9.yml
+++ b/tests/hp_comware/display_interface/hp_comware_display_interface9.yml
@@ -14,7 +14,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "DOWN"
     speed: "1000M"
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []
@@ -31,7 +31,7 @@ parsed_sample:
     port_link_type: ""
     protocol_status: "UP"
     speed: ""
-    untagged_vlan: ""
+    untagged_vlan_id: ""
     vlan_native: ""
     vlan_passing: []
     vlan_permitted: []