Skip to content

Commit

Permalink
[pbh] [aclorch] Fixed a bug causes by updating the flow-counter value…
Browse files Browse the repository at this point in the history
… for the PBH rule (sonic-net#2226)

- What I did
Added the register and deregister functions for the flex counter before updating counters for the ACL rule.

- Why I did it
Overcome SAI error in case of flow counters disabled and then enabled.

- How I verified it
Added a UT.

Signed-off-by: Vadym Hlushko <[email protected]>
  • Loading branch information
vadymhlushko-mlnx authored Apr 23, 2022
1 parent 5ba6a54 commit 841f003
Show file tree
Hide file tree
Showing 3 changed files with 125 additions and 3 deletions.
6 changes: 5 additions & 1 deletion orchagent/aclorch.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -984,9 +984,13 @@ bool AclRule::updateCounter(const AclRule& updatedRule)
{
return false;
}

m_pAclOrch->registerFlexCounter(*this);
}
else
{
m_pAclOrch->deregisterFlexCounter(*this);

if (!disableCounter())
{
return false;
Expand Down Expand Up @@ -4467,7 +4471,7 @@ void AclOrch::registerFlexCounter(const AclRule& rule)
void AclOrch::deregisterFlexCounter(const AclRule& rule)
{
auto ruleIdentifier = generateAclRuleIdentifierInCountersDb(rule);
m_countersDb.hdel(COUNTERS_ACL_COUNTER_RULE_MAP, rule.getId());
m_countersDb.hdel(COUNTERS_ACL_COUNTER_RULE_MAP, ruleIdentifier);
m_flex_counter_manager.clearCounterIdList(rule.getCounterOid());
}

Expand Down
5 changes: 3 additions & 2 deletions orchagent/aclorch.h
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,9 @@ class AclOrch : public Orch, public Observer
bool m_isCombinedMirrorV6Table = true;
map<string, bool> m_mirrorTableCapabilities;

void registerFlexCounter(const AclRule& rule);
void deregisterFlexCounter(const AclRule& rule);

// Get the OID for the ACL bind point for a given port
static bool getAclBindPortId(Port& port, sai_object_id_t& port_id);

Expand Down Expand Up @@ -537,8 +540,6 @@ class AclOrch : public Orch, public Observer
void createDTelWatchListTables();
void deleteDTelWatchListTables();

void registerFlexCounter(const AclRule& rule);
void deregisterFlexCounter(const AclRule& rule);
string generateAclRuleIdentifierInCountersDb(const AclRule& rule) const;

map<sai_object_id_t, AclTable> m_AclTables;
Expand Down
117 changes: 117 additions & 0 deletions tests/test_pbh.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
import pytest
import logging

import test_flex_counters as flex_counter_module


PBH_HASH_FIELD_NAME = "inner_ip_proto"
PBH_HASH_FIELD_HASH_FIELD = "INNER_IP_PROTOCOL"
Expand Down Expand Up @@ -358,6 +360,121 @@ def test_PbhRuleUpdate(self, testlog):
self.dvs_pbh.verify_pbh_hash_field_count(0)


def test_PbhRuleUpdateFlowCounter(self, dvs, testlog):
try:
# PBH hash field
pbhlogger.info("Create PBH hash field: {}".format(PBH_HASH_FIELD_NAME))
self.dvs_pbh.create_pbh_hash_field(
hash_field_name=PBH_HASH_FIELD_NAME,
hash_field=PBH_HASH_FIELD_HASH_FIELD,
sequence_id=PBH_HASH_FIELD_SEQUENCE_ID
)
self.dvs_pbh.verify_pbh_hash_field_count(1)

# PBH hash
pbhlogger.info("Create PBH hash: {}".format(PBH_HASH_NAME))
self.dvs_pbh.create_pbh_hash(
hash_name=PBH_HASH_NAME,
hash_field_list=PBH_HASH_HASH_FIELD_LIST
)
self.dvs_pbh.verify_pbh_hash_count(1)

# PBH table
pbhlogger.info("Create PBH table: {}".format(PBH_TABLE_NAME))
self.dvs_pbh.create_pbh_table(
table_name=PBH_TABLE_NAME,
interface_list=PBH_TABLE_INTERFACE_LIST,
description=PBH_TABLE_DESCRIPTION
)
self.dvs_acl.verify_acl_table_count(1)

# Prepare ACL FLEX Counter environment
meta_data = flex_counter_module.counter_group_meta['acl_counter']
counter_key = meta_data['key']
counter_stat = meta_data['group_name']
counter_map = meta_data['name_map']

test_flex_counters = flex_counter_module.TestFlexCounters()
test_flex_counters.setup_dbs(dvs)
test_flex_counters.verify_no_flex_counters_tables(counter_stat)

# PBH rule
pbhlogger.info("Create PBH rule: {}".format(PBH_RULE_NAME))

attr_dict = {
"ether_type": PBH_RULE_ETHER_TYPE,
"ip_protocol": PBH_RULE_IP_PROTOCOL,
"gre_key": PBH_RULE_GRE_KEY,
"inner_ether_type": PBH_RULE_INNER_ETHER_TYPE
}

self.dvs_pbh.create_pbh_rule(
table_name=PBH_TABLE_NAME,
rule_name=PBH_RULE_NAME,
priority=PBH_RULE_PRIORITY,
qualifiers=attr_dict,
hash_name=PBH_RULE_HASH,
packet_action="SET_ECMP_HASH",
flow_counter="ENABLED"
)
self.dvs_acl.verify_acl_rule_count(1)
self.dvs_acl.get_acl_counter_ids(1)

pbhlogger.info("Enable a ACL FLEX counter")
test_flex_counters.set_flex_counter_group_status(counter_key, counter_map)
test_flex_counters.set_flex_counter_group_interval(counter_key, counter_stat, '1000')
test_flex_counters.verify_flex_counters_populated(counter_map, counter_stat)

pbhlogger.info("Disable a flow counter for PBH rule: {}".format(PBH_RULE_NAME))
self.dvs_pbh.update_pbh_rule(
table_name=PBH_TABLE_NAME,
rule_name=PBH_RULE_NAME,
priority=PBH_RULE_PRIORITY,
qualifiers=attr_dict,
hash_name=PBH_RULE_HASH,
packet_action="SET_ECMP_HASH",
flow_counter="DISABLED"
)
self.dvs_acl.get_acl_counter_ids(0)

pbhlogger.info("Enable a flow counter for PBH rule: {}".format(PBH_RULE_NAME))
self.dvs_pbh.update_pbh_rule(
table_name=PBH_TABLE_NAME,
rule_name=PBH_RULE_NAME,
priority=PBH_RULE_PRIORITY,
qualifiers=attr_dict,
hash_name=PBH_RULE_HASH,
packet_action="SET_ECMP_HASH",
flow_counter="ENABLED"
)
self.dvs_acl.get_acl_counter_ids(1)

finally:
# PBH rule
pbhlogger.info("Remove PBH rule: {}".format(PBH_RULE_NAME))
self.dvs_pbh.remove_pbh_rule(PBH_TABLE_NAME, PBH_RULE_NAME)
self.dvs_acl.verify_acl_rule_count(0)

# PBH table
pbhlogger.info("Remove PBH table: {}".format(PBH_TABLE_NAME))
self.dvs_pbh.remove_pbh_table(PBH_TABLE_NAME)
self.dvs_acl.verify_acl_table_count(0)

# PBH hash
pbhlogger.info("Remove PBH hash: {}".format(PBH_HASH_NAME))
self.dvs_pbh.remove_pbh_hash(PBH_HASH_NAME)
self.dvs_pbh.verify_pbh_hash_count(0)

# PBH hash field
pbhlogger.info("Remove PBH hash field: {}".format(PBH_HASH_FIELD_NAME))
self.dvs_pbh.remove_pbh_hash_field(PBH_HASH_FIELD_NAME)
self.dvs_pbh.verify_pbh_hash_field_count(0)

# ACL FLEX counter
pbhlogger.info("Disable ACL FLEX counter")
test_flex_counters.post_trap_flow_counter_test(meta_data)


@pytest.mark.usefixtures("dvs_lag_manager")
class TestPbhExtendedFlows:
class PbhRefCountHelper(object):
Expand Down

0 comments on commit 841f003

Please sign in to comment.