Fix SAi Challenger setup files

Signed-off-by: Marian Pritsak <[email protected]>
sonic-net · Sep 24, 2023 · d4a5fbc · d4a5fbc
1 parent f2ee25e
commit d4a5fbc
Show file tree

Hide file tree

Showing 9 changed files with 84 additions and 0 deletions.
diff --git a/test/test-cases/functional/saic/config_bidir_setup_commands.py b/test/test-cases/functional/saic/config_bidir_setup_commands.py
@@ -98,6 +98,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", ENI_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",
@@ -134,6 +137,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",
@@ -170,6 +176,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",

diff --git a/test/test-cases/functional/saic/config_inbound_setup_commands.py b/test/test-cases/functional/saic/config_inbound_setup_commands.py
@@ -109,6 +109,12 @@
       "9",
       "SAI_ENI_ATTR_VNET_ID",
       "$vnet_#1",
+      "SAI_ENI_ATTR_PL_SIP",
+      "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK",
+      "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+      "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
       "$acl_in_1",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",
@@ -174,6 +180,12 @@
       "9",
       "SAI_ENI_ATTR_VNET_ID",
       "$vnet_#1",
+      "SAI_ENI_ATTR_PL_SIP",
+      "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK",
+      "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+      "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
       "$acl_in_1",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",

diff --git a/test/test-cases/functional/saic/config_outbound_setup_commands.json b/test/test-cases/functional/saic/config_outbound_setup_commands.json
@@ -72,6 +72,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.1.11",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",
@@ -108,6 +111,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.2.101",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",

diff --git a/...functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen_create.json b/...functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen_create.json
@@ -93,6 +93,12 @@
       "5000",
       "SAI_ENI_ATTR_VNET_ID",
       "$vnet_#5000",
+      "SAI_ENI_ATTR_PL_SIP",
+      "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK",
+      "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+      "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
       "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",
@@ -158,6 +164,12 @@
       "6000",
       "SAI_ENI_ATTR_VNET_ID",
       "$vnet_#6000",
+      "SAI_ENI_ATTR_PL_SIP",
+      "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK",
+      "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+      "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
       "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",

diff --git a/test/test-cases/scale/saic/vnet_inbound_setup_commands.json b/test/test-cases/scale/saic/vnet_inbound_setup_commands.json
@@ -71,6 +71,12 @@
       "9",
       "SAI_ENI_ATTR_VNET_ID",
       "$vnet_1",
+      "SAI_ENI_ATTR_PL_SIP",
+      "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK",
+      "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+      "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
       "$acl_in_1",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",

diff --git a/test/test-cases/scale/saic/vnet_outbound_setup_commands_scale.json b/test/test-cases/scale/saic/vnet_outbound_setup_commands_scale.json
@@ -107,6 +107,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.1.1",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet_#4",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",
@@ -143,6 +146,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.2.1",
       "SAI_ENI_ATTR_VM_VNI", "10",
       "SAI_ENI_ATTR_VNET_ID", "$vnet_#5",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",

diff --git a/test/test-cases/scale/saic/vnet_outbound_setup_commands_simple.json b/test/test-cases/scale/saic/vnet_outbound_setup_commands_simple.json
@@ -59,6 +59,9 @@
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.1.1",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
+      "SAI_ENI_ATTR_PL_SIP", "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+      "SAI_ENI_ATTR_PL_SIP_MASK", "2001:0db8:85a3:0000:0000:0000:0000:0000",
+      "SAI_ENI_ATTR_PL_UNDERLAY_SIP", "10.0.0.18",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID", "0",
       "SAI_ENI_ATTR_INBOUND_V4_STAGE3_DASH_ACL_GROUP_ID", "0",

diff --git a/test/test-cases/scale/saic/vnet_route_setup_commands_bidirectional.json b/test/test-cases/scale/saic/vnet_route_setup_commands_bidirectional.json
@@ -132,6 +132,12 @@
             "9",
             "SAI_ENI_ATTR_VNET_ID",
             "$vnet",
+            "SAI_ENI_ATTR_PL_SIP",
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+            "SAI_ENI_ATTR_PL_SIP_MASK",
+            "2001:0db8:85a3:0000:0000:0000:0000:0000",
+            "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+            "10.0.0.18",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
             "0",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",
@@ -197,6 +203,12 @@
             "9",
             "SAI_ENI_ATTR_VNET_ID",
             "$vnet",
+            "SAI_ENI_ATTR_PL_SIP",
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+            "SAI_ENI_ATTR_PL_SIP_MASK",
+            "2001:0db8:85a3:0000:0000:0000:0000:0000",
+            "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+            "10.0.0.18",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
             "0",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",
@@ -262,6 +274,12 @@
             "9",
             "SAI_ENI_ATTR_VNET_ID",
             "$vnet",
+            "SAI_ENI_ATTR_PL_SIP",
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+            "SAI_ENI_ATTR_PL_SIP_MASK",
+            "2001:0db8:85a3:0000:0000:0000:0000:0000",
+            "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+            "10.0.0.18",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
             "0",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",
@@ -327,6 +345,12 @@
             "9",
             "SAI_ENI_ATTR_VNET_ID",
             "$vnet",
+            "SAI_ENI_ATTR_PL_SIP",
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+            "SAI_ENI_ATTR_PL_SIP_MASK",
+            "2001:0db8:85a3:0000:0000:0000:0000:0000",
+            "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+            "10.0.0.18",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
             "0",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",

diff --git a/test/test-cases/scale/saic/vnet_route_setup_commands_unidirectional.json b/test/test-cases/scale/saic/vnet_route_setup_commands_unidirectional.json
@@ -71,6 +71,12 @@
             "9",
             "SAI_ENI_ATTR_VNET_ID",
             "$vnet",
+            "SAI_ENI_ATTR_PL_SIP",
+            "2001:0db8:85a3:0000:0000:8a2e:0370:7334",
+            "SAI_ENI_ATTR_PL_SIP_MASK",
+            "2001:0db8:85a3:0000:0000:0000:0000:0000",
+            "SAI_ENI_ATTR_PL_UNDERLAY_SIP",
+            "10.0.0.18",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE1_DASH_ACL_GROUP_ID",
             "0",
             "SAI_ENI_ATTR_INBOUND_V4_STAGE2_DASH_ACL_GROUP_ID",