Skip to content

Fix test_cacl_application for latest change in caclmgrd #13786

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

Merged
wangxin merged 3 commits into from
Jul 29, 2024
Merged

Fix test_cacl_application for latest change in caclmgrd #13786

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5913905
Fix test_cacl_application for latest change in caclmgrd
ZhaohuiS Jul 24, 2024
4fe13d2
skip test_cacl_application for now
ZhaohuiS Jul 25, 2024
f5fbed9
remove test_cacl_application from PR test temporarily
ZhaohuiS Jul 26, 2024
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
1 change: 0 additions & 1 deletion .azure-pipelines/pr_test_scripts.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ t0:
- bgp/test_bgp_speaker.py
- bgp/test_bgp_update_timer.py
- bgp/test_bgpmon.py
- cacl/test_cacl_application.py
Copy link
Collaborator

@wangxin wangxin Jul 29, 2024

Choose a reason for hiding this comment

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

With the skip rule in conditional mark, probably we can keep this line here to include in in PR testing. Then after the issue is fixed and resolved, then this script will be automatically covered by PR testing.

Copy link
Contributor Author

@ZhaohuiS ZhaohuiS Jul 29, 2024

Choose a reason for hiding this comment

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

@wangxin In my second commit, I added the skip condition and kept this line, but PR test still kept failing with this case, that's why I removed this line, I will add this line back when image change is included.

- cacl/test_cacl_function.py
- console/test_console_availability.py
- console/test_console_driver.py
Expand Down
9 changes: 7 additions & 2 deletions tests/cacl/test_cacl_application.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,8 +589,13 @@ def generate_expected_rules(duthost, tbinfo, docker_network, asic_index, expecte
generate_and_append_block_ip2me_traffic_rules(duthost, iptables_rules, ip6tables_rules, asic_index)

# Allow all packets with a TTL/hop limit of 0 or 1
iptables_rules.append("-A INPUT -m ttl --ttl-lt 2 -j ACCEPT")
ip6tables_rules.append("-A INPUT -p tcp -m hl --hl-lt 2 -j ACCEPT")
iptables_rules.append("-A INPUT -p icmp -m ttl --ttl-lt 2 -j ACCEPT")
iptables_rules.append("-A INPUT -p udp -m ttl --ttl-lt 2 -m udp --dport 1025:65535 -j ACCEPT")
iptables_rules.append("-A INPUT -p tcp -m ttl --ttl-lt 2 -m tcp --dport 1025:65535 -j ACCEPT")

ip6tables_rules.append("-A INPUT -p ipv6-icmp -m hl --hl-lt 2 -j ACCEPT")
ip6tables_rules.append("-A INPUT -p udp -m hl --hl-lt 2 -m udp --dport 1025:65535 -j ACCEPT")
ip6tables_rules.append("-A INPUT -p tcp -m hl --hl-lt 2 -m tcp --dport 1025:65535 -j ACCEPT")

# If we have added rules from the device config, we lastly add default drop rules
if rules_applied_from_config > 0:
Expand Down
6 changes: 6 additions & 0 deletions tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,12 @@ bgp/test_traffic_shift.py::test_load_minigraph_with_traffic_shift_away:
#######################################
##### cacl #####
#######################################
cacl/test_cacl_application.py:
skip:
reason: "Skip test_cacl_application temporarily due to known issue"
conditions:
- https://github.com/sonic-net/sonic-mgmt/issues/13805

cacl/test_cacl_application.py::test_cacl_application_dualtor:
skip:
reason: "test_cacl_application_dualtor is only supported on dualtor topology"
Expand Down