Adjust test_dynamic_acl.py so it can handle only ipv6 topologies.

tests/common/plugins/conditional_mark/tests_mark_conditions.yaml

@@ -2088,6 +2088,12 @@ generic_config_updater/test_dynamic_acl.py::test_gcu_acl_dhcp_rule_creation:
     conditions:
       - "'t0-isolated' in topo_name"
 
+generic_config_updater/test_dynamic_acl.py::test_gcu_acl_forward_rule_removal:
+  xfail:
+    reason: "skip for IPv6-only topologies"
+    conditions:
+      - "'-v6-' in topo_name"
+
 generic_config_updater/test_ecn_config_update.py::test_ecn_config_updates:
   skip:
     reason: "This test is not run on this asic type, topology, or version currently"

tests/generic_config_updater/test_dynamic_acl.py

@@ -35,7 +35,7 @@
 from tests.common.dualtor.mux_simulator_control import toggle_all_simulator_ports_to_rand_selected_tor  # noqa: F401
 from tests.common.dualtor.dual_tor_utils import setup_standby_ports_on_rand_unselected_tor  # noqa: F401
 from tests.common.utilities import get_all_upstream_neigh_type, get_downstream_neigh_type, \
-    increment_ipv4_addr, increment_ipv6_addr
+    increment_ipv4_addr, increment_ipv6_addr, is_ipv6_only_topology
 
 pytestmark = [
     pytest.mark.topology('t0', 'm0'),
@@ -646,16 +646,16 @@ def verify_expected_packet_behavior(exp_pkt, ptfadapter, setup, expect_drop):
         testutils.verify_packet_any_port(ptfadapter, exp_pkt, ports=setup["dst_port_indices"], timeout=20)
 
 
-def generate_packets(setup, dst_ip=DST_IP_FORWARDED_ORIGINAL, dst_ipv6=DST_IPV6_FORWARDED_ORIGINAL):
+def generate_packets(setup, tbinfo, dst_ip=DST_IP_FORWARDED_ORIGINAL, dst_ipv6=DST_IPV6_FORWARDED_ORIGINAL):
     """Generate packets that match the destination IP of given ips.
     If no IP is given, default to our original forwarding ips"""
 
     packets = {}
-
-    packets["IPV4"] = testutils.simple_tcp_packet(eth_dst=setup["router_mac"],
-                                                  ip_src=IP_SOURCE,
-                                                  ip_dst=dst_ip,
-                                                  ip_ttl=64)
+    if not is_ipv6_only_topology(tbinfo):
+        packets["IPV4"] = testutils.simple_tcp_packet(eth_dst=setup["router_mac"],
+                                                      ip_src=IP_SOURCE,
+                                                      ip_dst=dst_ip,
+                                                      ip_ttl=64)
 
     packets["IPV6"] = testutils.simple_tcpv6_packet(eth_dst=setup["router_mac"],
                                                     ipv6_src=IPV6_SOURCE,
@@ -1153,7 +1153,7 @@ def test_gcu_acl_arp_rule_creation(rand_selected_dut,
                                    setup,
                                    dynamic_acl_create_table,
                                    prepare_ptf_intf_and_ip,
-                                   toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                   toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that we can create a blanket ARP/NDP packet forwarding rule with GCU, and that ARP/NDP packets
     are correctly forwarded while all others are dropped."""
 
@@ -1186,7 +1186,7 @@ def test_gcu_acl_arp_rule_creation(rand_selected_dut,
 
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=True,
                                src_port=ptf_intf_index)
 
@@ -1197,7 +1197,7 @@ def test_gcu_acl_dhcp_rule_creation(rand_selected_dut,
                                     setup,
                                     dynamic_acl_create_table,
                                     toggle_all_simulator_ports_to_rand_selected_tor,    # noqa: F811
-                                    setup_standby_ports_on_rand_unselected_tor):        # noqa: F811
+                                    setup_standby_ports_on_rand_unselected_tor, tbinfo):        # noqa: F811
     """Verify that DHCP and DHCPv6 forwarding rules can be created, and that dhcp packets are properly forwarded
     whereas others are dropped"""
 
@@ -1211,7 +1211,7 @@ def test_gcu_acl_dhcp_rule_creation(rand_selected_dut,
 
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=True)
 
 
@@ -1220,19 +1220,19 @@ def test_gcu_acl_drop_rule_creation(rand_selected_dut,
                                     ptfadapter,
                                     setup,
                                     dynamic_acl_create_table,
-                                    toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                    toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that we can create a drop rule via GCU, and that once this drop rule is in place packets
     that match the drop rule are dropped and packets that do not match the drop rule are forwarded"""
 
     dynamic_acl_create_drop_rule_initial(rand_selected_dut, setup)
 
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=True)
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=False,
                                src_port=setup["unblocked_src_port_indice"])
 
@@ -1242,15 +1242,15 @@ def test_gcu_acl_drop_rule_removal(rand_selected_dut,
                                    ptfadapter,
                                    setup,
                                    dynamic_acl_create_table,
-                                   toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                   toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that once a drop rule is removed, packets that were previously being dropped are now forwarded"""
 
     dynamic_acl_create_three_drop_rules(rand_selected_dut, setup)
     dynamic_acl_remove_third_drop_rule(rand_selected_dut, setup)
 
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=False,
                                src_port=setup["scale_port_indices"][2])
 
@@ -1260,18 +1260,18 @@ def test_gcu_acl_forward_rule_priority_respected(rand_selected_dut,
                                                  ptfadapter,
                                                  setup,
                                                  dynamic_acl_create_table,
-                                                 toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                                 toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that forward rules and drop rules can be created at the same time, with the forward rules having
     higher priority than drop.  Then, perform a traffic test to confirm that packets that match both the forward
     and drop rules are correctly forwarded, as the forwarding rules have higher priority"""
 
     dynamic_acl_create_forward_rules(rand_selected_dut, setup)
     dynamic_acl_create_secondary_drop_rule(rand_selected_dut, setup)
 
-    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup),
+    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup, tbinfo),
                                packets_dropped=False)
     dynamic_acl_verify_packets(setup, ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=True)
 
 
