Skip to content

Commit 8c5b06a

Browse files
Few fixes for docker-vs pytest.
Signed-off-by: Akhilesh Samineni <[email protected]>
1 parent 44af1fc commit 8c5b06a

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

orchagent/routeorch.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ RouteOrch::RouteOrch(DBConnector *db, string tableName, SwitchOrch *switchOrch,
115115

116116
SWSS_LOG_NOTICE("Create IPv6 default route with packet action drop");
117117

118+
/* Add fe80::/10 subnet route to forward all link-local packets
119+
* destined to us, to CPU */
118120
IpPrefix default_link_local_prefix("fe80::/10");
119121

120122
addLinkLocalRouteToMe(gVirtualRouterId, default_link_local_prefix);

tests/test_interface.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def create_vrf(self, vrf_name):
3636
tbl = swsscommon.Table(self.cdb, "VRF")
3737
fvs = swsscommon.FieldValuePairs([('empty', 'empty')])
3838
tbl.set(vrf_name, fvs)
39-
time.sleep(1)
39+
time.sleep(2)
4040

4141
tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_VIRTUAL_ROUTER")
4242
current_entries = set(tbl.getKeys())
@@ -46,7 +46,7 @@ def create_vrf(self, vrf_name):
4646
def remove_vrf(self, vrf_name):
4747
tbl = swsscommon.Table(self.cdb, "VRF")
4848
tbl._del(vrf_name)
49-
time.sleep(1)
49+
time.sleep(2)
5050

5151
def create_l3_intf(self, interface, vrf_name):
5252
if interface.startswith("PortChannel"):
@@ -63,7 +63,7 @@ def create_l3_intf(self, interface, vrf_name):
6363
fvs = swsscommon.FieldValuePairs([("vrf_name", vrf_name)])
6464
tbl = swsscommon.Table(self.cdb, tbl_name)
6565
tbl.set(interface, fvs)
66-
time.sleep(1)
66+
time.sleep(2)
6767

6868
def remove_l3_intf(self, interface):
6969
if interface.startswith("PortChannel"):
@@ -76,7 +76,7 @@ def remove_l3_intf(self, interface):
7676
tbl_name = "INTERFACE"
7777
tbl = swsscommon.Table(self.cdb, tbl_name)
7878
tbl._del(interface)
79-
time.sleep(1)
79+
time.sleep(2)
8080

8181
def add_ip_address(self, interface, ip):
8282
if interface.startswith("PortChannel"):
@@ -90,7 +90,7 @@ def add_ip_address(self, interface, ip):
9090
tbl = swsscommon.Table(self.cdb, tbl_name)
9191
fvs = swsscommon.FieldValuePairs([("NULL", "NULL")])
9292
tbl.set(interface + "|" + ip, fvs)
93-
time.sleep(1)
93+
time.sleep(2)
9494

9595
def remove_ip_address(self, interface, ip):
9696
if interface.startswith("PortChannel"):
@@ -103,7 +103,7 @@ def remove_ip_address(self, interface, ip):
103103
tbl_name = "INTERFACE"
104104
tbl = swsscommon.Table(self.cdb, tbl_name)
105105
tbl._del(interface + "|" + ip)
106-
time.sleep(1)
106+
time.sleep(2)
107107

108108
def set_mtu(self, interface, mtu):
109109
if interface.startswith("PortChannel"):

0 commit comments

Comments
 (0)