Skip to content

Commit

Permalink
Debug PBH test
Browse files Browse the repository at this point in the history
Signed-off-by: Stepan Blyschak <[email protected]>
  • Loading branch information
stepanblyschak committed Oct 15, 2024
1 parent 1536dfb commit ffbd073
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions tests/dvslib/dvs_acl.py
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,7 @@ def verify_acl_table_port_binding(

self.verify_acl_table_group_members(acl_table_id, acl_table_group_ids, num_tables)


def verify_acl_table_action_list(
self,
acl_table_id: str,
Expand All @@ -330,8 +330,8 @@ def verify_acl_table_action_list(
assert (int(action_count) == len(action_list))
for action in expected_action_list:
assert action in action_list


def create_acl_rule(
self,
table_name: str,
Expand Down Expand Up @@ -599,7 +599,7 @@ def verify_acl_rule_generic(
elif k == "SAI_ACL_ENTRY_ATTR_ADMIN_STATE":
assert v == "true"
elif k in sai_qualifiers:
assert sai_qualifiers[k](v)
assert sai_qualifiers[k](v), f"Failed to validate attribute {k}={v}"
else:
assert False, "Unknown SAI qualifier: key={}, value={}".format(k, v)

Expand Down Expand Up @@ -685,15 +685,15 @@ def _match_acl_range(sai_acl_range):
return True

return _match_acl_range

def get_acl_counter_oid(self, acl_rule_id=None) -> str:
if not acl_rule_id:
acl_rule_id = self._get_acl_rule_id()

entry = self.asic_db.wait_for_entry("ASIC_STATE:SAI_OBJECT_TYPE_ACL_ENTRY", acl_rule_id)
counter_oid = entry.get("SAI_ACL_ENTRY_ATTR_ACTION_COUNTER")
return counter_oid

def get_acl_rule_id(self) -> str:
return self._get_acl_rule_id()

Expand Down Expand Up @@ -753,7 +753,7 @@ def _check_acl_entry_counters_map(self, acl_entry_oid: str):
return
rule_to_counter_map = self.counters_db.get_entry("ACL_COUNTER_RULE_MAP", "")
counter_to_rule_map = {v: k for k, v in rule_to_counter_map.items()}
assert counter_oid in counter_to_rule_map
assert counter_oid in counter_to_rule_map

def check_acl_counter_not_in_counters_map(self, acl_counter_oid: str):
rule_to_counter_map = self.counters_db.get_entry("ACL_COUNTER_RULE_MAP", "")
Expand All @@ -774,7 +774,7 @@ def verify_acl_table_status(
if expected_status:
fvs = self.state_db.wait_for_entry(self.STATE_DB_ACL_TABLE_TABLE_NAME, acl_table_name)
assert len(fvs) > 0
assert (fvs['status'] == expected_status)
assert (fvs['status'] == expected_status)
else:
self.state_db.wait_for_deleted_entry(self.STATE_DB_ACL_TABLE_TABLE_NAME, acl_table_name)

Expand All @@ -795,7 +795,6 @@ def verify_acl_rule_status(
if expected_status:
fvs = self.state_db.wait_for_entry(self.STATE_DB_ACL_RULE_TABLE_NAME, key)
assert len(fvs) > 0
assert (fvs['status'] == expected_status)
assert (fvs['status'] == expected_status)
else:
self.state_db.wait_for_deleted_entry(self.STATE_DB_ACL_TABLE_TABLE_NAME, key)

0 comments on commit ffbd073

Please sign in to comment.