Skip to content

Commit bc6f4ac

Browse files
committed
hp_procurve_show_lldp_info_local-device: drop unexercised System Description branches and rename MODEL to PID
1 parent ccbafd3 commit bc6f4ac

3 files changed

Lines changed: 4 additions & 5 deletions

File tree

ntc_templates/templates/hp_procurve_show_lldp_info_local-device.textfsm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Value CHASSIS_TYPE (\S.*\S)
22
Value CHASSIS_ID (\S.*\S)
33
Value SYSTEM_NAME (\S+)
44
Value SYSTEM_DESCRIPTION (\S.*\S)
5-
Value MODEL (\S+)
5+
Value PID (\S+)
66
Value CAPABILITIES_SUPPORTED (\S.*\S)
77
Value CAPABILITIES (\S.*\S)
88
Value MGMT_ADDRESS_TYPE (\S+)
@@ -13,8 +13,7 @@ Start
1313
^\s*Chassis\s+Type\s*:\s+${CHASSIS_TYPE}\s*$$
1414
^\s*Chassis\s+Id\s*:\s+${CHASSIS_ID}\s*$$
1515
^\s*System\s+Name\s*:\s+${SYSTEM_NAME}\s*$$
16-
^\s*System\s+Description\s*:\s+(?:ProCurve|HP|Aruba)\s+${MODEL}\s+${SYSTEM_DESCRIPTION}\s*$$
17-
^\s*System\s+Description\s*:\s+${SYSTEM_DESCRIPTION}\s*$$
16+
^\s*System\s+Description\s*:\s+(?:HP|Aruba)\s+${PID}\s+${SYSTEM_DESCRIPTION}\s*$$
1817
^\s*System\s+Capabilities\s+Supported\s*:\s+${CAPABILITIES_SUPPORTED}\s*$$
1918
^\s*System\s+Capabilities\s+Enabled\s*:\s+${CAPABILITIES}\s*$$
2019
^\s*Management\s+Address\s*:\s*$$

tests/hp_procurve/show_lldp_info_local-device/show_lldp_info_local-device.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ parsed_sample:
66
chassis_type: "mac-address"
77
mgmt_address: "192.0.2.1"
88
mgmt_address_type: "ipv4"
9-
model: "JL255A"
9+
pid: "JL255A"
1010
system_description: "2930F-24G-PoE+-4SFP+ Switch, revision W..."
1111
system_name: "SWITCH-1"

tests/hp_procurve/show_lldp_info_local-device/show_lldp_info_local-device2.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ parsed_sample:
66
chassis_type: "mac-address"
77
mgmt_address: "192.0.2.2"
88
mgmt_address_type: "ipv4"
9-
model: "J9774A"
9+
pid: "J9774A"
1010
system_description: "2530-8G-PoEP Switch, revision YA.16.10.002..."
1111
system_name: "SWITCH-2"

0 commit comments

Comments
 (0)