From 00bcd269866dd25dea9b655b7c72ad54a6567316 Mon Sep 17 00:00:00 2001 From: Noa Or Date: Thu, 10 Mar 2022 14:41:22 +0000 Subject: [PATCH] Enable CoPP UT --- tests/test_copp.py | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tests/test_copp.py b/tests/test_copp.py index f0aca46bb98..6ddccf61af9 100644 --- a/tests/test_copp.py +++ b/tests/test_copp.py @@ -269,7 +269,7 @@ def validate_trap_group(self, trap_oid, trap_group): assert trap_priority == trap_group[keys] elif obj_type == "SAI_OBJECT_TYPE_HOSTIF": - host_tbl_keys = self.hostiftbl_atbl.getKeys(); + host_tbl_keys = self.hostiftbl_atbl.getKeys() host_tbl_key = None for host_tbl_entry in host_tbl_keys: (status, fvs) = self.hostiftbl_atbl.get(host_tbl_entry) @@ -300,7 +300,7 @@ def validate_trap_group(self, trap_oid, trap_group): if fv[0] == "SAI_HOSTIF_ATTR_NAME": assert fv[1] == trap_group[keys] - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_defaults(self, dvs, testlog): self.setup_copp(dvs) trap_keys = self.trap_atbl.getKeys() @@ -328,7 +328,7 @@ def test_defaults(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_restricted_trap_sflow(self, dvs, testlog): self.setup_copp(dvs) fvs = swsscommon.FieldValuePairs([("state", "enabled")]) @@ -346,7 +346,6 @@ def test_restricted_trap_sflow(self, dvs, testlog): always_enabled = True if "sample_packet" not in trap_ids: continue - trap_group = copp_trap[traps] trap_found = False trap_type = traps_to_trap_type["sample_packet"] for key in trap_keys: @@ -362,7 +361,7 @@ def test_restricted_trap_sflow(self, dvs, testlog): assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_policer_set(self, dvs, testlog): self.setup_copp(dvs) fvs = swsscommon.FieldValuePairs([("cbs", "900")]) @@ -398,7 +397,7 @@ def test_policer_set(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_trap_group_set(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -435,7 +434,7 @@ def test_trap_group_set(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_trap_ids_set(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -497,7 +496,7 @@ def test_trap_ids_set(self, dvs, testlog): break assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_trap_action_set(self, dvs, testlog): self.setup_copp(dvs) fvs = swsscommon.FieldValuePairs([("trap_action", "copy")]) @@ -530,12 +529,13 @@ def test_trap_action_set(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_new_trap_add(self, dvs, testlog): self.setup_copp(dvs) global copp_trap traps = "eapol" fvs = swsscommon.FieldValuePairs([("trap_group", "queue1_group2"),("trap_ids", traps),("always_enabled", "true")]) + self.trap_ctbl.set(traps, fvs) copp_trap["eapol"] = [traps, copp_group_queue1_group2, "always_enabled"] time.sleep(2) @@ -560,12 +560,12 @@ def test_new_trap_add(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_new_trap_del(self, dvs, testlog): self.setup_copp(dvs) global copp_trap traps = "eapol" - fvs = swsscommon.FieldValuePairs([("trap_group", "queue1_group2"),("trap_ids", "eapol")]) + fvs = swsscommon.FieldValuePairs([("trap_group", "queue1_group2"),("trap_ids", traps)]) self.trap_ctbl.set(traps, fvs) for c_trap in copp_trap: trap_info = copp_trap[c_trap] @@ -598,7 +598,7 @@ def test_new_trap_del(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == False - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_new_trap_group_add(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -638,7 +638,7 @@ def test_new_trap_group_add(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_new_trap_group_del(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -680,7 +680,7 @@ def test_new_trap_group_del(self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found != True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_override_trap_grp_cfg_del (self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -717,7 +717,7 @@ def test_override_trap_grp_cfg_del (self, dvs, testlog): if trap_id not in disabled_traps: assert trap_found == True - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_override_trap_cfg_del(self, dvs, testlog): self.setup_copp(dvs) global copp_trap @@ -751,7 +751,7 @@ def test_override_trap_cfg_del(self, dvs, testlog): elif trap_id == "ssh": assert trap_found == False - @pytest.mark.skip("Skip to be removed after sonic-buildimage changes get merged") + def test_empty_trap_cfg(self, dvs, testlog): self.setup_copp(dvs) global copp_trap