Update display_vlan_all for Comware5 variations

ntc_templates/templates/hp_comware_display_vlan_all.textfsm

@@ -12,12 +12,15 @@ Start
   ^\s*VLAN\s+[Tt]ype\s*:\s*${TYPE}
   ^\s*Route\s+[Ii]nterface\s*:\s*${ROUTE_INTERFACE}
   ^\s*IPv4\s+[Aa]ddress\s*:\s*${IPV4_ADDRESS}
+  ^\s*IP\s+[Aa]ddress\s*:\s*${IPV4_ADDRESS}
   ^\s*IPv4\s+[Ss]ubnet\s+mask\s*:\s*${IPV4_SUBNET}
+  ^\s*[Ss]ubnet\s+[Mm]ask\s*:\s*${IPV4_SUBNET}
   ^\s*Description\s*:\s*${DESCRIPTION}
   ^\s*Name\s*:\s*${VLAN_NAME}
   ^\s*Tagged\s+[Pp]orts
   ^\s*Untagged\s+[Pp]orts
   ^\s{3,}\S+\s*$$
   ^\s{3,}\S+\s+\S+\s*$$
   ^\s{3,}\S+\s+\S+\s+\S+\s*$$
+  ^\s*$$
   ^. -> Error

tests/hp_comware/display_vlan_all/hp_comware_display_vlan_all_cw5.raw

@@ -0,0 +1,99 @@
+ VLAN ID: 1
+ VLAN Type: static
+ Route Interface: not configured
+ Description: VLAN 0001
+ Name: VLAN 0001
+ Tagged   Ports: none
+ Untagged Ports:
+    Bridge-Aggregation1      Bridge-Aggregation40
+    GigabitEthernet2/0/2     GigabitEthernet2/0/3     GigabitEthernet2/0/4
+    GigabitEthernet2/0/5     GigabitEthernet2/0/6     GigabitEthernet2/0/7
+    GigabitEthernet2/0/8     GigabitEthernet2/0/9     GigabitEthernet2/0/11
+    GigabitEthernet2/0/12    GigabitEthernet2/0/13    GigabitEthernet2/0/14
+    GigabitEthernet2/0/15    GigabitEthernet2/0/16    GigabitEthernet2/0/17
+    GigabitEthernet2/0/18    GigabitEthernet2/0/19    GigabitEthernet2/0/20
+    GigabitEthernet2/0/21    GigabitEthernet2/0/22    GigabitEthernet2/0/23
+    GigabitEthernet2/0/24    GigabitEthernet2/0/25    GigabitEthernet2/0/26
+    GigabitEthernet2/0/27    GigabitEthernet2/0/28    GigabitEthernet2/0/29
+    GigabitEthernet2/0/30    GigabitEthernet2/0/31    GigabitEthernet2/0/32
+    GigabitEthernet2/0/33    GigabitEthernet2/0/34    GigabitEthernet2/0/35
+    GigabitEthernet2/0/36    GigabitEthernet2/0/38    GigabitEthernet2/0/39
+    GigabitEthernet2/0/40    GigabitEthernet2/0/41    GigabitEthernet2/0/42
+    GigabitEthernet2/0/43    GigabitEthernet2/0/44    GigabitEthernet2/0/45
+    GigabitEthernet2/0/46    GigabitEthernet3/0/1     GigabitEthernet3/0/2
+    GigabitEthernet3/0/11    GigabitEthernet3/0/12    GigabitEthernet3/0/14
+    GigabitEthernet3/0/47    GigabitEthernet3/0/48    GigabitEthernet8/0/3
+    GigabitEthernet8/0/4     GigabitEthernet8/0/5     GigabitEthernet8/0/6
+    GigabitEthernet8/0/7     GigabitEthernet8/0/8     GigabitEthernet8/0/9
+    GigabitEthernet8/0/10    GigabitEthernet8/0/11    GigabitEthernet8/0/12
+
+ VLAN ID: 250
+ VLAN Type: static
+ Route Interface: configured
+ IP Address: 10.11.12.13
+ Subnet Mask: 255.255.255.128
+ Description: "TESTING"
+ Name: VLAN 0250
+ Tagged   Ports: none
+ Untagged Ports:
+    GigabitEthernet2/0/47
+
+ VLAN ID: 400
+ VLAN Type: static
+ Route Interface: not configured
+ Description: Mgmt VLAN-10.20.30.0/25
+ Name: VLAN 0400
+ Tagged   Ports:
+    GigabitEthernet8/0/1     GigabitEthernet8/0/2
+ Untagged Ports:
+    GigabitEthernet2/0/1
+
+ VLAN ID: 443
+ VLAN Type: static
+ Route Interface: configured
+ IP Address: 10.20.40.51
+ Subnet Mask: 255.255.255.240
+ Description: VLAN 0443
+ Name: global vlan 443
+ Tagged   Ports: none
+ Untagged Ports: none
+
+ VLAN ID: 444
+ VLAN Type: static
+ Route Interface: configured
+ IP Address: 10.100.200.100
+ Subnet Mask: 255.255.255.240
+ Description: VLAN 0444
+ Name: global vlan 444
+ Tagged   Ports: none
+ Untagged Ports: none
+
+ VLAN ID: 904
+ VLAN Type: static
+ Route Interface: configured
+ IP Address: 10.15.20.25
+ Subnet Mask: 255.255.255.252
+ Description: IRL to Device
+ Name: VLAN 0904
+ Tagged   Ports:
+    GigabitEthernet2/0/1     GigabitEthernet8/0/1
+ Untagged Ports: none
+
+ VLAN ID: 905
+ VLAN Type: static
+ Route Interface: configured
+ IP Address: 10.9.8.7
+ Subnet Mask: 255.255.255.252
+ Description: IRL to HP Device
+ Name: VLAN 0905
+ Tagged   Ports:
+    GigabitEthernet8/0/2
+ Untagged Ports: none
+
+ VLAN ID: 999   
+ VLAN Type: static
+ Route Interface: not configured
+ Description: VLAN 0999
+ Name: dot1x_failed
+ Tagged   Ports: none
+ Untagged Ports: none

