Skip to content

Commit 68e34ef

Browse files
AndryNick98AndryNick98
committed
tests/sqcmds: updated tests due to changes
Signed-off-by: AndryNick98 <[email protected]>
1 parent 78c0700 commit 68e34ef

File tree

6 files changed

+140
-183
lines changed

6 files changed

+140
-183
lines changed

‎tests/integration/sqcmds/cumulus-samples/network.yml‎

Lines changed: 17 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -32,33 +32,29 @@ tests:
3232
- command: network find --address="52:54:00:c5:1d:06" --namespace=ospf-ibgp --format=json
3333
data-directory: tests/data/parquet
3434
marks: network find cumulus
35-
output: '[{"namespace": "ospf-ibgp", "hostname": "server103", "vrf": "default",
36-
"ipAddress": "172.16.1.101", "vlan": 0, "macaddr": "52:54:00:c5:1d:06", "ifname":
37-
"bond0", "bondMembers": "eth1, eth2", "type": "bridged", "l2miss": true}, {"namespace":
38-
"ospf-ibgp", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101",
39-
"vlan": 13, "macaddr": "52:54:00:c5:1d:06", "ifname": "bond01", "bondMembers":
40-
"swp5", "type": "bridged", "l2miss": false}, {"namespace": "ospf-ibgp", "hostname":
41-
"leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan": 13, "macaddr":
42-
"52:54:00:c5:1d:06", "ifname": "bond01", "bondMembers": "swp5", "type": "bridged",
43-
"l2miss": false}]'
35+
output: '[{"namespace": "ospf-ibgp", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
36+
"172.16.1.101", "vlan": 13, "macaddr": "52:54:00:c5:1d:06", "ifname": "bond01",
37+
"bondMembers": "swp5", "type": "bridged", "l2miss": false}, {"namespace": "ospf-ibgp",
38+
"hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
39+
13, "macaddr": "52:54:00:c5:1d:06", "ifname": "bond01", "bondMembers": "swp5",
40+
"type": "bridged", "l2miss": false}, {"namespace": "ospf-ibgp", "hostname": "server103",
41+
"vrf": "default", "ipAddress": "172.16.1.101", "vlan": 0, "macaddr": "52:54:00:c5:1d:06",
42+
"ifname": "bond0", "bondMembers": "eth1, eth2", "type": "bridged", "l2miss": true}]'
4443
- command: network find --address="72:f0:17:6d:80:3f" --namespace=ospf-ibgp --format=json
4544
data-directory: tests/data/parquet
4645
marks: network find cumulus
47-
output: '[{"namespace": "ospf-ibgp", "hostname": "leaf04", "vrf": "", "ipAddress":
48-
"", "vlan": 24, "macaddr": "72:f0:17:6d:80:3f", "ifname": "vni24", "bondMembers":
49-
"", "type": "interface", "l2miss": false}]'
46+
output: '[]'
5047
- command: network find --address="5254.00c5.1d06" --format=json
5148
data-directory: tests/data/parquet
5249
marks: network find cumulus
53-
output: '[{"namespace": "ospf-ibgp", "hostname": "server103", "vrf": "default",
54-
"ipAddress": "172.16.1.101", "vlan": 0, "macaddr": "52:54:00:c5:1d:06", "ifname":
55-
"bond0", "bondMembers": "eth1, eth2", "type": "bridged", "l2miss": true}, {"namespace":
56-
"ospf-ibgp", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101",
57-
"vlan": 13, "macaddr": "52:54:00:c5:1d:06", "ifname": "bond01", "bondMembers":
58-
"swp5", "type": "bridged", "l2miss": false}, {"namespace": "ospf-ibgp", "hostname":
59-
"leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan": 13, "macaddr":
60-
"52:54:00:c5:1d:06", "ifname": "bond01", "bondMembers": "swp5", "type": "bridged",
61-
"l2miss": false}]'
50+
output: '[{"namespace": "ospf-ibgp", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
51+
"172.16.1.101", "vlan": 13, "macaddr": "52:54:00:c5:1d:06", "ifname": "bond01",
52+
"bondMembers": "swp5", "type": "bridged", "l2miss": false}, {"namespace": "ospf-ibgp",
53+
"hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
54+
13, "macaddr": "52:54:00:c5:1d:06", "ifname": "bond01", "bondMembers": "swp5",
55+
"type": "bridged", "l2miss": false}, {"namespace": "ospf-ibgp", "hostname": "server103",
56+
"vrf": "default", "ipAddress": "172.16.1.101", "vlan": 0, "macaddr": "52:54:00:c5:1d:06",
57+
"ifname": "bond0", "bondMembers": "eth1, eth2", "type": "bridged", "l2miss": true}]'
6258
- command: network find --address="10.0.0.11" --format=json --namespace='ospf-single
6359
dual-evpn ospf-ibgp'
6460
data-directory: tests/data/parquet

