[dvs/copp] Adjust policer checks in VS tests for default COPP policers (

sonic-net#1519) Signed-off-by: Danny Allen <daall@microsoft.com>
theasianpianist · Nov 25, 2020 · c88d77f · c88d77f
1 parent c975c8d
commit c88d77f
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 5 deletions.
diff --git a/tests/conftest.py b/tests/conftest.py
@@ -129,6 +129,8 @@ def _populate_default_asic_db_values(self) -> None:
         self.default_acl_tables = self.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_ACL_TABLE")
         self.default_acl_entries = self.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_ACL_ENTRY")
 
+        self.default_copp_policers = self.get_keys("ASIC_STATE:SAI_OBJECT_TYPE_POLICER")
+
 
 class ApplDbValidator(DVSDatabase):
     NEIGH_TABLE = "NEIGH_TABLE"
@@ -1102,6 +1104,7 @@ def get_asic_db(self) -> AsicDbValidator:
             db = DVSDatabase(self.ASIC_DB_ID, self.redis_sock)
             db.default_acl_tables = self.asicdb.default_acl_tables
             db.default_acl_entries = self.asicdb.default_acl_entries
+            db.default_copp_policers = self.asicdb.default_copp_policers
             db.port_name_map = self.asicdb.portnamemap
             db.default_vlan_id = self.asicdb.default_vlan_id
             db.port_to_id_map = self.asicdb.portoidmap

diff --git a/tests/dvslib/dvs_policer.py b/tests/dvslib/dvs_policer.py
@@ -12,8 +12,10 @@ def remove_policer(self, name):
         self.config_db.delete_entry("POLICER", name)
 
     def verify_policer(self, name, expected=1):
-        self.asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_POLICER", expected)
+        self.asic_db.wait_for_n_keys(
+            "ASIC_STATE:SAI_OBJECT_TYPE_POLICER",
+            expected + len(self.asic_db.default_copp_policers)
+        )
 
     def verify_no_policer(self):
         self.asic_db.wait_for_n_keys("ASIC_STATE:SAI_OBJECT_TYPE_ACL_ENTRY", 0)
-
diff --git a/tests/test_mirror_policer.py b/tests/test_mirror_policer.py
@@ -103,7 +103,7 @@ def test_MirrorPolicer(self, dvs, testlog):
 
         # check asic database
         tbl = swsscommon.Table(self.adb, "ASIC_STATE:SAI_OBJECT_TYPE_POLICER")
-        policer_entries = tbl.getKeys()
+        policer_entries = [p for p in tbl.getKeys() if p not in dvs.asicdb.default_copp_policers]
         assert len(policer_entries) == 1
         policer_oid = policer_entries[0]
 

diff --git a/tests/test_policer.py b/tests/test_policer.py
@@ -22,7 +22,7 @@ def test_PolicerBasic(self, dvs, testlog):
 
         # check asic database
         tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_POLICER")
-        policer_entries = tbl.getKeys()
+        policer_entries = [p for p in tbl.getKeys() if p not in dvs.asicdb.default_copp_policers]
         assert len(policer_entries) == 1
 
         (status, fvs) = tbl.get(policer_entries[0])
@@ -70,7 +70,7 @@ def test_PolicerBasic(self, dvs, testlog):
 
         # check asic database
         tbl = swsscommon.Table(dvs.adb, "ASIC_STATE:SAI_OBJECT_TYPE_POLICER")
-        policer_entries = tbl.getKeys()
+        policer_entries = [p for p in tbl.getKeys() if p not in dvs.asicdb.default_copp_policers]
         assert len(policer_entries) == 0