tests/hp_comware/display_vlan_all/hp_comware_display_vlan_all_cw5.yml

@@ -0,0 +1,58 @@
+---
+parsed_sample:
+  - description: "VLAN 0001"
+    ipv4_address: ""
+    ipv4_subnet: ""
+    route_interface: "not configured"
+    type: "static"
+    vlan_id: "1"
+    vlan_name: "VLAN 0001"
+  - description: "\"TESTING\""
+    ipv4_address: "10.11.12.13"
+    ipv4_subnet: "255.255.255.128"
+    route_interface: "configured"
+    type: "static"
+    vlan_id: "250"
+    vlan_name: "VLAN 0250"
+  - description: "Mgmt VLAN-10.20.30.0/25"
+    ipv4_address: ""
+    ipv4_subnet: ""
+    route_interface: "not configured"
+    type: "static"
+    vlan_id: "400"
+    vlan_name: "VLAN 0400"
+  - description: "VLAN 0443"
+    ipv4_address: "10.20.40.51"
+    ipv4_subnet: "255.255.255.240"
+    route_interface: "configured"
+    type: "static"
+    vlan_id: "443"
+    vlan_name: "global vlan 443"
+  - description: "VLAN 0444"
+    ipv4_address: "10.100.200.100"
+    ipv4_subnet: "255.255.255.240"
+    route_interface: "configured"
+    type: "static"
+    vlan_id: "444"
+    vlan_name: "global vlan 444"
+  - description: "IRL to Device"
+    ipv4_address: "10.15.20.25"
+    ipv4_subnet: "255.255.255.252"
+    route_interface: "configured"
+    type: "static"
+    vlan_id: "904"
+    vlan_name: "VLAN 0904"
+  - description: "IRL to HP Device"
+    ipv4_address: "10.9.8.7"
+    ipv4_subnet: "255.255.255.252"
+    route_interface: "configured"
+    type: "static"
+    vlan_id: "905"
+    vlan_name: "VLAN 0905"
+  - description: "VLAN 0999"
+    ipv4_address: ""
+    ipv4_subnet: ""
+    route_interface: "not configured"
+    type: "static"
+    vlan_id: "999"
+    vlan_name: "dot1x_failed"