‎tests/integration/sqcmds/eos-samples/network.yml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,37 +3,37 @@ tests:
33
- command: network find --address="172.16.1.101" --format=json --namespace=eos
44
data-directory: tests/data/parquet
55
marks: network find eos
6-
output: '[{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress":
6+
output: '[{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
77
"172.16.1.101", "vlan": 10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3",
88
"bondMembers": "Ethernet3", "type": "bridged", "l2miss": false}, {"namespace":
9-
"eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
9+
"eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
1010
10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3", "bondMembers":
1111
"Ethernet3", "type": "bridged", "l2miss": false}]'
1212
- command: network find --address="66:49:0d:d4:d8:63" --format=json --namespace=eos
1313
data-directory: tests/data/parquet
1414
marks: network find eos
15-
output: '[{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress":
15+
output: '[{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
1616
"172.16.1.101", "vlan": 10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3",
1717
"bondMembers": "Ethernet3", "type": "bridged", "l2miss": false}, {"namespace":
18-
"eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
18+
"eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
1919
10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3", "bondMembers":
2020
"Ethernet3", "type": "bridged", "l2miss": false}]'
2121
- command: network find --address="6649.0dd4.d863" --format=json --namespace=eos
2222
data-directory: tests/data/parquet
2323
marks: network find eos
24-
output: '[{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress":
24+
output: '[{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
2525
"172.16.1.101", "vlan": 10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3",
2626
"bondMembers": "Ethernet3", "type": "bridged", "l2miss": false}, {"namespace":
27-
"eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
27+
"eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
2828
10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3", "bondMembers":
2929
"Ethernet3", "type": "bridged", "l2miss": false}]'
3030
- command: network find --address="66:49:0d:D4:D8:63" --format=json --namespace=eos
3131
data-directory: tests/data/parquet
3232
marks: network find eos
33-
output: '[{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress":
33+
output: '[{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
3434
"172.16.1.101", "vlan": 10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3",
3535
"bondMembers": "Ethernet3", "type": "bridged", "l2miss": false}, {"namespace":
36-
"eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
36+
"eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.1.101", "vlan":
3737
10, "macaddr": "66:49:0d:d4:d8:63", "ifname": "Port-Channel3", "bondMembers":
3838
"Ethernet3", "type": "bridged", "l2miss": false}]'
3939
- command: network find --address="10.0.0.11" --format=json --namespace=eos
@@ -63,17 +63,17 @@ tests:
6363
data-directory: tests/data/parquet
6464
marks: network find eos
6565
output: '[{"namespace": "eos", "hostname": "spine01", "vrf": "default", "ipAddress":
66-
"10.0.0.21", "vlan": 0, "macaddr": "44:38:39:ba:d2:34", "ifname": "Ethernet3",
66+
"10.0.0.21", "vlan": 0, "macaddr": "44:38:39:ba:d2:34", "ifname": "Ethernet5",
6767
"bondMembers": "", "type": "routed", "l2miss": false}, {"namespace": "eos", "hostname":
6868
"spine01", "vrf": "default", "ipAddress": "10.0.0.21", "vlan": 0, "macaddr": "44:38:39:ba:d2:34",
69-
"ifname": "Ethernet2", "bondMembers": "", "type": "routed", "l2miss": false},
69+
"ifname": "Ethernet6", "bondMembers": "", "type": "routed", "l2miss": false},
7070
{"namespace": "eos", "hostname": "spine01", "vrf": "default", "ipAddress": "10.0.0.21",
71-
"vlan": 0, "macaddr": "44:38:39:ba:d2:34", "ifname": "Ethernet5", "bondMembers":
71+
"vlan": 0, "macaddr": "44:38:39:ba:d2:34", "ifname": "Ethernet1", "bondMembers":
7272
"", "type": "routed", "l2miss": false}, {"namespace": "eos", "hostname": "spine01",
7373
"vrf": "default", "ipAddress": "10.0.0.21", "vlan": 0, "macaddr": "44:38:39:ba:d2:34",
74-
"ifname": "Ethernet6", "bondMembers": "", "type": "routed", "l2miss": false},
74+
"ifname": "Ethernet2", "bondMembers": "", "type": "routed", "l2miss": false},
7575
{"namespace": "eos", "hostname": "spine01", "vrf": "default", "ipAddress": "10.0.0.21",
76-
"vlan": 0, "macaddr": "44:38:39:ba:d2:34", "ifname": "Ethernet1", "bondMembers":
76+
"vlan": 0, "macaddr": "44:38:39:ba:d2:34", "ifname": "Ethernet3", "bondMembers":
7777
"", "type": "routed", "l2miss": false}, {"namespace": "eos", "hostname": "spine01",
7878
"vrf": "default", "ipAddress": "10.0.0.21", "vlan": 0, "macaddr": "44:38:39:ba:d2:34",
7979
"ifname": "Ethernet4", "bondMembers": "", "type": "routed", "l2miss": false},
@@ -104,25 +104,25 @@ tests:
104104
- command: network find --address='00:00:00:11:12:10' --format=json --namespace=eos
105105
data-directory: tests/data/parquet
106106
marks: network find eos
107-
output: '[{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress":
107+
output: '[{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
108108
"172.16.1.254", "vlan": 10, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan10",
109109
"bondMembers": "", "type": "interface", "l2miss": false}, {"namespace": "eos",
110-
"hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254", "vlan":
110+
"hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254", "vlan":
111111
30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers": "", "type":
112-
"interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf04", "vrf":
113-
"evpn-vrf", "ipAddress": "172.16.3.254", "vlan": 30, "macaddr": "00:00:00:11:12:10",
114-
"ifname": "Vlan30", "bondMembers": "", "type": "interface", "l2miss": false},
115-
{"namespace": "eos", "hostname": "leaf04", "vrf": "evpn-vrf", "ipAddress": "172.16.2.254",
116-
"vlan": 20, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan20", "bondMembers":
112+
"interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf02", "vrf":
113+
"evpn-vrf", "ipAddress": "172.16.1.254", "vlan": 10, "macaddr": "00:00:00:11:12:10",
114+
"ifname": "Vlan10", "bondMembers": "", "type": "interface", "l2miss": false},
115+
{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
116+
"vlan": 30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers":
117117
"", "type": "interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf03",
118118
"vrf": "evpn-vrf", "ipAddress": "172.16.2.254", "vlan": 20, "macaddr": "00:00:00:11:12:10",
119119
"ifname": "Vlan20", "bondMembers": "", "type": "interface", "l2miss": false},
120120
{"namespace": "eos", "hostname": "leaf03", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
121121
"vlan": 30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers":
122-
"", "type": "interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf01",
123-
"vrf": "evpn-vrf", "ipAddress": "172.16.1.254", "vlan": 10, "macaddr": "00:00:00:11:12:10",
124-
"ifname": "Vlan10", "bondMembers": "", "type": "interface", "l2miss": false},
125-
{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
122+
"", "type": "interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf04",
123+
"vrf": "evpn-vrf", "ipAddress": "172.16.2.254", "vlan": 20, "macaddr": "00:00:00:11:12:10",
124+
"ifname": "Vlan20", "bondMembers": "", "type": "interface", "l2miss": false},
125+
{"namespace": "eos", "hostname": "leaf04", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
126126
"vlan": 30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers":
127127
"", "type": "interface", "l2miss": false}]'
128128
- command: network find --address='00:00:00:11:12' --format=json --namespace=eos
@@ -133,24 +133,24 @@ tests:
133133
- command: network find --address='0000.0011.1210' --format=json --namespace=eos
134134
data-directory: tests/data/parquet
135135
marks: network find eos
136-
output: '[{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress":
136+
output: '[{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress":
137137
"172.16.1.254", "vlan": 10, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan10",
138138
"bondMembers": "", "type": "interface", "l2miss": false}, {"namespace": "eos",
139-
"hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254", "vlan":
139+
"hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254", "vlan":
140140
30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers": "", "type":
141-
"interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf04", "vrf":
142-
"evpn-vrf", "ipAddress": "172.16.3.254", "vlan": 30, "macaddr": "00:00:00:11:12:10",
143-
"ifname": "Vlan30", "bondMembers": "", "type": "interface", "l2miss": false},
144-
{"namespace": "eos", "hostname": "leaf04", "vrf": "evpn-vrf", "ipAddress": "172.16.2.254",
145-
"vlan": 20, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan20", "bondMembers":
141+
"interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf02", "vrf":
142+
"evpn-vrf", "ipAddress": "172.16.1.254", "vlan": 10, "macaddr": "00:00:00:11:12:10",
143+
"ifname": "Vlan10", "bondMembers": "", "type": "interface", "l2miss": false},
144+
{"namespace": "eos", "hostname": "leaf02", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
145+
"vlan": 30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers":
146146
"", "type": "interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf03",
147147
"vrf": "evpn-vrf", "ipAddress": "172.16.2.254", "vlan": 20, "macaddr": "00:00:00:11:12:10",
148148
"ifname": "Vlan20", "bondMembers": "", "type": "interface", "l2miss": false},
149149
{"namespace": "eos", "hostname": "leaf03", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
150150
"vlan": 30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers":
151-
"", "type": "interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf01",
152-
"vrf": "evpn-vrf", "ipAddress": "172.16.1.254", "vlan": 10, "macaddr": "00:00:00:11:12:10",
153-
"ifname": "Vlan10", "bondMembers": "", "type": "interface", "l2miss": false},
154-
{"namespace": "eos", "hostname": "leaf01", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
151+
"", "type": "interface", "l2miss": false}, {"namespace": "eos", "hostname": "leaf04",
152+
"vrf": "evpn-vrf", "ipAddress": "172.16.2.254", "vlan": 20, "macaddr": "00:00:00:11:12:10",
153+
"ifname": "Vlan20", "bondMembers": "", "type": "interface", "l2miss": false},
154+
{"namespace": "eos", "hostname": "leaf04", "vrf": "evpn-vrf", "ipAddress": "172.16.3.254",
155155
"vlan": 30, "macaddr": "00:00:00:11:12:10", "ifname": "Vlan30", "bondMembers":
156156
"", "type": "interface", "l2miss": false}]'

