Fix test_acl.py [ipv6-ingress-uplink->downlink-*] cases for v6 topo (sonic-net#21760)

* Fix acl [ipv6-ingress-uplink->downlink-*] cases for v6 topo

Signed-off-by: Abhishek <[email protected]>

Author: markx-arista

tests/acl/templates/acltb_v6_test_rules.j2

@@ -582,6 +582,36 @@
                                         "destination-ip-address": "fc02:1000:0:1::7/128"
                                     }
                                 }
+                            },
+                            "38": {
+                                "actions": {
+                                    "config": {
+                                        "forwarding-action": "ACCEPT"
+                                    }
+                                },
+                                "config": {
+                                    "sequence-id": 38
+                                },
+                                "ip": {
+                                    "config": {
+                                        "destination-ip-address": "2064:100:0::C0A8:0000:1/128"
+                                    }
+                                }
+                            },
+                            "39": {
+                                "actions": {
+                                    "config": {
+                                        "forwarding-action": "DROP"
+                                    }
+                                },
+                                "config": {
+                                    "sequence-id": 39
+                                },
+                                "ip": {
+                                    "config": {
+                                        "destination-ip-address": "2064:100:0::C0A8:0000:9/128"
+                                    }
+                                }
                             }
                         }
                     }

tests/acl/templates/acltb_v6_test_rules_part_2.j2

@@ -540,6 +540,36 @@
                                         "destination-ip-address": "fc02:1000:0:1::7/128"
                                     }
                                 }
+                            },
+                            "38": {
+                                "actions": {
+                                    "config": {
+                                        "forwarding-action": "ACCEPT"
+                                    }
+                                },
+                                "config": {
+                                    "sequence-id": 38
+                                },
+                                "ip": {
+                                    "config": {
+                                        "destination-ip-address": "2064:100:0::C0A8:0000:1/128"
+                                    }
+                                }
+                            },
+                            "39": {
+                                "actions": {
+                                    "config": {
+                                        "forwarding-action": "DROP"
+                                    }
+                                },
+                                "config": {
+                                    "sequence-id": 39
+                                },
+                                "ip": {
+                                    "config": {
+                                        "destination-ip-address": "2064:100:0::C0A8:0000:9/128"
+                                    }
+                                }
                             }
                         }
                     }

tests/acl/test_acl.py

@@ -34,6 +34,7 @@
 from tests.common.sai_validation.sonic_db import start_db_monitor, wait_for_n_keys, stop_db_monitor
 from tests.common.validation.sai.acl_validation import validate_acl_asicdb_entries
 from tests.common.utilities import is_ipv4_address
+from tests.common.utilities import is_ipv6_only_topology
 from tests.common.dualtor.dual_tor_utils import show_muxcable_status
 from tests.common.fixtures.duthost_utils import is_multi_binding_acl_enabled  # noqa: F401
 
@@ -97,6 +98,21 @@
     "ipv6": "20c0:a800::11ac:d765:2523:e5e4"
 }
 
+# Below T1 V6 topo IPs are announced to DUT by annouce_route.py
+# IPv4 addrs are placeholders only
+DOWNSTREAM_DST_IP_V6_TOPO = {
+    "ipv4": "192.168.0.253",
+    "ipv6": "2064:100:0::C0A8:0000:14"
+}
+DOWNSTREAM_IP_TO_ALLOW_V6_TOPO = {
+    "ipv4": "192.168.0.252",
+    "ipv6": "2064:100:0::C0A8:0000:1"
+}
+DOWNSTREAM_IP_TO_BLOCK_V6_TOPO = {
+    "ipv4": "192.168.0.251",
+    "ipv6": "2064:100:0::C0A8:0000:9"
+}
+
 # Below M0_L3 IPs are announced to DUT by annouce_route.py, it point to neighbor mx
 DOWNSTREAM_DST_IP_M0_L3 = {
     "ipv4": "192.168.1.65",
@@ -350,6 +366,15 @@ def setup(duthosts, ptfhost, rand_selected_dut, rand_selected_front_end_dut, ran
         DOWNSTREAM_DST_IP = DOWNSTREAM_DST_IP_M0_L3
         DOWNSTREAM_IP_TO_ALLOW = DOWNSTREAM_IP_TO_ALLOW_M0_L3
         DOWNSTREAM_IP_TO_BLOCK = DOWNSTREAM_IP_TO_BLOCK_M0_L3
+    elif is_ipv6_only_topology(tbinfo):
+        if tbinfo['topo']['type'] in ['t0']:
+            DOWNSTREAM_DST_IP = DOWNSTREAM_DST_IP_VLAN
+            DOWNSTREAM_IP_TO_ALLOW = DOWNSTREAM_IP_TO_ALLOW_VLAN
+            DOWNSTREAM_IP_TO_BLOCK = DOWNSTREAM_IP_TO_BLOCK_VLAN
+        else:
+            DOWNSTREAM_DST_IP = DOWNSTREAM_DST_IP_V6_TOPO
+            DOWNSTREAM_IP_TO_ALLOW = DOWNSTREAM_IP_TO_ALLOW_V6_TOPO
+            DOWNSTREAM_IP_TO_BLOCK = DOWNSTREAM_IP_TO_BLOCK_V6_TOPO
     elif tbinfo['topo']['type'] in ['t0']:
         try:
             vlan_config = tbinfo['topo']['properties']['topology']['DUT']['vlan_configs']['default_vlan_config']
@@ -1064,7 +1089,7 @@ def check_rule_counters(self, duthost):
             return True
 
         logger.info('Wait all rule counters are ready')
-        return wait_until(60, 2, 0, self.check_rule_counters_internal, duthost)
+        return wait_until(120, 2, 0, self.check_rule_counters_internal, duthost)
 
     def check_rule_counters_internal(self, duthost):
         for asic_id in duthost.get_frontend_asic_ids():
@@ -1266,6 +1291,11 @@ def test_dest_ip_match_forwarded(self, setup, direction, ptfadapter,
                     rule_id = 33 if vlan_name == "Vlan1000" else 2
                 logging.info("topo: {} vlan_config: {} vlan_name: {} rule_id: {} ".format(
                     setup["topo"], setup["vlan_config"], vlan_name, rule_id))
+            elif "-v6-" in setup["topo_name"]:
+                if setup["topo"] in ['t0']:
+                    rule_id = 34
+                else:
+                    rule_id = 38
             else:
                 rule_id = 2
         else:
@@ -1294,6 +1324,11 @@ def test_dest_ip_match_dropped(self, setup, direction, ptfadapter,
                     rule_id = 32 if vlan_name == "Vlan1000" else 15
                 logging.info("topo: {} vlan_config: {} vlan_name: {} rule_id: {} ".format(
                     setup["topo"], setup["vlan_config"], vlan_name, rule_id))
+            elif "-v6-" in setup["topo_name"]:
+                if setup["topo"] in ['t0']:
+                    rule_id = 35
+                else:
+                    rule_id = 39
             else:
                 rule_id = 15
         else: