Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alcatel-Lucent Enterprise AOS8 integration #759

Open
wants to merge 87 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
87 commits
Select commit Hold shift + click to select a range
a7e582a
Fix linting warnings
claudiolor Jun 20, 2022
57a9b02
Bump version to 0.18.0
ddutt Jun 20, 2022
93ada58
Updated release notes for 0.18.0
ddutt Jun 21, 2022
4e475c7
Add document about throttling requests to AAA servers
ddutt Jun 21, 2022
7687233
Fix services init tests
claudiolor Jun 26, 2022
176e77f
Interfaces: bug fix to handle unique when specifying vlan filter
ddutt Jun 25, 2022
5e6bfba
Update tests to test the bug fix
ddutt Jun 25, 2022
007cfa9
Updating task list, cleaning out obsolete stuff
ddutt Jun 30, 2022
fa575a3
Add `show arp` textfsm template
jefvantongerloo Jul 1, 2022
7411854
Add `show chassis` textfsm template
jefvantongerloo Jul 1, 2022
cb7d9db
Add `show interfaces` textfsm template
jefvantongerloo Jul 1, 2022
6c11ddc
Add `show interfaces` textfsm template
jefvantongerloo Jul 1, 2022
1d75cbf
Add `show ip routes` textfsm template
jefvantongerloo Jul 1, 2022
e7b1aee
Add `show mac-learning` textfsm template
jefvantongerloo Jul 1, 2022
3321e72
Add `show system` textfsm template
jefvantongerloo Jul 1, 2022
95a9d34
Add `show vlan members` textfsm template
jefvantongerloo Jul 1, 2022
66fc031
Add `show vlan` textfsm template
jefvantongerloo Jul 1, 2022
d6414c8
Add `aos` namespace/nos
jefvantongerloo Jul 1, 2022
7362db5
Add Alcatel-Lucent Enterpise AOS8 support
jefvantongerloo Jul 1, 2022
609886e
Add vlan.yml
jefvantongerloo Jul 1, 2022
03c2863
Add route.yml
jefvantongerloo Jul 1, 2022
e1baa0f
Add mac.yml
jefvantongerloo Jul 1, 2022
bafb8c1
Add interface.yml
jefvantongerloo Jul 1, 2022
3d5ed86
Add device.yml
jefvantongerloo Jul 1, 2022
af53570
Add arpnd.yml
jefvantongerloo Jul 1, 2022
e50fe67
Add arpnd.output
jefvantongerloo Jul 1, 2022
9d4235e
Add device.output
jefvantongerloo Jul 1, 2022
1baaabb
Add inventory.output
jefvantongerloo Jul 1, 2022
d56bda3
Add macs.output
jefvantongerloo Jul 1, 2022
8315e25
Add routes.output
jefvantongerloo Jul 1, 2022
6093199
Add vlan.output
jefvantongerloo Jul 1, 2022
c44a3c8
Add interfaces.output
jefvantongerloo Jul 1, 2022
485c375
Correct services file location
jefvantongerloo Jul 1, 2022
979c8a8
Fix missing : in ip:port log
jefvantongerloo Jul 1, 2022
dad00ec
Add Alcatel-Lucent Enterpise AOS8
jefvantongerloo Jul 1, 2022
9a93599
Remove debug logger lines
jefvantongerloo Jul 1, 2022
9d9de04
Add namespace aos
jefvantongerloo Jul 4, 2022
dc26671
Add aos
jefvantongerloo Jul 4, 2022
1455282
Regex as raw string
jefvantongerloo Jul 7, 2022
8d29808
Adjust `detected_speed` key to `speed`
jefvantongerloo Jul 7, 2022
c862650
Call dict value directly instead of .get
jefvantongerloo Jul 7, 2022
de18f21
Regex as raw string
jefvantongerloo Jul 7, 2022
040ee09
Regex as raw string
jefvantongerloo Jul 7, 2022
356bdb0
Regex as raw string
jefvantongerloo Jul 7, 2022
3464466
Remove ´type´ entry
jefvantongerloo Jul 7, 2022
46acc11
Linting (Flake8 + Pylint)
jefvantongerloo Jul 7, 2022
f9e1018
Linting (Flake8 + Pylint)
jefvantongerloo Jul 8, 2022
c250e8b
Linting (Flake8 + Pylint)
jefvantongerloo Jul 8, 2022
33276f7
Add newline at end of file
jefvantongerloo Jul 8, 2022
f17602e
Add newline at end of file
jefvantongerloo Jul 8, 2022
2e3d68f
Linting (Flake8 + Pylint)
jefvantongerloo Jul 8, 2022
2411f8a
Add aos ´state´ item
jefvantongerloo Jul 8, 2022
5b65851
Linting (Flake8 + Pylint)
jefvantongerloo Jul 8, 2022
02db219
Linting (Flake8 + Pylint)
jefvantongerloo Jul 8, 2022
98f046f
Remove `type` name in variable
jefvantongerloo Jul 12, 2022
6aa7ce4
Merge 'develop' into alcatel-lucent-enterprise
jefvantongerloo Sep 8, 2022
4f8e2af
textfsm-aos v1.1.2 template update
jefvantongerloo Dec 20, 2022
1c479d4
add `memory` and `os`parameter
jefvantongerloo Dec 20, 2022
f832c8e
add `bd`and `protocol` parameters
jefvantongerloo Dec 20, 2022
169c91a
add aos `show ip interface` command
jefvantongerloo Dec 22, 2022
b69c007
add aos `show``arp``ip_interface` `ip_routes` command
jefvantongerloo Dec 22, 2022
6ce09d5
add aos_show_ip_interface.tfsm
jefvantongerloo Dec 22, 2022
3d5c94c
add aos vlan interfaces
jefvantongerloo Dec 22, 2022
1325b50
add aos route parameters
jefvantongerloo Dec 22, 2022
a4e2163
add `linkagg interfaces`
jefvantongerloo Dec 22, 2022
d321b34
add aos_show_linkagg.tfsm
jefvantongerloo Dec 22, 2022
0fbb008
add aos_show_linkagg_port.tfsm
jefvantongerloo Dec 22, 2022
485a4f9
add aos `show linkagg` & `show linkagg port` commands
jefvantongerloo Dec 22, 2022
3ce87f7
Merge branch 'develop' into alcatel-lucent-enterprise
jefvantongerloo Dec 22, 2022
f18cbc8
remove
jefvantongerloo Dec 22, 2022
f1b5c8d
update test data
jefvantongerloo Dec 22, 2022
cc76f94
add tests
jefvantongerloo Dec 22, 2022
7641987
Merge remote-tracking branch 'origin/develop' into alcatel-lucent-ent…
claudiolor Jan 12, 2023
95b48b9
Make AOS complaint to the new Node class structure
claudiolor Jan 9, 2023
d9d3998
Fix device autodiscovery
claudiolor Jan 11, 2023
b83c265
Invert cmd order
claudiolor Jan 11, 2023
c3b9711
Fix device service crash with empty response
claudiolor Jan 11, 2023
81144e3
vrf `default` instead of `blank`
jefvantongerloo Feb 1, 2023
9744d98
change `aggregate` to `bond`
jefvantongerloo Feb 20, 2023
a2f9891
transform `emp` type to `ethernet`
jefvantongerloo Feb 20, 2023
ab27c11
add mackey generation
jefvantongerloo Feb 20, 2023
ce19e52
linting
jefvantongerloo Feb 20, 2023
5436af8
Merge branch 'develop' into alcatel-lucent-enterprise
jefvantongerloo Jul 8, 2024
5c20574
fix interface speed value
jefvantongerloo Jul 9, 2024
0eec163
remove catch errors
jefvantongerloo Jul 9, 2024
75b0f36
fix memory bytes value
jefvantongerloo Jul 9, 2024
85d2b0a
Merge branch 'develop' into alcatel-lucent-enterprise
jefvantongerloo Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update test data
Signed-off-by: jefvantongerloo <jefvantongerloo@gmail.com>
jefvantongerloo committed Dec 22, 2022
commit f1b5c8d1daccab26541a892c4352f812dd76c21d
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
25 changes: 0 additions & 25 deletions tests/integration/sqcmds/aos-input/arpnd.output

