Fix aruba aoscx lldp issue1453

docs/dev/data_model.md

@@ -43,7 +43,7 @@ Example: Imagine the extra programming logic needed to consume structured data w
 | `MAC_ADDRESS`                    | instead of MAC or MACADDR |
 | `MEMBER_INTERFACE`               | list of physical member interface names that are bundled to make an etherchannel, LACP, LAG, or port-channel interface |
 | `MEMBER_INTERFACE_STATUS`        | list of member interface statuses for an etherchannel, LACP, LAG, or port-channel interface |
-| `MGMT_ADDRESS`                   | management address, used when data could be an Ethernet MAC address or an IP address (ex: CDP or LLDP templates) |
+| `MGMT_ADDRESS`                   | management address, used when data could be an ***Ethernet MAC address or an IP address*** (ex: CDP or LLDP templates) |
 | `MGMT_IP_ADDRESS`                | instead of MGMT_IP or MGMT_ADDRESS or MANAGEMENT_IP or REMOTE_MANAGEMENT_ADDRESS |
 | `NEIGHBOR_DESCRIPTION`           | often represents CDP or LLDP neighbor or system name description |
 | `NEIGHBOR_ID`                    | for router IDs remote to the system being parsed |

ntc_templates/templates/aruba_aoscx_show_lldp_neighbors-info_detail.textfsm

@@ -11,10 +11,8 @@ Value NEIGHBOR_INTERFACE (\S+)
 
 Start
   ^Port\s*:\s*${LOCAL_INTERFACE}
-  ^Neighbor\s*Chassis-Name\s*:\s*${NEIGHBOR_NAME}
-  ^Neighbor\s+System-Name\s*:\s*${NEIGHBOR_NAME}
-  ^Neighbor\s*Chassis-Description\s*:\s*${NEIGHBOR_DESCRIPTION}
-  ^Neighbor\s+System-Description\s*:\s*${NEIGHBOR_DESCRIPTION}
+  ^Neighbor\s*(Chassis|System)-Name\s*:\s*${NEIGHBOR_NAME}
+  ^Neighbor\s*(Chassis|System)-Description\s*:\s*${NEIGHBOR_DESCRIPTION}
   ^Neighbor\s*Chassis-ID\s*:\s*${CHASSIS_ID}
   ^Neighbor\s*Management-Address\s*:\s*${MGMT_ADDRESS}
   ^Chassis\s*Capabilities\s*Available\s*:\s*${CAPABILITIES_SUPPORTED}

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]]

ntc_templates/templates/juniper_junos_show_lldp_neighbors.textfsm

@@ -8,4 +8,4 @@ Start
   ^Local\s+Interface\s+Parent\s+Interface\s+Chassis\s+Id\s+Port\s+info\s+System\s+Name
   ^${LOCAL_INTERFACE}\s*${PARENT_INTERFACE}\s+${CHASSIS_ID}\s+${NEIGHBOR_INTERFACE}\s+${NEIGHBOR_NAME} -> Record
   ^\s*$$
-  ^. -> Error
+  ^. -> Error

tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_issue1453.raw

