Added unique source and destination IPV6 fields for ACL rules. Ref CSP CS00012257197

sanjair-git · sanjair-git · commit 17aa216f78e7 · 2022-11-08T10:28:48.000-05:00
diff --git a/tests/acl/templates/acltb_v6_test_rules.j2 b/tests/acl/templates/acltb_v6_test_rules.j2
@@ -31,7 +31,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c0:a800::4/128"
+                                        "destination-ip-address": "20c0:a800::1/128"
                                     }
                                 }
                             },
@@ -46,7 +46,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c1:cb50::4/128"
+                                        "destination-ip-address": "20c1:cb50::1/128"
                                     }
                                 }
                             },
@@ -228,7 +228,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c0:a800::8/128"
+                                        "destination-ip-address": "20c0:a800::9/128"
                                     }
                                 }
                             },
@@ -243,7 +243,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c1:e2f0::8/128"
+                                        "destination-ip-address": "20c1:e2f0::9/128"
                                     }
                                 }
                             },
diff --git a/tests/acl/templates/acltb_v6_test_rules_part_2.j2 b/tests/acl/templates/acltb_v6_test_rules_part_2.j2
@@ -31,7 +31,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c0:a800::4/128"
+                                        "destination-ip-address": "20c0:a800::1/128"
                                     }
                                 }
                             },
@@ -46,7 +46,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c1:cb50::4/128"
+                                        "destination-ip-address": "20c1:cb50::1/128"
                                     }
                                 }
                             },
@@ -228,7 +228,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c0:a800::8/128"
+                                        "destination-ip-address": "20c0:a800::9/128"
                                     }
                                 }
                             },
@@ -243,7 +243,7 @@
                                 },
                                 "ip": {
                                     "config": {
-                                        "destination-ip-address": "20c1:e2f0::8/128"
+                                        "destination-ip-address": "20c1:e2f0::9/128"
                                     }
                                 }
                             },
diff --git a/tests/acl/test_acl.py b/tests/acl/test_acl.py
@@ -61,11 +61,11 @@
 }
 DOWNSTREAM_IP_TO_ALLOW = {
     "ipv4": "192.168.0.252",
-    "ipv6": "20c0:a800::4"
+    "ipv6": "20c0:a800::1"
 }
 DOWNSTREAM_IP_TO_BLOCK = {
     "ipv4": "192.168.0.251",
-    "ipv6": "20c0:a800::8"
+    "ipv6": "20c0:a800::9"
 }
 
 DOWNSTREAM_IP_PORT_MAP = {}
@@ -76,11 +76,11 @@
 }
 UPSTREAM_IP_TO_ALLOW = {
     "ipv4": "193.191.32.1",
-    "ipv6": "20c1:cb50::4"
+    "ipv6": "20c1:cb50::1"
 }
 UPSTREAM_IP_TO_BLOCK = {
     "ipv4": "193.221.112.1",
-    "ipv6": "20c1:e2f0::8"
+    "ipv6": "20c1:e2f0::9"
 }
 
 VLAN_BASE_MAC_PATTERN = "72060001{:04}"
diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
@@ -15,38 +15,6 @@ acl/test_acl_outer_vlan.py:
     conditions:
       - "asic_type in ['cisco-8000']"
 
