Improve Alcatel AOS show lldp remote-system

ntc_templates/templates/alcatel_aos_show_lldp_remote-system.textfsm

@@ -7,7 +7,7 @@ Value CHASSIS_SUBTYPE (.+?)
 Value PORT_SUBTYPE (.+?)
 Value NEIGHBOR_INTERFACE (.+?)
 Value NEIGHBOR_NAME (.+?)
-Value NEIGHBOR_DESCRIPTION (.+?)
+Value List NEIGHBOR_DESCRIPTION (\S.+\S)
 Value CAPABILITIES_SUPPORTED (.+?)
 Value CAPABILITIES_ENABLED (.+?)
 Value MGMT_ADDRESS (.+?)
@@ -18,8 +18,11 @@ Value POWER_DEVICE_TYPE (.+?)
 Value POWER_SOURCE (.+?)
 Value POWER_PRIORITY (.+?)
 Value POWER_REQUESTED (.+?)
-Value REMOTE_PORT_MAC_PHY_AUTONEG (.+?)
-Value MAU_TYPE (.+?)
+Value REMOTE_PORT_MAC_PHY_AUTONEG (\S.+\S)
+Value VLAN_ID (\d+)
+Value PROTOCOL_VLAN_ID (\S.+\S)
+Value VLAN_NAME (\S.+\S)
+Value MAU_TYPE (\S.+\S)
 
 Start
   ^\s*Remote\s+LLDP\s+nearest-bridge\s+Agents\s+on\s+Local\s+Port\s+${LOCAL_INTERFACE}:\s*$$
@@ -34,7 +37,7 @@ LLDP
   ^\s*Port\s+Subtype\s+=\s+${PORT_SUBTYPE},?\s*$$
   ^\s*Port\s+Description\s+=\s+(\(null\)|${NEIGHBOR_INTERFACE}),?\s*$$
   ^\s*System\s+Name\s+=\s+${NEIGHBOR_NAME},?\s*$$
-  ^\s*System\s+Description\s+=\s+(\(null\)|${NEIGHBOR_DESCRIPTION}),?\s*$$
+  ^\s*System\s+Description\s+=\s+(\(null\)|${NEIGHBOR_DESCRIPTION}),?\s*$$ -> Description
   ^\s*Capabilities\s+Supported\s+=\s+${CAPABILITIES_SUPPORTED},?\s*$$
   ^\s*Capabilities\s+Enabled\s+=\s+${CAPABILITIES_ENABLED},?\s*$$
   ^\s*Management\s+IP\s+Address\s+=\s+${MGMT_ADDRESS},?\s*$$
@@ -47,6 +50,15 @@ LLDP
   ^\s*MED\s+Power\s+Value\s+=\s+${POWER_REQUESTED},?\s*$$
   ^\s*Remote\s+port\s+MAC\/PHY\s+AutoNeg\s+=\s+${REMOTE_PORT_MAC_PHY_AUTONEG},?\s*$$
   ^\s*Remote\s+port\s+default\s+vlan
+  ^\s*Vlan\s+ID\s+=\s+${VLAN_ID},?\s*$$
+  ^\s*Vlan\s+Name\s+=\s+${VLAN_NAME},?\s*$$
+  ^\s*Protocol\s+vlan\s+Id\s+=\s+${PROTOCOL_VLAN_ID},?\s*$$
   ^\s*Mau\s+Type\s+=\s+${MAU_TYPE},?\s*$$
   ^\s*$$ -> Record Start
   ^.*$$ -> Error
+
+Description
+  ^\s*Capabilities\s+Supported\s+=\s+${CAPABILITIES_SUPPORTED},?\s*$$ -> LLDP
+  ^\s*${NEIGHBOR_DESCRIPTION},?\s*$$
+  ^\s+$$
+  ^. -> Error

tests/alcatel_aos/show_lldp_remote-system/show_lldp_remote-system_R6.raw

@@ -71,3 +71,24 @@ Remote LLDP Agents on Local Slot/Port 1/4:
       Capabilities Enabled        = Bridge Router,
       Management IP Address       = 1.1.1.1
 