@@ -1280,26 +1280,26 @@ def test_gcu_acl_forward_rule_same_priority(rand_selected_dut,
                                             ptfadapter,
                                             setup,
                                             dynamic_acl_create_table,
-                                            toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                            toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that forward rules can have the exact same priority and still all be applied correctly
     Then, perform a traffic test to confirm that packets that match both the forward
     and drop rules are correctly forwarded, as the forwarding rules have higher priority"""
 
     dynamic_acl_create_forward_rules_same_priority(rand_selected_dut, setup)
     dynamic_acl_create_secondary_drop_rule(rand_selected_dut, setup)
 
-    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup),
+    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup, tbinfo),
                                packets_dropped=False)
-    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup,
+    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup, tbinfo,
                                increment_ipv4_addr(DST_IP_FORWARDED_ORIGINAL, 1),
                                increment_ipv6_addr(DST_IPV6_FORWARDED_ORIGINAL, 1)),
                                packets_dropped=False)
-    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup,
+    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup, tbinfo,
                                increment_ipv4_addr(DST_IP_FORWARDED_ORIGINAL, 2),
                                increment_ipv6_addr(DST_IPV6_FORWARDED_ORIGINAL, 2)),
                                packets_dropped=False)
     dynamic_acl_verify_packets(setup, ptfadapter,
-                               packets=generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               packets=generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=True)
 
 
@@ -1308,7 +1308,7 @@ def test_gcu_acl_forward_rule_replacement(rand_selected_dut,
                                           ptfadapter,
                                           setup,
                                           dynamic_acl_create_table,
-                                          toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                          toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that forward rules can be created, and then afterwards can have their match pattern updated to a new value.
     Confirm that packets sent that match this new value are correctly forwarded, and that packets that are sent that
     match the old, replaced value are correctly dropped."""
@@ -1319,11 +1319,11 @@ def test_gcu_acl_forward_rule_replacement(rand_selected_dut,
 
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               packets=generate_packets(setup,
+                               packets=generate_packets(setup, tbinfo,
                                                         DST_IP_FORWARDED_REPLACEMENT,
                                                         DST_IPV6_FORWARDED_REPLACEMENT),
                                packets_dropped=False)
-    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup), packets_dropped=True)
+    dynamic_acl_verify_packets(setup, ptfadapter, packets=generate_packets(setup, tbinfo), packets_dropped=True)
 
 
 @pytest.mark.parametrize("ip_type", ["IPV4", "IPV6"])
@@ -1333,15 +1333,15 @@ def test_gcu_acl_forward_rule_removal(rand_selected_dut,
                                       setup,
                                       ip_type,
                                       dynamic_acl_create_table,
-                                      toggle_all_simulator_ports_to_rand_selected_tor):  # noqa: F811
+                                      toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa: F811
     """Test that if a forward rule is created, and then removed, that packets associated with that rule are properly
     no longer forwarded, and packets associated with the remaining rule are forwarded"""
 
     dynamic_acl_create_forward_rules(rand_selected_dut, setup)
     dynamic_acl_create_secondary_drop_rule(rand_selected_dut, setup)
     dynamic_acl_remove_ip_forward_rule(rand_selected_dut, ip_type, setup)
 
-    forward_packets = generate_packets(setup)
+    forward_packets = generate_packets(setup, tbinfo)
     drop_packets = forward_packets.copy()
     if ip_type == "IPV4":
         other_type = "IPV6"
@@ -1355,7 +1355,7 @@ def test_gcu_acl_forward_rule_removal(rand_selected_dut,
 
 
 def test_gcu_acl_scale_rules(rand_selected_dut, rand_unselected_dut, ptfadapter, setup, dynamic_acl_create_table,
-                             toggle_all_simulator_ports_to_rand_selected_tor):  # noqa:F811
+                             toggle_all_simulator_ports_to_rand_selected_tor, tbinfo):  # noqa:F811
     """Perform a scale test, creating 150 forward rules with top priority,
     and then creating a drop rule for every single VLAN port on our device.
     Select any one of our blocked ports, as well as the ips for two of our forward rules,
@@ -1373,12 +1373,12 @@ def test_gcu_acl_scale_rules(rand_selected_dut, rand_unselected_dut, ptfadapter,
 
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               generate_packets(setup, v4_dest, v6_dest),
+                               generate_packets(setup, tbinfo, v4_dest, v6_dest),
                                packets_dropped=False,
                                src_port=blocked_scale_port)
     dynamic_acl_verify_packets(setup,
                                ptfadapter,
-                               generate_packets(setup, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
+                               generate_packets(setup, tbinfo, DST_IP_BLOCKED, DST_IPV6_BLOCKED),
                                packets_dropped=True,
                                src_port=blocked_scale_port)