-acl/test_acl.py::TestBasicAcl::test_icmp_match_forwarded:
-  xfail:
-    # Ignoring failure because of limitation that DNX chipset doesn't support both IPv6 src and dst address in the same rule
-    # BRCM CSP CS00012257197
-    reason: "DNX chipset doesn't support both IPv6 src and dst address in the same ACL rule"
-    conditions:
-      - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0']"
-
-acl/test_acl.py::TestIncrementalAcl::test_icmp_match_forwarded:
-  xfail:
-    # Ignoring failure because of limitation that DNX chipset doesn't support both IPv6 src and dst address in the same rule
-    # BRCM CSP CS00012257197
-    reason: "DNX chipset doesn't support both IPv6 src and dst address in the same ACL rule"
-    conditions:
-      - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0']"
-
-acl/test_acl.py::TestAclWithReboot::test_icmp_match_forwarded:
-  xfail:
-    # Ignoring failure because of limitation that DNX chipset doesn't support both IPv6 src and dst address in the same rule
-    # BRCM CSP CS00012257197
-    reason: "DNX chipset doesn't support both IPv6 src and dst address in the same ACL rule"
-    conditions:
-      - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0']"
-
-acl/test_acl.py::TestAclWithPortToggle::test_icmp_match_forwarded:
-  xfail:
-    # Ignoring failure because of limitation that DNX chipset doesn't support both IPv6 src and dst address in the same rule
-    # BRCM CSP CS00012257197
-    reason: "DNX chipset doesn't support both IPv6 src and dst address in the same ACL rule"
-    conditions:
-      - "platform in ['x86_64-nokia_ixr7250e_36x400g-r0']"
-
 #######################################
 #####            arp              #####
 #######################################

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@`
`31`	`31`	`},`
`32`	`32`	`"ip": {`
`33`	`33`	`"config": {`
`34`		`- "destination-ip-address": "20c0:a800::4/128"`
	`34`	`+ "destination-ip-address": "20c0:a800::1/128"`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`},`
`@@ -46,7 +46,7 @@`
`46`	`46`	`},`
`47`	`47`	`"ip": {`
`48`	`48`	`"config": {`
`49`		`- "destination-ip-address": "20c1:cb50::4/128"`
	`49`	`+ "destination-ip-address": "20c1:cb50::1/128"`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`},`
`@@ -228,7 +228,7 @@`
`228`	`228`	`},`
`229`	`229`	`"ip": {`
`230`	`230`	`"config": {`
`231`		`- "destination-ip-address": "20c0:a800::8/128"`
	`231`	`+ "destination-ip-address": "20c0:a800::9/128"`
`232`	`232`	`}`
`233`	`233`	`}`
`234`	`234`	`},`
`@@ -243,7 +243,7 @@`
`243`	`243`	`},`
`244`	`244`	`"ip": {`
`245`	`245`	`"config": {`
`246`		`- "destination-ip-address": "20c1:e2f0::8/128"`
	`246`	`+ "destination-ip-address": "20c1:e2f0::9/128"`
`247`	`247`	`}`
`248`	`248`	`}`
`249`	`249`	`},`
Original file line number	Diff line number	Diff line change
`@@ -61,11 +61,11 @@`
`61`	`61`	`}`
`62`	`62`	`DOWNSTREAM_IP_TO_ALLOW = {`
`63`	`63`	`"ipv4": "192.168.0.252",`
`64`		`- "ipv6": "20c0:a800::4"`
	`64`	`+ "ipv6": "20c0:a800::1"`
`65`	`65`	`}`
`66`	`66`	`DOWNSTREAM_IP_TO_BLOCK = {`
`67`	`67`	`"ipv4": "192.168.0.251",`
`68`		`- "ipv6": "20c0:a800::8"`
	`68`	`+ "ipv6": "20c0:a800::9"`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`DOWNSTREAM_IP_PORT_MAP = {}`
`@@ -76,11 +76,11 @@`
`76`	`76`	`}`
`77`	`77`	`UPSTREAM_IP_TO_ALLOW = {`
`78`	`78`	`"ipv4": "193.191.32.1",`
`79`		`- "ipv6": "20c1:cb50::4"`
	`79`	`+ "ipv6": "20c1:cb50::1"`
`80`	`80`	`}`
`81`	`81`	`UPSTREAM_IP_TO_BLOCK = {`
`82`	`82`	`"ipv4": "193.221.112.1",`
`83`		`- "ipv6": "20c1:e2f0::8"`
	`83`	`+ "ipv6": "20c1:e2f0::9"`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`VLAN_BASE_MAC_PATTERN = "72060001{:04}"`