From 4d8521e53da044fe87b2494284a1d0b6cef86b14 Mon Sep 17 00:00:00 2001
From: Michael Bear <38406045+mjbear@users.noreply.github.com>
Date: Fri, 8 Sep 2023 12:04:23 -0400
Subject: [PATCH] modify index to support singular or plural lldp neighbor
 command for aruba_aoscx

---
 ntc_templates/templates/index                 |  2 +-
 .../cisco_xr_show_cdp_neighbors_detail.yml    | 72 -------------------
 2 files changed, 1 insertion(+), 73 deletions(-)

diff --git a/ntc_templates/templates/index b/ntc_templates/templates/index
index f51ffea110..3b43239011 100644
--- a/ntc_templates/templates/index
+++ b/ntc_templates/templates/index
@@ -90,7 +90,7 @@ arista_eos_show_vlan.textfsm, .*, arista_eos, sh[[ow]] vl[[an]]
 arista_eos_show_vrf.textfsm, .*, arista_eos, sh[[ow]] vrf
 
 aruba_aoscx_show_aaa_authentication_port-access_interface_all_client-status.textfsm , .*, aruba_aoscx, sh[[ow]] aa[[a]] authe[[ntication]] port-access interface all client-status
-aruba_aoscx_show_lldp_neighbors-info_detail.textfsm, .*, aruba_aoscx, sh[[ow]] ll[[dp]] nei[[ghbors-info]] d[[etail]]
+aruba_aoscx_show_lldp_neighbors-info_detail.textfsm, .*, aruba_aoscx, sh[[ow]] ll[[dp]] nei[[ghbor]]s?[[-info]] d[[etail]]
 aruba_aoscx_show_bgp_all-vrfs_all_summary.textfsm, .*, aruba_aoscx, sh[[ow]] bgp all-[[vrfs]] a[[ll]] s[[ummary]]
 aruba_aoscx_show_interface_dom_detail.textfsm , .*, aruba_aoscx, sh[[ow]] int[[erface]] dom d[[etail]]
 aruba_aoscx_show_ip_route_all-vrfs.textfsm, .*, aruba_aoscx, sh[[ow]] ip r[[oute]] a[[ll-vrfs]]
diff --git a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml
index aa9a539e56..b06f904e7f 100644
--- a/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml
+++ b/tests/cisco_xr/show_cdp_neighbors_detail/cisco_xr_show_cdp_neighbors_detail.yml
@@ -4,11 +4,8 @@ parsed_sample:
     chassis_id: "nyc-dc-dcm005.ntc.com"
     local_interface: "MgmtEth0/RSP0/CPU0/0"
     mgmt_address: "10.100.1.54"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\
       \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "GigabitEthernet1/9"
     neighbor_name: ""
     platform: "cisco WS-C4948E"
@@ -16,11 +13,8 @@ parsed_sample:
     chassis_id: "nyc-dc-dcm006.ntc.com"
     local_interface: "MgmtEth0/RSP1/CPU0/0"
     mgmt_address: "10.100.1.55"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch Software (cat4500e-ENTSERVICESK9-M),\
       \ Version 15.0(2)SG10, RELEASE SOFTWARE (fc1)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "GigabitEthernet1/9"
     neighbor_name: ""
     platform: "cisco WS-C4948E"
@@ -28,10 +22,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c90.ntc.com"
     local_interface: "FortyGigE0/0/1/0"
     mgmt_address: "10.100.100.141"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/0/0/2"
     neighbor_name: "nyc-dc-c90.ntc.com"
     platform: "cisco CRS"
@@ -39,11 +30,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d02.ntc.com(FXS182XXXXX)"
     local_interface: "FortyGigE0/0/1/1"
     mgmt_address: "10.100.100.162"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet6/1"
     neighbor_name: "nyc-dc-d02"
     platform: "N77-C7706"
@@ -51,10 +39,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c97"
     local_interface: "FortyGigE0/0/0/0"
     mgmt_address: "10.100.100.19"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/0/0/0"
     neighbor_name: "nyc-dc-c97"
     platform: "cisco ASR9K Series"
@@ -62,10 +47,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c91.ntc.com"
     local_interface: "FortyGigE0/0/0/1"
     mgmt_address: "10.100.100.125"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/0/0/2"
     neighbor_name: "nyc-dc-c91.ntc.com"
     platform: "cisco CRS"
@@ -73,10 +55,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c97"
     local_interface: "FortyGigE0/1/0/0"
     mgmt_address: "10.100.100.113"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/1/0/0"
     neighbor_name: "nyc-dc-c97"
     platform: "cisco ASR9K Series"
@@ -84,11 +63,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d03.ntc.com(FXS182XXXXX)"
     local_interface: "FortyGigE0/1/0/1"
     mgmt_address: "10.100.100.190"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet6/1"
     neighbor_name: "nyc-dc-d03"
     platform: "N77-C7706"
@@ -96,10 +72,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c90.ntc.com"
     local_interface: "FortyGigE0/1/1/0"
     mgmt_address: "10.100.100.145"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/4/0/2"
     neighbor_name: "nyc-dc-c90.ntc.com"
     platform: "cisco CRS"