@@ -0,0 +1,132 @@
+SWITCH-NAME# show lldp neighbor-info detail
+--------------------------------------------------------------------------------
+LLDP Neighbor Information
+=========================
+
+Total Neighbor Entries          : 3
+Total Neighbor Entries Deleted  : 0
+Total Neighbor Entries Dropped  : 0
+Total Neighbor Entries Aged-Out : 0
+
+--------------------------------------------------------------------------------
+
+Port                           : 1/1/10
+Neighbor Entries               : 1
+Neighbor Entries Deleted       : 0
+Neighbor Entries Dropped       : 0
+Neighbor Entries Aged-Out      : 0
+Neighbor System-Name           : SYSNAME_TEXT
+Neighbor System-Description    : ArubaOS (MODEL: 503H), Version Aruba AP
+Neighbor Chassis-ID            : xx:xx:xx:xx:xx:xx
+Neighbor Management-Address    : 123.123.123.123
+Chassis Capabilities Available : Bridge, WLAN
+Chassis Capabilities Enabled   : WLAN
+Neighbor Port-ID               : xx:xx:xx:xx:xx:xx
+Neighbor Port-Desc             : eth0
+Neighbor Port VLAN ID          : 1
+TTL                            : 120
+
+Neighbor Mac-Phy details
+Neighbor Auto-neg Supported    : true
+Neighbor Auto-Neg Enabled      : true
+Neighbor Auto-Neg Advertised   : 1000 BASE_TFD, 100 BASE_TXFD, 100 BASE_TX, 10 BASET_FD, 10 BASE_T
+Neighbor MAU type              : 1000 BASETFD
+
+Neighbor EEE information       : DOT3
+Neighbor TX Wake time          : 0 us
+Neighbor RX Wake time          : 0 us
+Neighbor Fallback time         : 0 us
+Neighbor TX Echo time          : 0 us
+Neighbor RX Echo time          : 0 us
+
+--------------------------------------------------------------------------------
+
+Port                           : 1/1/11
+Neighbor Entries               : 1
+Neighbor Entries Deleted       : 0
+Neighbor Entries Dropped       : 0
+Neighbor Entries Aged-Out      : 0
+Neighbor System-Name           : AP3-4-3
+Neighbor System-Description    : ArubaOS (MODEL: 315), Version Aruba AP
+Neighbor Chassis-ID            : xx:xx:xx:xx:xx:xx
+Neighbor Management-Address    : 123.123.123.123
+Chassis Capabilities Available : Bridge, WLAN
+Chassis Capabilities Enabled   : WLAN
+Neighbor Port-ID               : xx:xx:xx:xx:xx:xx
+Neighbor Port-Desc             : bond0
+Neighbor Port VLAN ID          : 1
+TTL                            : 120
+
+Neighbor PoE information       : DOT3
+Neighbor Power Type            : Type 2 PD
+Neighbor Power Priority        : Unknown
+Neighbor Power Source          : PSE
+PD Requested Power Value       : 20.80 W
+PSE Allocated Power Value      : 20.80 W
+Neighbor Power Supported       : No
+Neighbor Power Enabled         : No
+Neighbor Power Class           : Class4
+Neighbor Power Paircontrol     : No
+PSE Power Pairs                : SIGNAL
+Neighbor Power Down Request    :
+PD Associated TLV              : dot3
+PD Requested TLV types         : dot3
+
+Neighbor Mac-Phy details
+Neighbor Auto-neg Supported    : true
+Neighbor Auto-Neg Enabled      : true
+Neighbor Auto-Neg Advertised   : 1000 BASE_TFD, 100 BASE_TXFD, 100 BASE_TX, 10 BASET_FD, 10 BASE_T
+Neighbor MAU type              : 1000 BASETFD
+
+Neighbor EEE information       : DOT3
+Neighbor TX Wake time          : 0 us
+Neighbor RX Wake time          : 0 us
+Neighbor Fallback time         : 0 us
+Neighbor TX Echo time          : 0 us
+Neighbor RX Echo time          : 0 us
+
+--------------------------------------------------------------------------------
+
+Port                           : 1/1/12
+Neighbor Entries               : 1
+Neighbor Entries Deleted       : 0
+Neighbor Entries Dropped       : 0
+Neighbor Entries Aged-Out      : 0
+Neighbor System-Name           : SYSNAME_TEXT
+Neighbor System-Description    : HP J9851A Switch 5412Rzl2, revision KB.16.10.0020, ROM KB.16.01.0009 (/ws/swbuildm/rel_ajanta_qaoff/code/build/bom(swbuildm_rel_ajanta_qaoff_rel_ajanta))
+Neighbor Chassis-ID            : xx:xx:xx:xx:xx:xx
+Neighbor Management-Address    : 123.123.123.123
+Chassis Capabilities Available : Bridge, Router
+Chassis Capabilities Enabled   : Bridge
+Neighbor Port-ID               : 106
+Neighbor Port-Desc             : D10
+Neighbor Port VLAN ID          : 61
+TTL                            : 120
+
+Neighbor PoE information       : DOT3
+Neighbor Power Type            : PSE
+Neighbor Power Priority        : Unknown
+Neighbor Power Source          : Unknown
+PD Requested Power Value       : 0.00 W
+PSE Allocated Power Value      : 0.00 W
+Neighbor Power Supported       : Yes
+Neighbor Power Enabled         : Yes
+Neighbor Power Class           : Class0
+Neighbor Power Paircontrol     : No
+PSE Power Pairs                : SIGNAL
+Neighbor Power Down Request    :
+PD Associated TLV              : dot3
+PD Requested TLV types         : None
+
+Neighbor Mac-Phy details
+Neighbor Auto-neg Supported    : true
+Neighbor Auto-Neg Enabled      : true
+Neighbor Auto-Neg Advertised   : 1000 BASE_TFD, 100 BASE_TXFD, 100 BASE_TX, 10 BASET_FD, 10 BASE_T
+Neighbor MAU type              : 1000 BASETFD
+
+Neighbor EEE information       : DOT3
+Neighbor TX Wake time          : 0 us
+Neighbor RX Wake time          : 0 us
+Neighbor Fallback time         : 0 us
+Neighbor TX Echo time          : 0 us
+Neighbor RX Echo time          : 0 us

tests/aruba_aoscx/show_lldp_neighbors-info_detail/show_lldp_neighbors-info_detail_issue1453.yml

@@ -0,0 +1,30 @@
+---
+parsed_sample:
+  - capabilities: "WLAN"
+    capabilities_supported: "Bridge, WLAN"
+    chassis_id: "xx:xx:xx:xx:xx:xx"
+    local_interface: "1/1/10"
+    mgmt_address: "123.123.123.123"
+    neighbor_description: "ArubaOS (MODEL: 503H), Version Aruba AP"
+    neighbor_interface: "eth0"
+    neighbor_name: "SYSNAME_TEXT"
+    neighbor_port_id: "xx:xx:xx:xx:xx:xx"
+  - capabilities: "WLAN"
+    capabilities_supported: "Bridge, WLAN"
+    chassis_id: "xx:xx:xx:xx:xx:xx"
+    local_interface: "1/1/11"
+    mgmt_address: "123.123.123.123"
+    neighbor_description: "ArubaOS (MODEL: 315), Version Aruba AP"
+    neighbor_interface: "bond0"
+    neighbor_name: "AP3-4-3"
+    neighbor_port_id: "xx:xx:xx:xx:xx:xx"
+  - capabilities: "Bridge"
+    capabilities_supported: "Bridge, Router"
+    chassis_id: "xx:xx:xx:xx:xx:xx"
+    local_interface: "1/1/12"
+    mgmt_address: "123.123.123.123"
+    neighbor_description: "HP J9851A Switch 5412Rzl2, revision KB.16.10.0020, ROM\
+      \ KB.16.01.0009 (/ws/swbuildm/rel_ajanta_qaoff/code/build/bom(swbuildm_rel_ajanta_qaoff_rel_ajanta))"
+    neighbor_interface: "D10"
+    neighbor_name: "SYSNAME_TEXT"
+    neighbor_port_id: "106"