Skip to content

Commit aa116f4

Browse files
daalldaall
authored
[dvs] Update tests to use correct command to bring up interfaces (#1260)
* [dvs] Update tests to use correct command to bring up interfaces Signed-off-by: Danny Allen <[email protected]>
1 parent 53ee2e3 commit aa116f4

File tree

6 files changed

+45
-42
lines changed

6 files changed

+45
-42
lines changed

‎tests/test_crm.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ def test_CrmIpv4Route(self, dvs, testlog):
138138
fvs = swsscommon.FieldValuePairs([("NULL","NULL")])
139139
intf_tbl.set("Ethernet0", fvs)
140140
intf_tbl.set("Ethernet0|10.0.0.0/31", fvs)
141-
dvs.runcmd("ifconfig Ethernet0 up")
141+
dvs.runcmd("config interface startup Ethernet0")
142142

143143
dvs.runcmd("crm config polling interval 1")
144144

@@ -205,7 +205,7 @@ def test_CrmIpv6Route(self, dvs, testlog):
205205
fvs = swsscommon.FieldValuePairs([("NULL","NULL")])
206206
intf_tbl.set("Ethernet0", fvs)
207207
intf_tbl.set("Ethernet0|fc00::1/126", fvs)
208-
dvs.runcmd("ifconfig Ethernet0 up")
208+
dvs.runcmd("config interface startup Ethernet0")
209209

210210
dvs.servers[0].runcmd("ifconfig eth0 inet6 add fc00::2/126")
211211
dvs.servers[0].runcmd("ip -6 route add default via fc00::1")
@@ -271,7 +271,7 @@ def test_CrmIpv4Nexthop(self, dvs, testlog):
271271
fvs = swsscommon.FieldValuePairs([("NULL","NULL")])
272272
intf_tbl.set("Ethernet0|10.0.0.0/31", fvs)
273273
intf_tbl.set("Ethernet0", fvs)
274-
dvs.runcmd("ifconfig Ethernet0 up")
274+
dvs.runcmd("config interface startup Ethernet0")
275275

276276
dvs.runcmd("crm config polling interval 1")
277277

@@ -330,7 +330,7 @@ def test_CrmIpv6Nexthop(self, dvs, testlog):
330330
fvs = swsscommon.FieldValuePairs([("NULL","NULL")])
331331
intf_tbl.set("Ethernet0", fvs)
332332
intf_tbl.set("Ethernet0|fc00::1/126", fvs)
333-
dvs.runcmd("ifconfig Ethernet0 up")
333+
dvs.runcmd("config interface startup Ethernet0")
334334

335335
dvs.runcmd("crm config polling interval 1")
336336

@@ -385,7 +385,7 @@ def test_CrmIpv4Neighbor(self, dvs, testlog):
385385
fvs = swsscommon.FieldValuePairs([("NULL","NULL")])
386386
intf_tbl.set("Ethernet0", fvs)
387387
intf_tbl.set("Ethernet0|10.0.0.0/31", fvs)
388-
dvs.runcmd("ifconfig Ethernet0 up")
388+
dvs.runcmd("config interface startup Ethernet0")
389389

390390
dvs.runcmd("crm config polling interval 1")
391391

@@ -444,7 +444,7 @@ def test_CrmIpv6Neighbor(self, dvs, testlog):
444444
fvs = swsscommon.FieldValuePairs([("NULL","NULL")])
445445
intf_tbl.set("Ethernet0", fvs)
446446
intf_tbl.set("Ethernet0|fc00::1/126", fvs)
447-
dvs.runcmd("ifconfig Ethernet0 up")
447+
dvs.runcmd("config interface startup Ethernet0")
448448

449449
dvs.runcmd("crm config polling interval 1")
450450

@@ -501,8 +501,8 @@ def test_CrmNexthopGroup(self, dvs, testlog):
501501
intf_tbl.set("Ethernet4", fvs)
502502
intf_tbl.set("Ethernet0|10.0.0.0/31", fvs)
503503
intf_tbl.set("Ethernet4|10.0.0.2/31", fvs)
504-
dvs.runcmd("ifconfig Ethernet0 up")
505-
dvs.runcmd("ifconfig Ethernet4 up")
504+
dvs.runcmd("config interface startup Ethernet0")
505+
dvs.runcmd("config interface startup Ethernet4")
506506

507507
dvs.runcmd("crm config polling interval 1")
508508

@@ -576,8 +576,8 @@ def test_CrmNexthopGroupMember(self, dvs, testlog):
576576
intf_tbl.set("Ethernet4", fvs)
577577
intf_tbl.set("Ethernet0|10.0.0.0/31", fvs)
578578
intf_tbl.set("Ethernet4|10.0.0.2/31", fvs)
579-
dvs.runcmd("ifconfig Ethernet0 up")
580-
dvs.runcmd("ifconfig Ethernet4 up")
579+
dvs.runcmd("config interface startup Ethernet0")
580+
dvs.runcmd("config interface startup Ethernet4")
581581

582582
dvs.runcmd("crm config polling interval 1")
583583

‎tests/test_fdb.py

-1
Original file line numberDiff line numberDiff line change
@@ -382,4 +382,3 @@ def test_FdbAddedAfterMemberCreated(self, dvs, testlog):
382382
dvs.runcmd("sonic-clear fdb all")
383383
dvs.remove_vlan_member("2", "Ethernet0")
384384
dvs.remove_vlan("2")
385-

‎tests/test_nat.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ def set_interfaces(self, dvs):
1212
self.config_db.create_entry("INTERFACE", "Ethernet4|18.18.18.1/24", fvs)
1313
self.config_db.create_entry("INTERFACE", "Ethernet0", fvs)
1414
self.config_db.create_entry("INTERFACE", "Ethernet4", fvs)
15-
dvs.runcmd("ifconfig Ethernet0 up")
16-
dvs.runcmd("ifconfig Ethernet4 up")
15+
dvs.runcmd("config interface startup Ethernet0")
16+
dvs.runcmd("config interface startup Ethernet4")
1717

1818
dvs.servers[0].runcmd("ip link set down dev eth0")
1919
dvs.servers[0].runcmd("ip link set up dev eth0")

‎tests/test_nhg.py

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ def test_route_nhg(self, dvs, testlog):
1818
intf_tbl.set("Ethernet0|10.0.0.0/31", fvs)
1919
intf_tbl.set("Ethernet4|10.0.0.2/31", fvs)
2020
intf_tbl.set("Ethernet8|10.0.0.4/31", fvs)
21-
dvs.runcmd("ifconfig Ethernet0 up")
22-
dvs.runcmd("ifconfig Ethernet4 up")
23-
dvs.runcmd("ifconfig Ethernet8 up")
21+
dvs.runcmd("config interface startup Ethernet0")
22+
dvs.runcmd("config interface startup Ethernet4")
23+
dvs.runcmd("config interface startup Ethernet8")
2424

2525
dvs.runcmd("arp -s 10.0.0.1 00:00:00:00:00:01")
2626
dvs.runcmd("arp -s 10.0.0.3 00:00:00:00:00:02")

‎tests/test_port.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ def test_PortMtu(self, dvs, testlog):
2626
assert fv[1] == "9100"
2727

2828
def test_PortNotification(self, dvs, testlog):
29+
dvs.runcmd("config interface startup Ethernet0")
30+
dvs.runcmd("config interface ip add Ethernet0 10.0.0.0/31")
2931

30-
dvs.runcmd("ifconfig Ethernet0 10.0.0.0/31 up") == 0
31-
dvs.runcmd("ifconfig Ethernet4 10.0.0.2/31 up") == 0
32+
dvs.runcmd("config interface startup Ethernet4")
33+
dvs.runcmd("config interface ip add Ethernet4 10.0.0.2/31")
3234

3335
dvs.servers[0].runcmd("ip link set down dev eth0") == 0
3436

@@ -69,9 +71,11 @@ def test_PortNotification(self, dvs, testlog):
6971
assert oper_status == "up"
7072

7173
def test_PortFec(self, dvs, testlog):
74+
dvs.runcmd("config interface startup Ethernet0")
75+
dvs.runcmd("config interface ip add Ethernet0 10.0.0.0/31")
7276

73-
dvs.runcmd("ifconfig Ethernet0 10.0.0.0/31 up") == 0
74-
dvs.runcmd("ifconfig Ethernet4 10.0.0.2/31 up") == 0
77+
dvs.runcmd("config interface startup Ethernet4")
78+
dvs.runcmd("config interface ip add Ethernet4 10.0.0.2/31")
7579

7680
dvs.servers[0].runcmd("ip link set down dev eth0") == 0
7781

‎tests/test_warm_reboot.py

+22-22
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ def test_PortSyncdWarmRestart(self, dvs, testlog):
244244

245245
dvs.runcmd("config warm_restart enable swss")
246246

247-
dvs.runcmd("ifconfig Ethernet16 up")
248-
dvs.runcmd("ifconfig Ethernet20 up")
247+
dvs.runcmd("config interface startup Ethernet16")
248+
dvs.runcmd("config interface startup Ethernet20")
249249

250250
time.sleep(1)
251251

@@ -256,8 +256,8 @@ def test_PortSyncdWarmRestart(self, dvs, testlog):
256256
intf_tbl.set("Ethernet20|11.0.0.9/29", fvs)
257257
intf_tbl.set("Ethernet16", fvs)
258258
intf_tbl.set("Ethernet20", fvs)
259-
dvs.runcmd("ifconfig Ethernet16 up")
260-
dvs.runcmd("ifconfig Ethernet20 up")
259+
dvs.runcmd("config interface startup Ethernet16")
260+
dvs.runcmd("config interface startup Ethernet20")
261261

262262
dvs.servers[4].runcmd("ip link set down dev eth0") == 0
263263
dvs.servers[4].runcmd("ip link set up dev eth0") == 0
@@ -315,7 +315,7 @@ def test_PortSyncdWarmRestart(self, dvs, testlog):
315315

316316
check_port_oper_status(appl_db, "Ethernet16", "up")
317317
check_port_oper_status(appl_db, "Ethernet20", "up")
318-
check_port_oper_status(appl_db, "Ethernet24", "up")
318+
check_port_oper_status(appl_db, "Ethernet24", "down")
319319

320320

321321
swss_app_check_RestoreCount_single(state_db, restore_count, "portsyncd")
@@ -336,8 +336,8 @@ def test_VlanMgrdWarmRestart(self, dvs, testlog):
336336
dvs.runcmd("ifconfig Ethernet16 0")
337337
dvs.runcmd("ifconfig Ethernet20 0")
338338

339-
dvs.runcmd("ifconfig Ethernet16 up")
340-
dvs.runcmd("ifconfig Ethernet20 up")
339+
dvs.runcmd("config interface startup Ethernet16 ")
340+
dvs.runcmd("config interface startup Ethernet20 ")
341341

342342
time.sleep(1)
343343

@@ -384,8 +384,8 @@ def test_VlanMgrdWarmRestart(self, dvs, testlog):
384384
intf_tbl.set("Vlan20|11.0.0.9/29", fvs)
385385
intf_tbl.set("Vlan16", fvs)
386386
intf_tbl.set("Vlan20", fvs)
387-
dvs.runcmd("ifconfig Vlan16 up")
388-
dvs.runcmd("ifconfig Vlan20 up")
387+
dvs.runcmd("config interface startup Vlan16")
388+
dvs.runcmd("config interface startup Vlan20")
389389

390390
dvs.servers[4].runcmd("ifconfig eth0 11.0.0.2/29")
391391
dvs.servers[4].runcmd("ip route add default via 11.0.0.1")
@@ -478,8 +478,8 @@ def test_swss_neighbor_syncup(self, dvs, testlog):
478478
intf_tbl.set("{}".format(intfs[1]), fvs)
479479
intf_tbl.set("{}".format(intfs[0]), fvs)
480480
intf_tbl.set("{}".format(intfs[1]), fvs)
481-
dvs.runcmd("ifconfig {} up".format(intfs[0]))
482-
dvs.runcmd("ifconfig {} up".format(intfs[1]))
481+
dvs.runcmd("config interface startup {}".format(intfs[0]))
482+
dvs.runcmd("config interface startup {}".format(intfs[1]))
483483

484484
ips = ["24.0.0.2", "24.0.0.3", "28.0.0.2", "28.0.0.3"]
485485
v6ips = ["2400::2", "2400::3", "2800::2", "2800::3"]
@@ -831,8 +831,8 @@ def test_OrchagentWarmRestartReadyCheck(self, dvs, testlog):
831831
intf_tbl.set("Ethernet4|10.0.0.2/31", fvs)
832832
intf_tbl.set("Ethernet0", fvs)
833833
intf_tbl.set("Ethernet4", fvs)
834-
dvs.runcmd("ifconfig Ethernet0 up")
835-
dvs.runcmd("ifconfig Ethernet4 up")
834+
dvs.runcmd("config interface startup Ethernet0")
835+
dvs.runcmd("config interface startup Ethernet4")
836836

837837
dvs.servers[0].runcmd("ifconfig eth0 10.0.0.1/31")
838838
dvs.servers[0].runcmd("ip route add default via 10.0.0.0")
@@ -904,9 +904,9 @@ def test_swss_port_state_syncup(self, dvs, testlog):
904904
intf_tbl.set("Ethernet0", fvs)
905905
intf_tbl.set("Ethernet4", fvs)
906906
intf_tbl.set("Ethernet8", fvs)
907-
dvs.runcmd("ifconfig Ethernet0 up")
908-
dvs.runcmd("ifconfig Ethernet4 up")
909-
dvs.runcmd("ifconfig Ethernet8 up")
907+
dvs.runcmd("config interface startup Ethernet0")
908+
dvs.runcmd("config interface startup Ethernet4")
909+
dvs.runcmd("config interface startup Ethernet8")
910910

911911
dvs.runcmd("arp -s 10.0.0.1 00:00:00:00:00:01")
912912
dvs.runcmd("arp -s 10.0.0.3 00:00:00:00:00:02")
@@ -1075,9 +1075,9 @@ def test_routing_WarmRestart(self, dvs, testlog):
10751075
intf_tbl.set("{}".format(intfs[1]), fvs)
10761076
intf_tbl.set("{}".format(intfs[2]), fvs)
10771077
intf_tbl.set("{}".format(intfs[2]), fvs)
1078-
dvs.runcmd("ip link set {} up".format(intfs[0]))
1079-
dvs.runcmd("ip link set {} up".format(intfs[1]))
1080-
dvs.runcmd("ip link set {} up".format(intfs[2]))
1078+
dvs.runcmd("config interface startup {}".format(intfs[0]))
1079+
dvs.runcmd("config interface startup {}".format(intfs[1]))
1080+
dvs.runcmd("config interface startup {}".format(intfs[2]))
10811081

10821082
time.sleep(1)
10831083

@@ -1835,7 +1835,7 @@ def test_system_warmreboot_neighbor_syncup(self, dvs, testlog):
18351835
intf_tbl.set("Ethernet{}|{}00::1/64".format(i*4, i*4), fvs)
18361836
intf_tbl.set("Ethernet{}".format(i*4, i*4), fvs)
18371837
intf_tbl.set("Ethernet{}".format(i*4, i*4), fvs)
1838-
dvs.runcmd("ip link set Ethernet{} up".format(i*4, i*4))
1838+
dvs.runcmd("config interface startup Ethernet{}".format(i*4, i*4))
18391839
dvs.servers[i].runcmd("ip link set up dev eth0")
18401840
dvs.servers[i].runcmd("ip addr flush dev eth0")
18411841
#result = dvs.servers[i].runcmd_output("ifconfig eth0 | grep HWaddr | awk '{print $NF}'")
@@ -2082,8 +2082,8 @@ def test_VrfMgrdWarmRestart(self, dvs, testlog):
20822082
dvs.runcmd("config warm_restart enable swss")
20832083

20842084
# bring up interface
2085-
dvs.runcmd("ifconfig Ethernet0 up")
2086-
dvs.runcmd("ifconfig Ethernet4 up")
2085+
dvs.runcmd("config interface startup Ethernet0 ")
2086+
dvs.runcmd("config interface startup Ethernet4 ")
20872087

20882088
# create vrf
20892089
create_entry_tbl(conf_db, "VRF", "Vrf_1", [('empty', 'empty')])

0 commit comments

Comments
 (0)