@@ -107,11 +80,8 @@ parsed_sample:
     chassis_id: "nyc-dc-z50a.ntc.com(JAF18XXXXX)"
     local_interface: "FortyGigE0/1/1/1"
     mgmt_address: "10.100.100.116"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet4/3"
     neighbor_name: "nyc-dc-z50a"
     platform: "N77-C7710"
@@ -119,11 +89,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d04.ntc.com(FXS18XXXXXX)"
     local_interface: "FortyGigE0/2/1/0"
     mgmt_address: "10.100.100.194"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet6/1"
     neighbor_name: "nyc-dc-d04"
     platform: "N77-C7706"
@@ -131,10 +98,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c91.ntc.com"
     local_interface: "FortyGigE0/2/1/1"
     mgmt_address: "10.100.100.129"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.1.2[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/4/0/2"
     neighbor_name: "nyc-dc-c91.ntc.com"
     platform: "cisco CRS"
@@ -142,11 +106,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d01.ntc.com(FXS182XXXXX)"
     local_interface: "FortyGigE0/2/0/0"
     mgmt_address: "10.100.100.158"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet6/1"
     neighbor_name: "nyc-dc-d01"
     platform: "N77-C7706"
@@ -154,11 +115,8 @@ parsed_sample:
     chassis_id: "nyc-dc-z50b.ntc.com(JAF181XXXXX)"
     local_interface: "FortyGigE0/2/0/1"
     mgmt_address: "10.100.100.111"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet4/3"
     neighbor_name: "nyc-dc-z50b"
     platform: "N77-C7710"
@@ -166,11 +124,8 @@ parsed_sample:
     chassis_id: "nyc-dc-dcc001.ntc.com"
     local_interface: "TenGigE0/3/0/0"
     mgmt_address: "10.100.100.174"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch  Software (cat4500e-UNIVERSALK9-M),\
       \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "TenGigabitEthernet6/1"
     neighbor_name: ""
     platform: "cisco WS-C4510R+E"
@@ -178,10 +133,7 @@ parsed_sample:
     chassis_id: "nyc-dc-d57"
     local_interface: "TenGigE0/3/0/1"
     mgmt_address: "10.100.100.115"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 4.3.2[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "TenGigE0/2/0/0"
     neighbor_name: "nyc-dc-d57"
     platform: "cisco ASR9K Series"
@@ -189,11 +141,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d40b.ntc.com(JAF182XXXXX)"
     local_interface: "TenGigE0/3/0/2"
     mgmt_address: "10.100.100.114"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet4/1"
     neighbor_name: "nyc-dc-d40b"
     platform: "N77-C7710"
@@ -201,11 +150,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d80.ntc.com(FOC184XXXXX)"
     local_interface: "TenGigE0/3/0/3"
     mgmt_address: "10.100.100.117"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 7.0(7)N1(1)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet2/1"
     neighbor_name: "nyc-dc-d80"
     platform: "N5K-C56128P"
@@ -213,11 +159,8 @@ parsed_sample:
     chassis_id: "nyc-dc-dcc002.ntc.com"
     local_interface: "TenGigE0/4/0/0"
     mgmt_address: "10.100.100.178"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS Software, Catalyst 4500 L3 Switch  Software (cat4500e-UNIVERSALK9-M),\
       \ Version 15.2(2)E3, RELEASE SOFTWARE (fc3)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "TenGigabitEthernet6/1"
     neighbor_name: ""
     platform: "cisco WS-C4510R+E"
@@ -225,10 +168,7 @@ parsed_sample:
     chassis_id: "nyc-dc-d57"
     local_interface: "TenGigE0/4/0/1"
     mgmt_address: "10.100.100.115"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 4.3.2[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "TenGigE1/2/0/0"
     neighbor_name: "nyc-dc-d57"
     platform: "cisco ASR9K Series"
@@ -236,11 +176,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d40a.ntc.com(JAF182XXXXX)"
     local_interface: "TenGigE0/4/0/2"
     mgmt_address: "10.100.100.113"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 6.2(12)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet4/1"
     neighbor_name: "nyc-dc-d40a"
     platform: "N77-C7710"
@@ -248,11 +185,8 @@ parsed_sample:
     chassis_id: "nyc-dc-d81.ntc.com(FOC182XXXXX)"
     local_interface: "TenGigE0/4/0/3"
     mgmt_address: "10.100.100.118"
-<<<<<<< HEAD
     neighbor_description: "Cisco Nexus Operating System (NX-OS) Software, Version\
       \ 7.0(7)N1(1)"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "Ethernet1/1"
     neighbor_name: "nyc-dc-d81"
     platform: "N5K-C56128P"
@@ -260,10 +194,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c97"
     local_interface: "FortyGigE0/6/0/0"
     mgmt_address: "192.168.169.21"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/6/0/0"
     neighbor_name: "nyc-dc-c97"
     platform: "cisco ASR9K Series"
@@ -271,10 +202,7 @@ parsed_sample:
     chassis_id: "nyc-dc-c97"
     local_interface: "FortyGigE0/6/0/0"
     mgmt_address: "192.168.169.21"
-<<<<<<< HEAD
     neighbor_description: "Cisco IOS XR Software, Version 5.3.4[Default]"
-=======
->>>>>>> 0f75a57 (normalize management address capture groups in CDP/LLDP templates)
     neighbor_interface: "FortyGigE0/7/0/0"
     neighbor_name: "nyc-dc-c97"
     platform: "cisco ASR9K Series"