From be0fcaffdbd90e6167dece73a802ec54cc50d316 Mon Sep 17 00:00:00 2001
From: Michael Bear <38406045+mjbear@users.noreply.github.com>
Date: Sun, 7 Jan 2024 00:09:06 -0500
Subject: [PATCH] fixing failed local merge in regard to huawei_vrp lldp

---
 .../huawei_vrp_display_lldp_neighbor.textfsm     |  2 +-
 .../huawei_vrp_display_lldp_neighbor1.yml        | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm
index 0afe3bf4e2..5bf9228860 100644
--- a/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm
+++ b/ntc_templates/templates/huawei_vrp_display_lldp_neighbor.textfsm
@@ -25,7 +25,7 @@ Start
   ^System\s+capabilities\s+supported
   ^System\s+capabilities\s+enabled\s+:${CAPABILITIES}\s*$$
   ^Management\s+address\s+type
-  ^Management\s+address\s*:\s*${MGMT_ADDRESS}
+  ^Management\s+address\s*(value\s*)?:\s*${MGMT_ADDRESS}
   ^Expired\s+time
   ^Port\s+VLAN\s+ID\(PVID\)\s+:${VLAN_ID}
   ^VLAN\s+name\s+of\s+VLAN
diff --git a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml
index 8667649a18..d66b5e0f64 100644
--- a/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml
+++ b/tests/huawei_vrp/display_lldp_neighbor/huawei_vrp_display_lldp_neighbor1.yml
@@ -3,16 +3,16 @@ parsed_sample:
   - capabilities: "bridge router"
     chassis_id: "b8d6-f6ff-7390"
     local_interface: "XGigabitEthernet0/0/1"
-    management_ip: "169.254.1.2"
-    manufacturer_name: ""
-    model_name: ""
-    neighbor: "ROUTER2"
-    neighbor_interface: "XGigabitEthernet0/0/2"
-    neighbor_port_id: "XGigabitEthernet0/0/2"
-    serial: ""
-    system_description:
+    manufacturer: ""
+    mgmt_address: "169.254.1.2"
+    neighbor_description:
       - "Huawei Switch S6730-S24X6Q"
       - "Huawei Versatile Routing Platform Software"
       - "VRP (R) software, Version 5.170 (S6730 V200R022C00SPC500)"
       - "Copyright (C) 2000-2022 HUAWEI TECH Co., Ltd."
+    neighbor_interface: "XGigabitEthernet0/0/2"
+    neighbor_name: "ROUTER2"
+    neighbor_port_id: "XGigabitEthernet0/0/2"
+    platform: ""
+    serial: ""
     vlan_id: "10"