This file was deleted.

12 changes: 6 additions & 6 deletions tests/integration/sqcmds/aos-input/device.output
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[
{
"status": 0,
"timestamp": 1656668007847,
"timestamp": 1671742337713,
"cmd": "show system",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-001-1",
"address": "10.20.99.11",
"version": "8.6.289.R01 GA",
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6560-P24X4 8.6.289.R01 GA, July 13, 2019.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.14.1.10,\n Up Time: 387 days 18 hours 52 minutes and 49 seconds,\n Contact: Alcatel-Lucent, http://enterprise.alcatel-lucent.com,\n Name: net-lab-swi-001-1,\n Location: Unknown,\n Services: 78,\n Date & Time: MON MAY 27 2030 12:50:45 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 456454144,\n Comments : None\n\n"
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6560-P24X4 8.6.289.R01 GA, July 13, 2019.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.14.1.10,\n Up Time: 562 days 6 hours 14 minutes and 22 seconds,\n Contact: Alcatel-Lucent, http://enterprise.alcatel-lucent.com,\n Name: net-lab-swi-001-1,\n Location: Unknown,\n Services: 78,\n Date & Time: MON NOV 18 2030 00:12:18 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 455753728,\n Comments : None\n\n"
}
][
{
"status": 0,
"timestamp": 1656668008673,
"timestamp": 1671742339335,
"cmd": "show system",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6860E-U28 8.6.289.R01 GA, July 13, 2019.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.11.1.9,\n Up Time: 2 days 14 hours 47 minutes and 38 seconds,\n Contact: Alcatel-Lucent, http://enterprise.alcatel-lucent.com,\n Name: net-lab-swi-dist,\n Location: Unknown,\n Services: 78,\n Date & Time: FRI JUL 01 2022 09:33:28 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 1299349504,\n Comments : None\n\n"
"version": "8.9.73.R01 GA",
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6860E-U28 8.9.73.R01 GA, September 23, 2022.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.11.1.9,\n Up Time: 2 days 10 hours 29 minutes and 2 seconds,\n Contact: Alcatel-Lucent Enterprise, https://www.al-enterprise.com,\n Name: net-lab-swi-dist,\n Location: Unknown,\n Services: 78,\n Date & Time: THU DEC 22 2022 20:52:19 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 1517350912,\n Comments : None\n\n"
}
]
]
92 changes: 79 additions & 13 deletions tests/integration/sqcmds/aos-input/interfaces.output