‎tests/integration/sqcmds/junos-samples/network.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,12 @@ tests:
1616
"02:05:86:71:ad:07", "ifname": "xe-0/0/1", "bondMembers": "", "type": "routed",
1717
"l2miss": false}, {"namespace": "junos", "hostname": "leaf01", "vrf": "default",
1818
"ipAddress": "10.0.0.11", "vlan": 0, "macaddr": "00:00:00:00:00:00", "ifname":
19-
"lo0.0", "bondMembers": "", "type": "interface", "l2miss": false}]'
19+
"xe-0/0/0.0", "bondMembers": "", "type": "interface", "l2miss": false}, {"namespace":
20+
"junos", "hostname": "leaf01", "vrf": "default", "ipAddress": "10.0.0.11", "vlan":
21+
0, "macaddr": "00:00:00:00:00:00", "ifname": "lo0.0", "bondMembers": "", "type":
22+
"interface", "l2miss": false}, {"namespace": "junos", "hostname": "leaf01", "vrf":
23+
"default", "ipAddress": "10.0.0.11", "vlan": 0, "macaddr": "00:00:00:00:00:00",
24+
"ifname": "xe-0/0/1.0", "bondMembers": "", "type": "interface", "l2miss": false}]'
2025
- command: network find --address="169.254.127.0" --format=json --namespace=junos
2126
data-directory: tests/data/parquet
2227
marks: network find junos
@@ -39,7 +44,12 @@ tests:
3944
"02:05:86:71:74:07", "ifname": "xe-0/0/1", "bondMembers": "", "type": "routed",
4045
"l2miss": false}, {"namespace": "junos", "hostname": "exit01", "vrf": "default",
4146
"ipAddress": "10.0.0.31", "vlan": 0, "macaddr": "00:00:00:00:00:00", "ifname":
42-
"lo0.0", "bondMembers": "", "type": "interface", "l2miss": false}]'
47+
"lo0.0", "bondMembers": "", "type": "interface", "l2miss": false}, {"namespace":
48+
"junos", "hostname": "exit01", "vrf": "default", "ipAddress": "10.0.0.31", "vlan":
49+
0, "macaddr": "00:00:00:00:00:00", "ifname": "xe-0/0/1.0", "bondMembers": "",
50+
"type": "interface", "l2miss": false}, {"namespace": "junos", "hostname": "exit01",
51+
"vrf": "default", "ipAddress": "10.0.0.31", "vlan": 0, "macaddr": "00:00:00:00:00:00",
52+
"ifname": "xe-0/0/0.0", "bondMembers": "", "type": "interface", "l2miss": false}]'
4353
- command: network find --address="10.0.0.112" --format=json --namespace=junos
4454
data-directory: tests/data/parquet
4555
marks: network find junos

0 commit comments

Comments
 (0)