From 4c102603f0c9a7795aa5beef234639e7b730ab84 Mon Sep 17 00:00:00 2001 From: Prince Sunny Date: Fri, 11 Oct 2019 09:27:45 -0700 Subject: [PATCH] [vstest]: Update Route test to check for added entry (#1088) * Update Route test to check for added entry * check_syslog (awk) is taking ~2 seconds, in which an extra log can get generated --- tests/test_crm.py | 36 ++++++++++++++++++------------------ tests/test_route.py | 14 +++++++++++--- 2 files changed, 29 insertions(+), 21 deletions(-) diff --git a/tests/test_crm.py b/tests/test_crm.py index 425f471cb4bd..a27282682c3f 100644 --- a/tests/test_crm.py +++ b/tests/test_crm.py @@ -120,10 +120,10 @@ def test_CrmFdbEntry(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds fdb high 90") dvs.runcmd("crm config thresholds fdb type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "FDB_ENTRY THRESHOLD_EXCEEDED for TH_FREE", 1) # enable ipv6 on server 2 @@ -183,10 +183,10 @@ def test_CrmIpv4Route(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds ipv4 route high 90") dvs.runcmd("crm config thresholds ipv4 route type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "IPV4_ROUTE THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -253,10 +253,10 @@ def test_CrmIpv6Route(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds ipv6 route high 90") dvs.runcmd("crm config thresholds ipv6 route type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "IPV6_ROUTE THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|fc00::1/126") @@ -308,10 +308,10 @@ def test_CrmIpv4Nexthop(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds ipv4 nexthop high 90") dvs.runcmd("crm config thresholds ipv4 nexthop type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "IPV4_NEXTHOP THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -367,10 +367,10 @@ def test_CrmIpv6Nexthop(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds ipv6 nexthop high 90") dvs.runcmd("crm config thresholds ipv6 nexthop type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "IPV6_NEXTHOP THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|fc00::1/126") @@ -422,10 +422,10 @@ def test_CrmIpv4Neighbor(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds ipv4 neighbor high 90") dvs.runcmd("crm config thresholds ipv4 neighbor type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "IPV4_NEIGHBOR THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -481,10 +481,10 @@ def test_CrmIpv6Neighbor(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds ipv6 neighbor high 90") dvs.runcmd("crm config thresholds ipv6 neighbor type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "IPV6_NEIGHBOR THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|fc00::1/126") @@ -549,10 +549,10 @@ def test_CrmNexthopGroup(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds nexthop group member high 90") dvs.runcmd("crm config thresholds nexthop group object type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "NEXTHOP_GROUP THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") @@ -624,10 +624,10 @@ def test_CrmNexthopGroupMember(self, dvs, testlog): assert new_avail_counter == avail_counter marker = dvs.add_log_marker() - dvs.runcmd("crm config polling interval 2") + dvs.runcmd("crm config polling interval 3") dvs.runcmd("crm config thresholds nexthop group member high 90") dvs.runcmd("crm config thresholds nexthop group member type free") - time.sleep(2) + time.sleep(3) check_syslog(dvs, marker, "NEXTHOP_GROUP_MEMBER THRESHOLD_EXCEEDED for TH_FREE",1) intf_tbl._del("Ethernet0|10.0.0.0/31") diff --git a/tests/test_route.py b/tests/test_route.py index c9928214510c..12c30d99d731 100644 --- a/tests/test_route.py +++ b/tests/test_route.py @@ -38,8 +38,16 @@ def test_RouteAdd(self, dvs, testlog): (addobjs, delobjs) = dvs.GetSubscribedAsicDbObjects(pubsub) - assert len(addobjs) == 1 + assert len(addobjs) >= 1 - rt_key = json.loads(addobjs[0]['key']) + adb = swsscommon.DBConnector(swsscommon.ASIC_DB, dvs.redis_sock, 0) + atbl = swsscommon.Table(adb, "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY") + keys = atbl.getKeys() + found = False - assert rt_key['dest'] == "2.2.2.0/24" + for key in keys: + route = json.loads(key) + if route['dest'] == "2.2.2.0/24": + found = True + + assert found