From 0baba1c4dbfae710f9d1a047dff0096cd50eca68 Mon Sep 17 00:00:00 2001 From: Akhilesh Samineni Date: Thu, 22 Oct 2020 00:07:00 -0700 Subject: [PATCH] Few fixes for docker-vs pytest. Signed-off-by: Akhilesh Samineni --- orchagent/routeorch.cpp | 2 ++ tests/test_interface.py | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/orchagent/routeorch.cpp b/orchagent/routeorch.cpp index 727313adb35..4df91ef02ca 100644 --- a/orchagent/routeorch.cpp +++ b/orchagent/routeorch.cpp @@ -117,6 +117,8 @@ RouteOrch::RouteOrch(DBConnector *db, string tableName, SwitchOrch *switchOrch, SWSS_LOG_NOTICE("Create IPv6 default route with packet action drop"); + /* Add fe80::/10 subnet route to forward all link-local packets + * destined to us, to CPU */ IpPrefix default_link_local_prefix("fe80::/10"); addLinkLocalRouteToMe(gVirtualRouterId, default_link_local_prefix); diff --git a/tests/test_interface.py b/tests/test_interface.py index 902f2629279..99f0c75724e 100644 --- a/tests/test_interface.py +++ b/tests/test_interface.py @@ -36,7 +36,7 @@ def create_vrf(self, vrf_name): tbl = swsscommon.Table(self.cdb, "VRF") fvs = swsscommon.FieldValuePairs([('empty', 'empty')]) tbl.set(vrf_name, fvs) - time.sleep(1) + time.sleep(2) tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_VIRTUAL_ROUTER") current_entries = set(tbl.getKeys()) @@ -46,7 +46,7 @@ def create_vrf(self, vrf_name): def remove_vrf(self, vrf_name): tbl = swsscommon.Table(self.cdb, "VRF") tbl._del(vrf_name) - time.sleep(1) + time.sleep(2) def create_l3_intf(self, interface, vrf_name): if interface.startswith("PortChannel"): @@ -63,7 +63,7 @@ def create_l3_intf(self, interface, vrf_name): fvs = swsscommon.FieldValuePairs([("vrf_name", vrf_name)]) tbl = swsscommon.Table(self.cdb, tbl_name) tbl.set(interface, fvs) - time.sleep(1) + time.sleep(2) def remove_l3_intf(self, interface): if interface.startswith("PortChannel"): @@ -76,7 +76,7 @@ def remove_l3_intf(self, interface): tbl_name = "INTERFACE" tbl = swsscommon.Table(self.cdb, tbl_name) tbl._del(interface) - time.sleep(1) + time.sleep(2) def add_ip_address(self, interface, ip): if interface.startswith("PortChannel"): @@ -90,7 +90,7 @@ def add_ip_address(self, interface, ip): tbl = swsscommon.Table(self.cdb, tbl_name) fvs = swsscommon.FieldValuePairs([("NULL", "NULL")]) tbl.set(interface + "|" + ip, fvs) - time.sleep(1) + time.sleep(2) def remove_ip_address(self, interface, ip): if interface.startswith("PortChannel"): @@ -103,7 +103,7 @@ def remove_ip_address(self, interface, ip): tbl_name = "INTERFACE" tbl = swsscommon.Table(self.cdb, tbl_name) tbl._del(interface + "|" + ip) - time.sleep(1) + time.sleep(2) def set_mtu(self, interface, mtu): if interface.startswith("PortChannel"):