Skip to content
Merged
Changes from 1 commit
Commits
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
4 changes: 3 additions & 1 deletion tests/cacl/test_cacl_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,13 @@ def get_cacl_tables_and_rules(duthost):
def generate_and_append_block_ip2me_traffic_rules(duthost, iptables_rules, ip6tables_rules, asic_index):
INTERFACE_TABLE_NAME_LIST = [
"LOOPBACK_INTERFACE",
"MGMT_INTERFACE",
"VLAN_INTERFACE",
"PORTCHANNEL_INTERFACE",
"INTERFACE"
]
incl_mgmt_if_branch = ['201911', '202012', '202111', '202205']
Copy link
Copy Markdown
Contributor

@prsunny prsunny Dec 22, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

afaik, the caclmgrd changes were not backported to 201911, 202012 and previous branches. Is this only required for master?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the caclmgrd changes are not backported to 201911, 202012 or 202205 branches https://github.com/sonic-net/sonic-buildimage/blob/202205/src/sonic-host-services/scripts/caclmgrd#L246
So will need in master or in future branches based off master.
so we include mgmt_interface only for older branches.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, but we've sonic-mgmt branch for 201911, 202012 which still has MGMT_INTERFACE

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Right, so we dont need this check here, should we assume that everyone will run this test case with the right sonic-mgmt branch corresponding to the image?

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, because I don't think we can run master sonic-mgmt on older branches anymore as the tests have diverged

if any(branch in duthost.os_version for branch in incl_mgmt_if_branch):
INTERFACE_TABLE_NAME_LIST.append("MGMT_INTERFACE")

# Gather device configuration facts
namespace = duthost.get_namespace_from_asic_id(asic_index)
Expand Down