Skip to content

[202012] [CoPP] Enable CoPP UT #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
noaOrMlnx wants to merge 1 commit into from
Closed

[202012] [CoPP] Enable CoPP UT #8

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions tests/test_copp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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")])
Expand All @@ -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:
Expand All @@ -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")])
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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")])
Expand Down Expand Up @@ -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)
Expand All @@ -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]
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down