From 53c4e54e616bb55f1898690bcb772db7fcc83390 Mon Sep 17 00:00:00 2001 From: Damien ARNOUX Date: Tue, 19 Jun 2018 15:48:01 +0200 Subject: [PATCH 1/6] add alcatel AOS6 template (tested on OS6250/6450) --- templates/alcatel_aos_show_vlan.template | 14 ++++++ templates/index | 2 + .../show_vlan/alcatel_aos_show_vlan.parsed | 50 +++++++++++++++++++ .../show_vlan/alcatel_aos_show_vlan.raw | 7 +++ 4 files changed, 73 insertions(+) create mode 100644 templates/alcatel_aos_show_vlan.template create mode 100644 tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed create mode 100644 tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw diff --git a/templates/alcatel_aos_show_vlan.template b/templates/alcatel_aos_show_vlan.template new file mode 100644 index 0000000000..046f8d48b1 --- /dev/null +++ b/templates/alcatel_aos_show_vlan.template @@ -0,0 +1,14 @@ +Value VLAN (\d+) +Value TYPE (std|vstk|gvrp|ipmv) +Value ADMIN (on|off) +Value OPER (on|off) +Value STREE1X1 (on|off) +Value STREEFLAT (on|off) +Value AUTH (on|off) +Value IP (on|off) +Value MBLETAG (on|off) +Value SRCLRN (on|off) +Value NAME ((\S+\s*)+\S+) + +Start + ^\s*${VLAN}\s+${TYPE}\s+${ADMIN}\s+${OPER}\s+${STREE1X1}\s+${STREEFLAT}\s+${AUTH}\s+${IP}\s+${MBLETAG}\s+${SRCLRN}\s+${NAME}\s+ -> Record \ No newline at end of file diff --git a/templates/index b/templates/index index 6faf62273e..2485f82673 100644 --- a/templates/index +++ b/templates/index @@ -12,6 +12,8 @@ # Template, Hostname, Platform, Command +alcatel_aos_show_vlan.template, .*, alcatel_aos, show vlan + alcatel_sros_show_router_bgp_routes_vpn-ipv4.template, .*, alcatel_sros, sh[[ow]] router bgp rou[[tes]] vpn-ipv4 alcatel_sros_show_service_id_base.template, .*, alcatel_sros, sh[[ow]] serv[[ice]] id ba[[se]] alcatel_sros_oam_mac-ping.template, .*, alcatel_sros, oam mac-pi[[ng]] diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed new file mode 100644 index 0000000000..4ea6bc9f51 --- /dev/null +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed @@ -0,0 +1,50 @@ +--- +parsed_sample: + + - admin: "on", + auth: "off", + ip: "off", + mbletag: "off", + name: "VLAN 1", + oper: "on", + srclrn: "on", + stree1x1: "on", + streeflat: "on", + type: "std", + vlan: "1" + + - admin: "on", + auth: "off", + ip: "off", + mbletag: "off", + name: "name with spaces", + oper: "off", + srclrn: "on", + stree1x1: "on", + streeflat: "on", + type: "std", + vlan: "10" + + - admin: "on", + auth: "off", + ip: "on", + mbletag: "off", + name: "name-with-dashes", + oper: "on", + srclrn: "on", + stree1x1: "on", + streeflat: "on", + type: "std", + vlan: "100" + +- admin: "on", + auth: "off", + ip: "on", + mbletag: "off", + name: "namewithoutnothing", + oper: "on", + srclrn: "on", + stree1x1: "on", + streeflat: "on", + type: "std", + vlan: "1000" \ No newline at end of file diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw new file mode 100644 index 0000000000..8a5652639a --- /dev/null +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw @@ -0,0 +1,7 @@ + stree mble src + vlan type admin oper 1x1 flat auth ip tag lrn name +-----+-----+------+------+------+------+----+-----+-----+------+---------- + 1 std on on on on off off off on VLAN 1 + 10 std on off on on off off off on name with spaces + 100 std on on on on off on off on name-with-dashes +1000 std on on on on off on off on namewithoutnothing From 3f898c7e3f5f0cbaefb0d1d6e235314972a8b767 Mon Sep 17 00:00:00 2001 From: Damien ARNOUX Date: Tue, 19 Jun 2018 16:03:14 +0200 Subject: [PATCH 2/6] fixed typo in parsed yaml file --- .../show_vlan/alcatel_aos_show_vlan.parsed | 88 +++++++++---------- 1 file changed, 44 insertions(+), 44 deletions(-) diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed index 4ea6bc9f51..da21ff7484 100644 --- a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed @@ -1,50 +1,50 @@ --- parsed_sample: - - admin: "on", - auth: "off", - ip: "off", - mbletag: "off", - name: "VLAN 1", - oper: "on", - srclrn: "on", - stree1x1: "on", - streeflat: "on", - type: "std", - vlan: "1" + - admin: 'on' + auth: 'off' + ip: 'off' + mbletag: 'off' + name: 'VLAN 1' + oper: 'on' + srclrn: 'on' + stree1x1: 'on' + streeflat: 'on' + type: 'std' + vlan: '1' - - admin: "on", - auth: "off", - ip: "off", - mbletag: "off", - name: "name with spaces", - oper: "off", - srclrn: "on", - stree1x1: "on", - streeflat: "on", - type: "std", - vlan: "10" + - admin: 'on' + auth: 'off' + ip: 'off' + mbletag: 'off' + name: 'name with spaces' + oper: 'off' + srclrn: 'on' + stree1x1: 'on' + streeflat: 'on' + type: 'std' + vlan: '10' - - admin: "on", - auth: "off", - ip: "on", - mbletag: "off", - name: "name-with-dashes", - oper: "on", - srclrn: "on", - stree1x1: "on", - streeflat: "on", - type: "std", - vlan: "100" + - admin: 'on' + auth: 'off' + ip: 'on' + mbletag: 'off' + name: 'name-with-dashes' + oper: 'on' + srclrn: 'on' + stree1x1: 'on' + streeflat: 'on' + type: 'std' + vlan: '100' -- admin: "on", - auth: "off", - ip: "on", - mbletag: "off", - name: "namewithoutnothing", - oper: "on", - srclrn: "on", - stree1x1: "on", - streeflat: "on", - type: "std", - vlan: "1000" \ No newline at end of file +- admin: 'on' + auth: 'off' + ip: 'on' + mbletag: 'off' + name: 'namewithoutnothing' + oper: 'on' + srclrn: 'on' + stree1x1: 'on' + streeflat: 'on' + type: 'std' + vlan: '1000' \ No newline at end of file From 651f48ef2b1660e83a1e432a3095ffff322a8c45 Mon Sep 17 00:00:00 2001 From: Damien ARNOUX Date: Tue, 19 Jun 2018 16:09:39 +0200 Subject: [PATCH 3/6] fixed typo in parsed yaml file --- tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed index da21ff7484..89a0d131e9 100644 --- a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed @@ -37,7 +37,7 @@ parsed_sample: type: 'std' vlan: '100' -- admin: 'on' + - admin: 'on' auth: 'off' ip: 'on' mbletag: 'off' From 484de7deb63a073189396af1f72a7ca5942896e7 Mon Sep 17 00:00:00 2001 From: Damien ARNOUX Date: Tue, 19 Jun 2018 16:45:45 +0200 Subject: [PATCH 4/6] add '-> Error' handling to 'show vlan' template --- templates/alcatel_aos_show_vlan.template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/alcatel_aos_show_vlan.template b/templates/alcatel_aos_show_vlan.template index 046f8d48b1..3de993952a 100644 --- a/templates/alcatel_aos_show_vlan.template +++ b/templates/alcatel_aos_show_vlan.template @@ -11,4 +11,8 @@ Value SRCLRN (on|off) Value NAME ((\S+\s*)+\S+) Start - ^\s*${VLAN}\s+${TYPE}\s+${ADMIN}\s+${OPER}\s+${STREE1X1}\s+${STREEFLAT}\s+${AUTH}\s+${IP}\s+${MBLETAG}\s+${SRCLRN}\s+${NAME}\s+ -> Record \ No newline at end of file + ^\s*${VLAN}\s+${TYPE}\s+${ADMIN}\s+${OPER}\s+${STREE1X1}\s+${STREEFLAT}\s+${AUTH}\s+${IP}\s+${MBLETAG}\s+${SRCLRN}\s+${NAME}\s+ -> Record + ^\s*stree\s+mble\s+src + ^\s*vlan\s+type\s+admin\s+oper\s+1x1\s+flat\s+auth\s+ip\s+tag\s+lrn\s+name + ^-----\+-----\+------\+------\+------\+------\+----\+-----\+-----\+------\+---------- + ^.*$$ -> Error \ No newline at end of file From dd5cb047ecd1accd7802b7d7bd67fcb4a1be5dde Mon Sep 17 00:00:00 2001 From: Damien ARNOUX Date: Wed, 20 Jun 2018 08:30:55 +0200 Subject: [PATCH 5/6] changed a value to make test pass --- tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed | 2 +- tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed index 89a0d131e9..2ae2741ae3 100644 --- a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed @@ -46,5 +46,5 @@ parsed_sample: srclrn: 'on' stree1x1: 'on' streeflat: 'on' - type: 'std' + type: 'gvrp' vlan: '1000' \ No newline at end of file diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw index 8a5652639a..7ca710cabb 100644 --- a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.raw @@ -4,4 +4,4 @@ 1 std on on on on off off off on VLAN 1 10 std on off on on off off off on name with spaces 100 std on on on on off on off on name-with-dashes -1000 std on on on on off on off on namewithoutnothing +1000 gvrp on on on on off on off on namewithoutnothing From 1bd0fb3bd9da433917124a3fea2b8b3e9966cded Mon Sep 17 00:00:00 2001 From: jmcgill298 Date: Mon, 21 Jan 2019 12:02:04 -0500 Subject: [PATCH 6/6] Add AOS to test_index_order --- templates/alcatel_aos_show_vlan.template | 18 ++++---- .../show_vlan/alcatel_aos_show_vlan.parsed | 43 +++++++++---------- tests/test_index_order.py | 2 +- 3 files changed, 31 insertions(+), 32 deletions(-) diff --git a/templates/alcatel_aos_show_vlan.template b/templates/alcatel_aos_show_vlan.template index 3de993952a..725add28a1 100644 --- a/templates/alcatel_aos_show_vlan.template +++ b/templates/alcatel_aos_show_vlan.template @@ -1,18 +1,18 @@ Value VLAN (\d+) Value TYPE (std|vstk|gvrp|ipmv) -Value ADMIN (on|off) -Value OPER (on|off) -Value STREE1X1 (on|off) -Value STREEFLAT (on|off) +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 (on|off) Value MBLETAG (on|off) -Value SRCLRN (on|off) +Value SOURCE_LEARN (on|off) Value NAME ((\S+\s*)+\S+) Start - ^\s*${VLAN}\s+${TYPE}\s+${ADMIN}\s+${OPER}\s+${STREE1X1}\s+${STREEFLAT}\s+${AUTH}\s+${IP}\s+${MBLETAG}\s+${SRCLRN}\s+${NAME}\s+ -> Record - ^\s*stree\s+mble\s+src - ^\s*vlan\s+type\s+admin\s+oper\s+1x1\s+flat\s+auth\s+ip\s+tag\s+lrn\s+name + ^\s*${VLAN}\s+${TYPE}\s+${ADMIN_STATE}\s+${OPERATIONAL_STATE}\s+${SPANNING_TREE_1X1}\s+${SPANNING_TREE_FLAT}\s+${AUTH}\s+${IP}\s+${MBLETAG}\s+${SOURCE_LEARN}\s+${NAME}\s*$$ -> Record + ^\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*$$ ^-----\+-----\+------\+------\+------\+------\+----\+-----\+-----\+------\+---------- - ^.*$$ -> Error \ No newline at end of file + ^.*$$ -> Error diff --git a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed index 2ae2741ae3..8c25da42ae 100644 --- a/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed +++ b/tests/alcatel_aos/show_vlan/alcatel_aos_show_vlan.parsed @@ -1,50 +1,49 @@ --- parsed_sample: - - - admin: 'on' + - admin_state: 'on' auth: 'off' ip: 'off' mbletag: 'off' name: 'VLAN 1' - oper: 'on' - srclrn: 'on' - stree1x1: 'on' - streeflat: 'on' + operational_state: 'on' + source_learn: 'on' + spanning_tree_1x1: 'on' + spanning_tree_flat: 'on' type: 'std' vlan: '1' - - admin: 'on' + - admin_state: 'on' auth: 'off' ip: 'off' mbletag: 'off' name: 'name with spaces' - oper: 'off' - srclrn: 'on' - stree1x1: 'on' - streeflat: 'on' + operational_state: 'off' + source_learn: 'on' + spanning_tree_1x1: 'on' + spanning_tree_flat: 'on' type: 'std' vlan: '10' - - admin: 'on' + - admin_state: 'on' auth: 'off' ip: 'on' mbletag: 'off' name: 'name-with-dashes' - oper: 'on' - srclrn: 'on' - stree1x1: 'on' - streeflat: 'on' + operational_state: 'on' + source_learn: 'on' + spanning_tree_1x1: 'on' + spanning_tree_flat: 'on' type: 'std' vlan: '100' - - admin: 'on' + - admin_state: 'on' auth: 'off' ip: 'on' mbletag: 'off' name: 'namewithoutnothing' - oper: 'on' - srclrn: 'on' - stree1x1: 'on' - streeflat: 'on' + operational_state: 'on' + source_learn: 'on' + spanning_tree_1x1: 'on' + spanning_tree_flat: 'on' type: 'gvrp' - vlan: '1000' \ No newline at end of file + vlan: '1000' diff --git a/tests/test_index_order.py b/tests/test_index_order.py index 178e57659e..95e08beaeb 100644 --- a/tests/test_index_order.py +++ b/tests/test_index_order.py @@ -61,7 +61,7 @@ def check_order(current_os, prior_os,cmd_len, prior_len, os_choices, used_os, cm def test_index_ordering(): os_choices = [ - 'a10', 'alcatel_sros', 'arista_eos', 'aruba_os', 'avaya_ers', 'avaya_vsp', + 'a10', 'alcatel_aos', 'alcatel_sros', 'arista_eos', 'aruba_os', 'avaya_ers', 'avaya_vsp', 'brocade_fastiron', 'brocade_netiron', 'brocade_nos', 'brocade_vdx', 'brocade_vyos', 'checkpoint_gaia', 'cisco_asa', 'cisco_ios', 'cisco_nxos', 'cisco_s300', 'cisco_wlc', 'cisco_xe', 'cisco_xr', 'dell_force10', 'enterasys', 'extreme', 'f5_ltm', 'fortinet',