+Remote LLDP Agents on Local Slot/Port 1/24:
+
+    Chassis aa:aa:aa:aa:aa:aa, Port GigabitEthernet0/0/47:
+      Remote ID                   = 223,
+      Chassis Subtype             = 4 (MAC Address),
+      Port Subtype                = 5 (Interface name),
+      Port Description            = UPLINK,
+      System Name                 = super_mega_switch,
+      System Description          = S5700-52P-PWR-LI-AC
+Huawei Versatile Routing Platform Software
+VRP (R) software, Version 1.110 (S5700 A000A000A00AAA000)
+Copyright (C) 2000-2001 HUAWEI TECH Co., Ltd.,
+      Capabilities Supported      = Bridge Router,
+      Capabilities Enabled        = Bridge Router,
+      Management IP Address       = 1.1.1.1
+      Remote port default vlan    = 2000,
+      Vlan ID                     = 1,
+      Vlan Name                   = VLAN 0001,
+      Protocol vlan Id            = 0 (Flags = 0),
+      Remote port MAC/PHY AutoNeg = Supported Enabled Capability 0xa03e,
+      Mau Type                    = 1000BaseTFD - Four-pair Category 5 UTP full duplex mode

tests/alcatel_aos/show_lldp_remote-system/show_lldp_remote-system_R6.yml

@@ -11,16 +11,20 @@ parsed_sample:
     med_device_type: "Network Connectivity"
     med_extension_tlvs_present: "Network Policy| Inventory"
     mgmt_address: "1.1.1.1"
-    neighbor_description: "Alcatel-Lucent Enterprise OAW-AP1201H 1.0.0.10"
+    neighbor_description:
+      - "Alcatel-Lucent Enterprise OAW-AP1201H 1.0.0.10,"
     neighbor_interface: "Alcatel-Lucent Enterprise OAW-AP1201H eth0-4094"
     neighbor_name: "AP"
     port_subtype: "1 (MAC address)"
     power_device_type: "PD Device"
     power_priority: "Low"
     power_requested: "25.4 W"
     power_source: "PSE and Local"
+    protocol_vlan_id: ""
     remote_id: "1"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Bridge WLAN AP Router"
     capabilities_supported: "Bridge WLAN AP Router Station Only"
     chassis_id: "aa:aa:aa:aa:aa:aa"
@@ -32,16 +36,20 @@ parsed_sample:
     med_device_type: "Network Connectivity"
     med_extension_tlvs_present: "Network Policy| Inventory"
     mgmt_address: "1.1.1.1"
-    neighbor_description: "Alcatel-Lucent Enterprise OAW-AP1321 1.0.0.10"
+    neighbor_description:
+      - "Alcatel-Lucent Enterprise OAW-AP1321 1.0.0.10,"
     neighbor_interface: "Alcatel-Lucent Enterprise OAW-AP1321 eth1"
     neighbor_name: "AP"
     port_subtype: "1 (MAC address)"
     power_device_type: "PD Device"
     power_priority: "Low"
     power_requested: "25.4 W"
     power_source: "PSE and Local"
+    protocol_vlan_id: ""
     remote_id: "1"
-    remote_port_mac_phy_autoneg: "Supported Enabled Capability 0x8336"
+    remote_port_mac_phy_autoneg: "Supported Enabled Capability 0x8336,"
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Bridge WLAN AP Router"
     capabilities_supported: "Bridge WLAN AP Router Station Only"
     chassis_id: "aa:aa:aa:aa:aa:aa"
@@ -53,16 +61,20 @@ parsed_sample:
     med_device_type: "Network Connectivity"
     med_extension_tlvs_present: "Network Policy| Inventory"
     mgmt_address: "1.1.1.1"
-    neighbor_description: "Alcatel-Lucent Enterprise OAW-AP1361 1.0.0.10"
+    neighbor_description:
+      - "Alcatel-Lucent Enterprise OAW-AP1361 1.0.0.10,"
     neighbor_interface: "Alcatel-Lucent Enterprise OAW-AP1361 eth0"
     neighbor_name: "AP"
     port_subtype: "1 (MAC address)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "1"
-    remote_port_mac_phy_autoneg: "Supported Enabled Capability 0x8337"
+    remote_port_mac_phy_autoneg: "Supported Enabled Capability 0x8337,"
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Bridge Router"
     capabilities_supported: "Bridge Router"
     chassis_id: "aa:aa:aa:aa:aa:aa"
@@ -74,13 +86,45 @@ parsed_sample:
     med_device_type: ""
     med_extension_tlvs_present: ""
     mgmt_address: "1.1.1.1"
-    neighbor_description: ""
+    neighbor_description:
+      - "None"
     neighbor_interface: "Alcatel-Lucent OS6860 GNI 1/1/1"
     neighbor_name: "SW"
     port_subtype: "1 (Locally assigned)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "123"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""
