diff --git a/ntc_templates/templates/alcatel_aos_show_vlan.textfsm b/ntc_templates/templates/alcatel_aos_show_vlan.textfsm index 758daa38d8..30281cca03 100644 --- a/ntc_templates/templates/alcatel_aos_show_vlan.textfsm +++ b/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 diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.raw similarity index 100% rename from tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw rename to tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.raw diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.yml b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.yml similarity index 95% rename from tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.yml rename to tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.yml index 42242197d0..6171ae9f73 100644 --- a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.yml +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R6.yml @@ -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" diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.raw b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.raw new file mode 100644 index 0000000000..a92ec7e289 --- /dev/null +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.raw @@ -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 diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.yml b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.yml new file mode 100644 index 0000000000..b44c019e3b --- /dev/null +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan_R8.yml @@ -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"