Large diffs are not rendered by default.

20 changes: 10 additions & 10 deletions tests/integration/sqcmds/aos-input/inventory.output
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"status": 0,
"timestamp": 1656668007438,
"timestamp": 1671742337077,
"cmd": "show chassis",
"devtype": "aos",
"namespace": "aos",
@@ -12,36 +12,36 @@
},
{
"status": 0,
"timestamp": 1656668007811,
"timestamp": 1671742337510,
"cmd": "show system",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-001-1",
"address": "10.20.99.11",
"version": "8.6.289.R01 GA",
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6560-P24X4 8.6.289.R01 GA, July 13, 2019.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.14.1.10,\n Up Time: 387 days 18 hours 52 minutes and 49 seconds,\n Contact: Alcatel-Lucent, http://enterprise.alcatel-lucent.com,\n Name: net-lab-swi-001-1,\n Location: Unknown,\n Services: 78,\n Date & Time: MON MAY 27 2030 12:50:45 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 456454144,\n Comments : None\n\n"
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6560-P24X4 8.6.289.R01 GA, July 13, 2019.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.14.1.10,\n Up Time: 562 days 6 hours 14 minutes and 22 seconds,\n Contact: Alcatel-Lucent, http://enterprise.alcatel-lucent.com,\n Name: net-lab-swi-001-1,\n Location: Unknown,\n Services: 78,\n Date & Time: MON NOV 18 2030 00:12:18 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 455753728,\n Comments : None\n\n"
}
][
{
"status": 0,
"timestamp": 1656668007520,
"timestamp": 1671742337981,
"cmd": "show chassis",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"data": "Local Chassis ID 1 (Master)\n Model Name: OS6860E-U28,\n Module Type: 0x6062205,\n Description: Chassis,\n Part Number: 903712-90,\n Hardware Revision: 15,\n Serial Number: DDG200700152,\n Manufacture Date: Feb 22 2020,\n Admin Status: POWER ON,\n Operational Status: UP,\n Number Of Resets: 3,\n MAC Address: 94:24:e1:37:e6:9f\n\n\n"
"version": "8.9.73.R01 GA",
"data": "Local Chassis ID 1 (Master)\n Model Name: OS6860E-U28,\n Module Type: 0x6062205,\n Description: Chassis,\n Part Number: 903712-90,\n Hardware Revision: 15,\n Serial Number: DDG200700152,\n Manufacture Date: Feb 22 2020,\n Admin Status: POWER ON,\n Operational Status: UP,\n Number Of Resets: 18,\n MAC Address: 94:24:e1:37:e6:9f\n\n\n"
},
{
"status": 0,
"timestamp": 1656668008219,
"timestamp": 1671742339014,
"cmd": "show system",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6860E-U28 8.6.289.R01 GA, July 13, 2019.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.11.1.9,\n Up Time: 2 days 14 hours 47 minutes and 37 seconds,\n Contact: Alcatel-Lucent, http://enterprise.alcatel-lucent.com,\n Name: net-lab-swi-dist,\n Location: Unknown,\n Services: 78,\n Date & Time: FRI JUL 01 2022 09:33:28 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 1299349504,\n Comments : None\n\n"
"version": "8.9.73.R01 GA",
"data": "System:\n Description: Alcatel-Lucent Enterprise OS6860E-U28 8.9.73.R01 GA, September 23, 2022.,\n Object ID: 1.3.6.1.4.1.6486.801.1.1.2.1.11.1.9,\n Up Time: 2 days 10 hours 29 minutes and 2 seconds,\n Contact: Alcatel-Lucent Enterprise, https://www.al-enterprise.com,\n Name: net-lab-swi-dist,\n Location: Unknown,\n Services: 78,\n Date & Time: THU DEC 22 2022 20:52:18 (UTC)\nFlash Space:\n Primary CMM:\n Available (bytes): 1517350912,\n Comments : None\n\n"
}
]
]
8 changes: 4 additions & 4 deletions tests/integration/sqcmds/aos-input/macs.output
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"status": 0,
"timestamp": 1656668007300,
"timestamp": 1671742337838,
"cmd": "show mac-learning",
"devtype": "aos",
"namespace": "aos",
@@ -13,13 +13,13 @@
][
{
"status": 0,
"timestamp": 1656668007879,
"timestamp": 1671742339738,
"cmd": "show mac-learning",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"version": "8.9.73.R01 GA",
"data": "Legend: Mac Address: * = address not valid,\n\n Mac Address: & = duplicate static address,\n\n Domain Vlan/SrvcId[ISId/vnId] Mac Address Type Operation Interface\n------------+----------------------+-------------------+------------------+-------------+-------------------------\n VLAN 1 94:24:e1:83:4f:6b dynamic bridging 0/19 \n VLAN 2099 94:24:e1:35:6c:27 dynamic bridging 0/1 \n VLAN 2099 94:24:e1:35:6c:46 dynamic bridging 0/1 \n VLAN 2099 00:09:0f:09:01:26 dynamic bridging 0/19 \n\n Total number of Valid MAC addresses above = 4\n\n\n"
}
]
]
56 changes: 50 additions & 6 deletions tests/integration/sqcmds/aos-input/routes.output
Original file line number Diff line number Diff line change
@@ -1,25 +1,69 @@
[
{
"status": 0,
"timestamp": 1656668007417,
"timestamp": 1671742336629,
"cmd": "show arp",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-001-1",
"address": "10.20.99.11",
"version": "8.6.289.R01 GA",
"data": "\nTotal 1 arp entries\n Flags (P=Proxy, A=Authentication, V=VRRP, B=BFD, H=HAVLAN, I=INTF, M=Managed)\n\n IP Addr Hardware Addr Type Flags Port Interface Name\n-----------------+-------------------+----------+-------+-----------------+-----------+---------------------------------\n 10.20.99.1 00:09:0f:09:01:26 DYNAMIC 0/1 vlan2099ip \n\n\n"
},
{
"status": 0,
"timestamp": 1671742337062,
"cmd": "show ip interface",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-001-1",
"address": "10.20.99.11",
"version": "8.6.289.R01 GA",
"data": "Total 2 interfaces\n Flags (D=Directly-bound)\n\n Name IP Address Subnet Mask Status Forward Device Flags\n--------------------------------+---------------+---------------+------+-------+---------+------\nLoopback 127.0.0.1 255.255.255.255 UP NO Loopback \nvlan2099ip 10.20.99.11 255.255.255.0 UP YES vlan 2099 \n\n"
},
{
"status": 0,
"timestamp": 1671742337554,
"cmd": "show ip routes",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-001-1",
"address": "10.20.99.11",
"version": "8.6.289.R01 GA",
"data": "\n + = Equal cost multipath routes\n Total 3 routes\n\n Dest Address Gateway Addr Age Protocol \n------------------+-------------------+----------+-----------\n 0.0.0.0/0 10.20.99.1 2d14h STATIC \n 10.20.99.0/24 10.20.99.11 2d14h LOCAL \n 127.0.0.1/32 127.0.0.1 387d18h LOCAL \n\n"
"data": "\n + = Equal cost multipath routes\n Total 3 routes\n\n Dest Address Gateway Addr Age Protocol \n------------------+-------------------+----------+-----------\n 0.0.0.0/0 10.20.99.1 2d10h STATIC \n 10.20.99.0/24 10.20.99.11 2d10h LOCAL \n 127.0.0.1/32 127.0.0.1 562d 6h LOCAL \n\n"
}
][
{
"status": 0,
"timestamp": 1656668007948,
"timestamp": 1671742337119,
"cmd": "show arp",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.9.73.R01 GA",
"data": "\nTotal 1 arp entries\n Flags (P=Proxy, A=Authentication, V=VRRP, B=BFD, H=HAVLAN, I=INTF, M=Managed)\n\n IP Addr Hardware Addr Type Flags Port Interface Name\n-----------------+-------------------+----------+-------+-----------------+-----------+---------------------------------\n 10.20.99.1 00:09:0f:09:01:26 DYNAMIC 0/19 vlan2099 \n\n\n"
},
{
"status": 0,
"timestamp": 1671742338191,
"cmd": "show ip interface",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.9.73.R01 GA",
"data": "Total 3 interfaces\n Flags (D=Directly-bound)\n\n Name IP Address Subnet Mask Status Forward Device Flags\n--------------------------------+---------------+---------------+------+-------+---------+------\nEMP-CMMA-CHAS1 0.0.0.0 0.0.0.0 DOWN NO EMP \nLoopback 127.0.0.1 255.255.255.255 UP NO Loopback \nvlan2099 10.20.99.10 255.255.255.0 UP YES vlan 2099 \n\n"
},
{
"status": 0,
"timestamp": 1671742339180,
"cmd": "show ip routes",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"data": "\n + = Equal cost multipath routes\n Total 3 routes\n\n Dest Address Gateway Addr Age Protocol \n------------------+-------------------+----------+-----------\n 0.0.0.0/0 10.20.99.1 2d14h STATIC \n 10.20.99.0/24 10.20.99.10 2d14h LOCAL \n 127.0.0.1/32 127.0.0.1 2d14h LOCAL \n\n"
"version": "8.9.73.R01 GA",
"data": "\n + = Equal cost multipath routes\n Total 3 routes\n\n Dest Address Gateway Addr Age Protocol \n------------------+-------------------+----------+-----------\n 0.0.0.0/0 10.20.99.1 09:58:35 STATIC \n 10.20.99.0/24 10.20.99.10 09:58:35 LOCAL \n 127.0.0.1/32 127.0.0.1 2d10h LOCAL \n\n"
}
]
]
18 changes: 9 additions & 9 deletions tests/integration/sqcmds/aos-input/vlan.output
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"status": 0,
"timestamp": 1656668007924,
"timestamp": 1671742336630,
"cmd": "show vlan",
"devtype": "aos",
"namespace": "aos",
@@ -12,7 +12,7 @@
},
{
"status": 0,
"timestamp": 1656668008199,
"timestamp": 1671742337249,
"cmd": "show vlan members",
"devtype": "aos",
"namespace": "aos",
@@ -24,24 +24,24 @@
][
{
"status": 0,
"timestamp": 1656668008637,
"timestamp": 1671742337226,
"cmd": "show vlan",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"data": " vlan type admin oper ip mtu name\n------+-------+-------+------+------+------+------------------\n1 std Ena Ena Dis 1500 VLAN 1 \n2000 std Ena Ena Dis 1500 VLAN 2000 \n2001 std Ena Ena Dis 1500 VLAN 2001 \n2002 std Ena Ena Dis 1500 VLAN 2002 \n2003 std Ena Ena Dis 1500 VLAN 2003 \n2004 std Ena Ena Dis 1500 VLAN 2004 \n2008 std Ena Ena Dis 1500 VLAN 2008 \n2012 std Ena Ena Dis 1500 VLAN 2012 \n2016 std Ena Ena Dis 1500 VLAN 2016 \n2099 std Ena Ena Ena 1500 LAB-zone-mgmt \n4094 vcm Ena Dis Dis 1500 VCM IPC \n\n"
"version": "8.9.73.R01 GA",
"data": " vlan type admin oper ip mtu name\n------+-------+-------+------+------+------+------------------\n1 std Ena Ena Dis 1500 VLAN 1 \n10 std Ena Dis Dis 1500 test \n2000 std Ena Ena Dis 1500 VLAN 2000 \n2001 std Ena Ena Dis 1500 VLAN 2001 \n2002 std Ena Ena Dis 1500 VLAN 2002 \n2003 std Ena Ena Dis 1500 VLAN 2003 \n2004 std Ena Ena Dis 1500 VLAN 2004 \n2008 std Ena Ena Dis 1500 VLAN 2008 \n2012 std Ena Ena Dis 1500 VLAN 2012 \n2016 std Ena Ena Dis 1500 VLAN 2016 \n2099 std Ena Ena Ena 1500 LAB-zone-mgmt \n4094 vcm Ena Dis Dis 1500 VCM IPC \n\n"
},
{
"status": 0,
"timestamp": 1656668009094,
"timestamp": 1671742338421,
"cmd": "show vlan members",
"devtype": "aos",
"namespace": "aos",
"hostname": "net-lab-swi-dist",
"address": "10.20.99.10",
"version": "8.6.289.R01 GA",
"data": " vlan port type status\n--------+------------+------------+--------------\n 1 1/1/2 default inactive\n 1 1/1/3 default inactive\n 1 1/1/4 default inactive\n 1 1/1/5 default inactive\n 1 1/1/6 default inactive\n 1 1/1/7 default inactive\n 1 1/1/8 default inactive\n 1 1/1/9 default inactive\n 1 1/1/10 default inactive\n 1 1/1/11 default inactive\n 1 1/1/12 default inactive\n 1 1/1/13 default inactive\n 1 1/1/14 default inactive\n 1 1/1/15 default inactive\n 1 1/1/16 default inactive\n 1 1/1/17 default inactive\n 1 1/1/18 default inactive\n 1 1/1/19 default inactive\n 1 1/1/20 default inactive\n 1 1/1/21 default inactive\n 1 1/1/22 default inactive\n 1 1/1/23 default inactive\n 1 1/1/24 default inactive\n 1 1/1/25 default inactive\n 1 1/1/26 default inactive\n 1 1/1/27 default inactive\n 1 1/1/28 default inactive\n 1 1/1/29 default inactive\n 1 1/1/30 default inactive\n 1 0/19 default forwarding\n 2000 0/1 qtagged forwarding\n 2001 0/1 qtagged forwarding\n 2002 0/1 qtagged forwarding\n 2003 0/1 qtagged forwarding\n 2004 0/1 qtagged forwarding\n 2008 0/1 qtagged forwarding\n 2012 0/1 qtagged forwarding\n 2016 0/1 qtagged forwarding\n 2099 0/1 default forwarding\n 2099 0/19 qtagged forwarding\n\n"
"version": "8.9.73.R01 GA",
"data": " vlan port type status\n--------+------------+------------+--------------\n 1 1/1/2 untagged inactive\n 1 1/1/3 untagged inactive\n 1 1/1/4 untagged inactive\n 1 1/1/5 untagged inactive\n 1 1/1/6 untagged inactive\n 1 1/1/7 untagged inactive\n 1 1/1/8 untagged inactive\n 1 1/1/9 untagged inactive\n 1 1/1/10 untagged inactive\n 1 1/1/11 untagged inactive\n 1 1/1/12 untagged inactive\n 1 1/1/13 untagged inactive\n 1 1/1/14 untagged inactive\n 1 1/1/15 untagged inactive\n 1 1/1/16 untagged inactive\n 1 1/1/17 untagged inactive\n 1 1/1/18 untagged inactive\n 1 1/1/19 untagged inactive\n 1 1/1/20 untagged inactive\n 1 1/1/21 untagged inactive\n 1 1/1/22 untagged inactive\n 1 1/1/23 untagged inactive\n 1 1/1/24 untagged inactive\n 1 1/1/25 untagged inactive\n 1 1/1/26 untagged inactive\n 1 1/1/27 untagged inactive\n 1 1/1/28 untagged inactive\n 1 1/1/29 untagged inactive\n 1 1/1/30 untagged inactive\n 1 0/19 untagged forwarding\n 2000 0/1 tagged forwarding\n 2001 0/1 tagged forwarding\n 2002 0/1 tagged forwarding\n 2003 0/1 tagged forwarding\n 2004 0/1 tagged forwarding\n 2008 0/1 tagged forwarding\n 2012 0/1 tagged forwarding\n 2016 0/1 tagged forwarding\n 2099 0/1 untagged forwarding\n 2099 0/19 tagged forwarding\n\n"
}
]
]
12 changes: 6 additions & 6 deletions tests/integration/sqcmds/aos-samples/device.yml
Original file line number Diff line number Diff line change
@@ -5,18 +5,18 @@ tests:
marks: device show aos
output: '[{"namespace": "aos", "hostname": "net-lab-swi-001-1", "model": "OS6560-P24X4",
"version": "8.6.289.R01 GA", "vendor": "Alcatel-Lucent Enterprise", "architecture":
"", "status": "alive", "address": "10.20.99.11", "bootupTimestamp": 1623163238.0,
"timestamp": 1656668007847}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"model": "OS6860E-U28", "version": "8.6.289.R01 GA", "vendor": "Alcatel-Lucent
"", "status": "alive", "address": "10.20.99.11", "bootupTimestamp": 1623163075.0,
"timestamp": 1671742337713}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"model": "OS6860E-U28", "version": "8.9.73.R01 GA", "vendor": "Alcatel-Lucent
Enterprise", "architecture": "", "status": "alive", "address": "10.20.99.10",
"bootupTimestamp": 1656441950.0, "timestamp": 1656668008673}]'
"bootupTimestamp": 1671531797.0, "timestamp": 1671742339335}]'
- command: device summarize --format=json --namespace=aos
data-directory: tests/data/parquet/
marks: device show aos
output: '{"aos": {"deviceCnt": 2, "downDeviceCnt": 0, "unpolledDeviceCnt": 0, "vendorCnt":
{"Alcatel-Lucent Enterprise": 2}, "modelCnt": {"OS6560-P24X4": 1, "OS6860E-U28":
1}, "archCnt": {"": 2}, "versionCnt": {"8.6.289.R01 GA": 2}, "upTimeStat": [226058673,
33504769847, 16865414260]}}'
1}, "archCnt": {"": 2}, "versionCnt": {"8.6.289.R01 GA": 1, "8.9.73.R01 GA": 1},
"upTimeStat": [210542335, 48579262713, 24394902524]}}'
- command: device unique --format=json --namespace=aos
data-directory: tests/data/parquet/
marks: device show aos
273 changes: 104 additions & 169 deletions tests/integration/sqcmds/aos-samples/interface.yml