+  - capabilities_enabled: "Bridge Router"
+    capabilities_supported: "Bridge Router"
+    chassis_id: "aa:aa:aa:aa:aa:aa"
+    chassis_subtype: "4 (MAC Address)"
+    local_interface: "1/24"
+    mac_address: "GigabitEthernet0/0/47"
+    mau_type: "1000BaseTFD - Four-pair Category 5 UTP full duplex mode"
+    med_capabilities: ""
+    med_device_type: ""
+    med_extension_tlvs_present: ""
+    mgmt_address: "1.1.1.1"
+    neighbor_description:
+      - "S5700-52P-PWR-LI-AC"
+      - "Huawei Versatile Routing Platform Software"
+      - "VRP (R) software, Version 1.110 (S5700 A000A000A00AAA000)"
+      - "Copyright (C) 2000-2001 HUAWEI TECH Co., Ltd.,"
+    neighbor_interface: "UPLINK"
+    neighbor_name: "super_mega_switch"
+    port_subtype: "5 (Interface name)"
+    power_device_type: ""
+    power_priority: ""
+    power_requested: ""
+    power_source: ""
+    protocol_vlan_id: "0 (Flags = 0),"
+    remote_id: "223"
+    remote_port_mac_phy_autoneg: "Supported Enabled Capability 0xa03e,"
+    vlan_id: "1"
+    vlan_name: "VLAN 0001,"

tests/alcatel_aos/show_lldp_remote-system/show_lldp_remote-system_R8.yml

@@ -11,16 +11,20 @@ parsed_sample:
     med_device_type: ""
     med_extension_tlvs_present: ""
     mgmt_address: "1.1.1.1"
-    neighbor_description: ""
+    neighbor_description:
+      - "None"
     neighbor_interface: "Alcatel-Lucent Enterprise 1/1"
     neighbor_name: "SW"
     port_subtype: "3 (Locally assigned)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "1"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Bridge Router"
     capabilities_supported: "Bridge Router"
     chassis_id: "aa:aa:aa:aa:aa:aa"
@@ -32,16 +36,20 @@ parsed_sample:
     med_device_type: ""
     med_extension_tlvs_present: ""
     mgmt_address: "1.1.1.1"
-    neighbor_description: ""
+    neighbor_description:
+      - "None"
     neighbor_interface: "Alcatel-Lucent OS6360 GNI 1/1/1"
     neighbor_name: "SW"
     port_subtype: "3 (Locally assigned)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "1"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Router"
     capabilities_supported: "Bridge Router"
     chassis_id: "aa:aa:aa:aa:aa:aa"
@@ -53,16 +61,20 @@ parsed_sample:
     med_device_type: ""
     med_extension_tlvs_present: ""
     mgmt_address: "1.1.1.1"
-    neighbor_description: "Mikrotik RouterOS 1.1 (stable) Jan/1/2000 01:01:01 RB1100AHx4"
+    neighbor_description:
+      - "Mikrotik RouterOS 1.1 (stable) Jan/1/2000 01:01:01 RB1100AHx4,"
     neighbor_interface: ""
     neighbor_name: "SomeSystem_that_has_FW"
     port_subtype: "3 (Interface name)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "1"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Router"
     capabilities_supported: "Bridge Router"
     chassis_id: "bb:bb:bb:bb:bb:bb"
@@ -74,16 +86,20 @@ parsed_sample:
     med_device_type: ""
     med_extension_tlvs_present: ""
     mgmt_address: "1.1.1.1"
-    neighbor_description: "Mikrotik RouterOS 1.1 (stable) Jan/1/2000 01:01:01 RB1100AHx4"
+    neighbor_description:
+      - "Mikrotik RouterOS 1.1 (stable) Jan/1/2000 01:01:01 RB1100AHx4,"
     neighbor_interface: ""
     neighbor_name: "SomeSystem_that_has_FW"
     port_subtype: "3 (Interface name)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "1"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""
   - capabilities_enabled: "Router"
     capabilities_supported: "Bridge Router"
     chassis_id: "cc:cc:cc:cc:cc:cc"
@@ -95,13 +111,17 @@ parsed_sample:
     med_device_type: ""
     med_extension_tlvs_present: ""
     mgmt_address: ""
-    neighbor_description: "Mikrotik RouterOS 1.1 (stable) Jan/1/2000 01:01:01 RB1100AHx4"
+    neighbor_description:
+      - "Mikrotik RouterOS 1.1 (stable) Jan/1/2000 01:01:01 RB1100AHx4,"
     neighbor_interface: ""
     neighbor_name: "SomeSystem_that_has_FW"
     port_subtype: "3 (Interface name)"
     power_device_type: ""
     power_priority: ""
     power_requested: ""
     power_source: ""
+    protocol_vlan_id: ""
     remote_id: "1"
     remote_port_mac_phy_autoneg: ""
+    vlan_id: ""
+    vlan_name: ""