Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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: 2 additions & 2 deletions ansible/vars/topo_cable-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1::34/128
- FC00:1::35/128
- FC00:1::34/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-120.yml
Original file line number Diff line number Diff line change
Expand Up @@ -210,10 +210,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-56.yml
Original file line number Diff line number Diff line change
Expand Up @@ -114,10 +114,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-64-breakout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-aa-120.yml
Original file line number Diff line number Diff line change
Expand Up @@ -267,10 +267,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-aa-56.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-aa-64-breakout.yml
Original file line number Diff line number Diff line change
Expand Up @@ -139,10 +139,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-aa-64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-aa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-mixed-120.yml
Original file line number Diff line number Diff line change
Expand Up @@ -239,10 +239,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-mixed-56.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,10 +127,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor-mixed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,10 +79,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
4 changes: 2 additions & 2 deletions ansible/vars/topo_dualtor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ topology:
loopback1:
ipv4:
- 10.1.0.34/32
- 10.1.0.35/32
- 10.1.0.34/32
ipv6:
- FC00:1:0:34::/128
- FC00:1:0:35::/128
- FC00:1:0:34::/128
loopback2:
ipv4:
- 10.1.0.36/32
Expand Down
2 changes: 2 additions & 0 deletions tests/cacl/test_cacl_application.py
Original file line number Diff line number Diff line change
Expand Up @@ -579,6 +579,8 @@ def generate_expected_rules(duthost, tbinfo, docker_network, asic_index, expecte
rules_to_expect_for_dualtor = [
"-A INPUT -p udp -m udp --dport 67 -j DHCP",
"-A DHCP -j RETURN",
"-I INPUT 1 -d 10.1.0.34 -p tcp --dport 179 -j DROP",
" ip6tables -I INPUT 1 -d fc00:1:0:34:: -p tcp --dport 179 -j DROP",
"-N DHCP"
]
iptables_rules.extend(rules_to_expect_for_dualtor)
Expand Down
Loading