Large diffs are not rendered by default.

30 changes: 15 additions & 15 deletions tests/integration/sqcmds/aos-samples/mac.yml
Original file line number Diff line number Diff line change
@@ -4,22 +4,22 @@ tests:
data-directory: tests/data/parquet/
marks: mac show aos
output: '[{"namespace": "aos", "hostname": "net-lab-swi-001-1", "vlan": 2099, "macaddr":
"00:09:0f:09:01:26", "oif": "0/1", "remoteVtepIp": "", "bd": "", "flags": "bridging",
"timestamp": 1656668007300}, {"namespace": "aos", "hostname": "net-lab-swi-001-1",
"00:09:0f:09:01:26", "oif": "0/1", "remoteVtepIp": "", "bd": "VLAN", "flags":
"bridging", "timestamp": 1671742337838}, {"namespace": "aos", "hostname": "net-lab-swi-001-1",
"vlan": 2099, "macaddr": "94:24:e1:37:e6:9f", "oif": "0/1", "remoteVtepIp": "",
"bd": "", "flags": "bridging", "timestamp": 1656668007300}, {"namespace": "aos",
"hostname": "net-lab-swi-001-1", "vlan": 2099, "macaddr": "94:24:e1:37:e6:a6",
"oif": "0/1", "remoteVtepIp": "", "bd": "", "flags": "bridging", "timestamp":
1656668007300}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlan": 1,
"macaddr": "94:24:e1:83:4f:6b", "oif": "0/19", "remoteVtepIp": "", "bd": "", "flags":
"bridging", "timestamp": 1656668007879}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlan": 2099, "macaddr": "94:24:e1:35:6c:27", "oif": "0/1", "remoteVtepIp": "",
"bd": "", "flags": "bridging", "timestamp": 1656668007879}, {"namespace": "aos",
"hostname": "net-lab-swi-dist", "vlan": 2099, "macaddr": "94:24:e1:35:6c:46",
"oif": "0/1", "remoteVtepIp": "", "bd": "", "flags": "bridging", "timestamp":
1656668007879}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlan": 2099,
"macaddr": "00:09:0f:09:01:26", "oif": "0/19", "remoteVtepIp": "", "bd": "", "flags":
"bridging", "timestamp": 1656668007879}]'
"bd": "VLAN", "flags": "bridging", "timestamp": 1671742337838}, {"namespace":
"aos", "hostname": "net-lab-swi-001-1", "vlan": 2099, "macaddr": "94:24:e1:37:e6:a6",
"oif": "0/1", "remoteVtepIp": "", "bd": "VLAN", "flags": "bridging", "timestamp":
1671742337838}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlan": 1,
"macaddr": "94:24:e1:83:4f:6b", "oif": "0/19", "remoteVtepIp": "", "bd": "VLAN",
"flags": "bridging", "timestamp": 1671742339738}, {"namespace": "aos", "hostname":
"net-lab-swi-dist", "vlan": 2099, "macaddr": "94:24:e1:35:6c:27", "oif": "0/1",
"remoteVtepIp": "", "bd": "VLAN", "flags": "bridging", "timestamp": 1671742339738},
{"namespace": "aos", "hostname": "net-lab-swi-dist", "vlan": 2099, "macaddr":
"94:24:e1:35:6c:46", "oif": "0/1", "remoteVtepIp": "", "bd": "VLAN", "flags":
"bridging", "timestamp": 1671742339738}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlan": 2099, "macaddr": "00:09:0f:09:01:26", "oif": "0/19", "remoteVtepIp": "",
"bd": "VLAN", "flags": "bridging", "timestamp": 1671742339738}]'
- command: mac summarize --format=json --namespace=aos
data-directory: tests/data/parquet/
marks: mac show eos
31 changes: 16 additions & 15 deletions tests/integration/sqcmds/aos-samples/route.yml
Original file line number Diff line number Diff line change
@@ -4,23 +4,24 @@ tests:
data-directory: tests/data/parquet/
marks: route show aos
output: '[{"namespace": "aos", "hostname": "net-lab-swi-001-1", "vrf": "", "prefix":
"0.0.0.0/0", "nexthopIps": ["10.20.99.1"], "oifs": [], "protocol": "STATIC", "source":
"", "preference": 0, "ipvers": 0, "action": "", "timestamp": 1656668007417}, {"namespace":
"aos", "hostname": "net-lab-swi-001-1", "vrf": "", "prefix": "10.20.99.0/24",
"nexthopIps": ["10.20.99.11"], "oifs": [], "protocol": "LOCAL", "source": "",
"preference": 0, "ipvers": 0, "action": "", "timestamp": 1656668007417}, {"namespace":
"aos", "hostname": "net-lab-swi-001-1", "vrf": "", "prefix": "127.0.0.1/32", "nexthopIps":
["127.0.0.1"], "oifs": [], "protocol": "LOCAL", "source": "", "preference": 0,
"ipvers": 0, "action": "", "timestamp": 1656668007417}, {"namespace": "aos", "hostname":
"net-lab-swi-dist", "vrf": "", "prefix": "0.0.0.0/0", "nexthopIps": ["10.20.99.1"],
"oifs": [], "protocol": "STATIC", "source": "", "preference": 0, "ipvers": 0,
"action": "", "timestamp": 1656668007948}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vrf": "", "prefix": "10.20.99.0/24", "nexthopIps": ["10.20.99.10"], "oifs": [],
"0.0.0.0/0", "nexthopIps": ["10.20.99.1"], "oifs": ["vlan2099ip"], "protocol":
"STATIC", "source": "", "preference": 0, "ipvers": 0, "action": "", "timestamp":
1671742336629}, {"namespace": "aos", "hostname": "net-lab-swi-001-1", "vrf": "",
"prefix": "10.20.99.0/24", "nexthopIps": ["10.20.99.11"], "oifs": ["vlan2099ip"],
"protocol": "LOCAL", "source": "", "preference": 0, "ipvers": 0, "action": "",
"timestamp": 1656668007948}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vrf": "", "prefix": "127.0.0.1/32", "nexthopIps": ["127.0.0.1"], "oifs": [],
"timestamp": 1671742336629}, {"namespace": "aos", "hostname": "net-lab-swi-001-1",
"vrf": "", "prefix": "127.0.0.1/32", "nexthopIps": ["127.0.0.1"], "oifs": ["Loopback"],
"protocol": "LOCAL", "source": "", "preference": 0, "ipvers": 0, "action": "",
"timestamp": 1656668007948}]'
"timestamp": 1671742336629}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vrf": "", "prefix": "0.0.0.0/0", "nexthopIps": ["10.20.99.1"], "oifs": ["vlan2099"],
"protocol": "STATIC", "source": "", "preference": 0, "ipvers": 0, "action": "",
"timestamp": 1671742337119}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vrf": "", "prefix": "10.20.99.0/24", "nexthopIps": ["10.20.99.10"], "oifs": ["vlan2099"],
"protocol": "LOCAL", "source": "", "preference": 0, "ipvers": 0, "action": "",
"timestamp": 1671742337119}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vrf": "", "prefix": "127.0.0.1/32", "nexthopIps": ["127.0.0.1"], "oifs": ["Loopback"],
"protocol": "LOCAL", "source": "", "preference": 0, "ipvers": 0, "action": "",
"timestamp": 1671742337119}]'
- command: route summarize --format=json --namespace=aos
data-directory: tests/data/parquet/
marks: route show aos
58 changes: 30 additions & 28 deletions tests/integration/sqcmds/aos-samples/vlan.yml
Original file line number Diff line number Diff line change
@@ -7,45 +7,47 @@ tests:
1", "state": "suspended", "interfaces": ["1/1/1", "1/1/2", "1/1/3", "1/1/4", "1/1/5",
"1/1/6", "1/1/7", "1/1/8", "1/1/9", "1/1/10", "1/1/11", "1/1/12", "1/1/13", "1/1/14",
"1/1/15", "1/1/16", "1/1/17", "1/1/18", "1/1/19", "1/1/20", "1/1/21", "1/1/22",
"1/1/23", "1/1/24", "1/1/26", "1/1/27", "1/1/28"], "vlan": 1, "timestamp": 1656668007924},
"1/1/23", "1/1/24", "1/1/26", "1/1/27", "1/1/28"], "vlan": 1, "timestamp": 1671742336630},
{"namespace": "aos", "hostname": "net-lab-swi-001-1", "vlanName": "LAB-zone-mgmt",
"state": "active", "interfaces": ["0/1"], "vlan": 2099, "timestamp": 1656668007924},
"state": "active", "interfaces": ["0/1"], "vlan": 2099, "timestamp": 1671742336630},
{"namespace": "aos", "hostname": "net-lab-swi-001-1", "vlanName": "VCM IPC", "state":
"suspended", "interfaces": [], "vlan": 4094, "timestamp": 1656668007924}, {"namespace":
"suspended", "interfaces": [], "vlan": 4094, "timestamp": 1671742336630}, {"namespace":
"aos", "hostname": "net-lab-swi-dist", "vlanName": "VLAN 1", "state": "active",
"interfaces": ["1/1/2", "1/1/3", "1/1/4", "1/1/5", "1/1/6", "1/1/7", "1/1/8",
"1/1/9", "1/1/10", "1/1/11", "1/1/12", "1/1/13", "1/1/14", "1/1/15", "1/1/16",
"1/1/17", "1/1/18", "1/1/19", "1/1/20", "1/1/21", "1/1/22", "1/1/23", "1/1/24",
"1/1/25", "1/1/26", "1/1/27", "1/1/28", "1/1/29", "1/1/30", "0/19"], "vlan": 1,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2000", "state": "active", "interfaces": ["0/1"], "vlan": 2000,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2001", "state": "active", "interfaces": ["0/1"], "vlan": 2001,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2002", "state": "active", "interfaces": ["0/1"], "vlan": 2002,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2003", "state": "active", "interfaces": ["0/1"], "vlan": 2003,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2004", "state": "active", "interfaces": ["0/1"], "vlan": 2004,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2008", "state": "active", "interfaces": ["0/1"], "vlan": 2008,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2012", "state": "active", "interfaces": ["0/1"], "vlan": 2012,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VLAN 2016", "state": "active", "interfaces": ["0/1"], "vlan": 2016,
"timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "LAB-zone-mgmt", "state": "active", "interfaces": ["0/1", "0/19"],
"vlan": 2099, "timestamp": 1656668008637}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"timestamp": 1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "test", "state": "suspended", "interfaces": [], "vlan": 10, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2000", "state": "active", "interfaces": ["0/1"], "vlan": 2000, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2001", "state": "active", "interfaces": ["0/1"], "vlan": 2001, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2002", "state": "active", "interfaces": ["0/1"], "vlan": 2002, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2003", "state": "active", "interfaces": ["0/1"], "vlan": 2003, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2004", "state": "active", "interfaces": ["0/1"], "vlan": 2004, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2008", "state": "active", "interfaces": ["0/1"], "vlan": 2008, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2012", "state": "active", "interfaces": ["0/1"], "vlan": 2012, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"VLAN 2016", "state": "active", "interfaces": ["0/1"], "vlan": 2016, "timestamp":
1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist", "vlanName":
"LAB-zone-mgmt", "state": "active", "interfaces": ["0/1", "0/19"], "vlan": 2099,
"timestamp": 1671742337226}, {"namespace": "aos", "hostname": "net-lab-swi-dist",
"vlanName": "VCM IPC", "state": "suspended", "interfaces": [], "vlan": 4094, "timestamp":
1656668008637}]'
1671742337226}]'
- command: vlan summarize --format=json --namespace=aos
data-directory: tests/data/parquet/
marks: vlan show aos
output: '{"aos": {"deviceCnt": 2, "uniqueVlanCnt": 11, "activeVlanCnt": 10, "suspendedVlanCnt":
0, "vlanPerDeviceStat": [3, 11, 7.0], "ifPerVlanStat": [1, 2, 1.0]}}'
output: '{"aos": {"deviceCnt": 2, "uniqueVlanCnt": 12, "activeVlanCnt": 10, "suspendedVlanCnt":
0, "vlanPerDeviceStat": [3, 12, 7.5], "ifPerVlanStat": [1, 2, 1.0]}}'
- command: vlan unique --format=json --namespace=aos
data-directory: tests/data/parquet/
marks: vlan show aos
output: '[{"vlan": 1}, {"vlan": 2000}, {"vlan": 2001}, {"vlan": 2002}, {"vlan":
2003}, {"vlan": 2004}, {"vlan": 2008}, {"vlan": 2012}, {"vlan": 2016}, {"vlan":
2099}, {"vlan": 4094}]'
output: '[{"vlan": 1}, {"vlan": 10}, {"vlan": 2000}, {"vlan": 2001}, {"vlan": 2002},
{"vlan": 2003}, {"vlan": 2004}, {"vlan": 2008}, {"vlan": 2012}, {"vlan": 2016},
{"vlan": 2099}, {"vlan": 4094}]'