Adapting command to accept R8 and updating template to be more maintainable (#1931)

Author: evilmonkey19

ntc_templates/templates/alcatel_aos_show_vlan.textfsm

@@ -1,18 +1,25 @@
 Value VLAN_ID (\d+)
-Value TYPE (std|vstk|gvrp|ipmv)
-Value ADMIN_STATE (on|off)
-Value OPERATIONAL_STATE (on|off)
-Value SPANNING_TREE_1X1 (on|off)
-Value SPANNING_TREE_FLAT (on|off)
-Value AUTH (on|off)
-Value IP_STATE (on|off)
-Value MBLETAG (on|off)
-Value SOURCE_LEARN (on|off)
-Value VLAN_NAME ((\S+\s*)+\S+)
+Value TYPE (\S+)
+Value ADMIN_STATE (\S+)
+Value OPERATIONAL_STATE (\S+)
+Value SPANNING_TREE_1X1 (\S+)
+Value SPANNING_TREE_FLAT (\S+)
+Value AUTH (\S+)
+Value IP_STATE (\S+)
+Value MBLETAG (\S+)
+Value SOURCE_LEARN (\S+)
+Value MTU (\d+)
+Value VLAN_NAME (\S.+\S)
 
 Start
-  ^\s*${VLAN_ID}\s+${TYPE}\s+${ADMIN_STATE}\s+${OPERATIONAL_STATE}\s+${SPANNING_TREE_1X1}\s+${SPANNING_TREE_FLAT}\s+${AUTH}\s+${IP_STATE}\s+${MBLETAG}\s+${SOURCE_LEARN}\s+${VLAN_NAME}\s*$$ -> Record
+  # R6 Version
   ^\s*stree\s+mble\s+src\s*$$
   ^\s*vlan\s+type\s+admin\s+oper\s+1x1\s+flat\s+auth\s+ip\s+tag\s+lrn\s+name\s*$$
-  ^-----\+-----\+------\+------\+------\+------\+----\+-----\+-----\+------\+----------
+  # R8 Version
+  ^\s*vlan\s+type\s+admin\s+oper\s+ip\s+mtu\s+name\s*$$
+  ^\s*-+
+  # R6
+  ^\s*${VLAN_ID}\s+${TYPE}\s+${ADMIN_STATE}\s+${OPERATIONAL_STATE}\s+${SPANNING_TREE_1X1}\s+${SPANNING_TREE_FLAT}\s+${AUTH}\s+${IP_STATE}\s+${MBLETAG}\s+${SOURCE_LEARN}\s+${VLAN_NAME}\s*$$ -> Record
+  # R8
+  ^\s*${VLAN_ID}\s+${TYPE}\s+${ADMIN_STATE}\s+${OPERATIONAL_STATE}\s+${IP_STATE}\s+${MTU}\s+${VLAN_NAME}\s*$$ -> Record
   ^.*$$ -> Error

tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw renamed to tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.raw

@@ -4,6 +4,7 @@ parsed_sample:
     auth: "off"
     ip_state: "off"
     mbletag: "off"
+    mtu: ""
     operational_state: "on"
     source_learn: "on"
     spanning_tree_1x1: "on"
@@ -15,6 +16,7 @@ parsed_sample:
     auth: "off"
     ip_state: "off"
     mbletag: "off"
+    mtu: ""
     operational_state: "off"
     source_learn: "on"
     spanning_tree_1x1: "on"
@@ -26,6 +28,7 @@ parsed_sample:
     auth: "off"
     ip_state: "on"
     mbletag: "off"
+    mtu: ""
     operational_state: "on"
     source_learn: "on"
     spanning_tree_1x1: "on"
@@ -37,6 +40,7 @@ parsed_sample:
     auth: "off"
     ip_state: "on"
     mbletag: "off"
+    mtu: ""
     operational_state: "on"
     source_learn: "on"
     spanning_tree_1x1: "on"

tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.yml renamed to tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.yml

@@ -0,0 +1,4 @@
+ vlan    type   admin   oper    ip    mtu          name
+------+-------+-------+------+------+------+------------------
+1      std       Dis     Dis   Dis    1500    Vlan_1
+4094   vcm       Ena     Dis   Dis    1500    VCM IPC

tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.raw

@@ -0,0 +1,26 @@
+---
+parsed_sample:
+  - admin_state: "Dis"
+    auth: ""
+    ip_state: "Dis"
+    mbletag: ""
+    mtu: "1500"
+    operational_state: "Dis"
+    source_learn: ""
+    spanning_tree_1x1: ""
+    spanning_tree_flat: ""
+    type: "std"
+    vlan_id: "1"
+    vlan_name: "Vlan_1"
+  - admin_state: "Ena"
+    auth: ""
+    ip_state: "Dis"
+    mbletag: ""
+    mtu: "1500"
+    operational_state: "Dis"
+    source_learn: ""
+    spanning_tree_1x1: ""
+    spanning_tree_flat: ""
+    type: "vcm"
+    vlan_id: "4094"
+    vlan_name: "VCM IPC"