Update tests.

sonic-net · Mar 7, 2024 · e1d95f8 · e1d95f8
1 parent f9e15da
commit e1d95f8
Show file tree

Hide file tree

Showing 19 changed files with 44 additions and 2 deletions.
diff --git a/dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp b/dash-pipeline/tests/libsai/vnet_out/vnet_out.cpp
@@ -126,6 +126,10 @@ int main(int argc, char **argv)
     attr.value.booldata = true;
     attrs.push_back(attr);
 
+    attr.id = SAI_ENI_ATTR_HA_SCOPE_ID;
+    attr.value.oid = SAI_NULL_OBJECT_ID;
+    attrs.push_back(attr);
+
     attr.id = SAI_ENI_ATTR_VM_UNDERLAY_DIP;
     sai_ip_addr_t u_dip_addr = {.ip4 = 0x010310ac};
     sai_ip_address_t u_dip = {.addr_family = SAI_IP_ADDR_FAMILY_IPV4,

diff --git a/dash-pipeline/tests/saithrift/pytest/vnet/test_saithrift_vnet.py b/dash-pipeline/tests/saithrift/pytest/vnet/test_saithrift_vnet.py
@@ -44,6 +44,7 @@ def test_sai_thrift_create_eni(saithrift_client):
         eni = sai_thrift_create_eni(saithrift_client, cps=10000,
                                     pps=100000, flows=100000,
                                     admin_state=True,
+                                    ha_scope_id=0,
                                     vm_underlay_dip=vm_underlay_dip,
                                     vm_vni=9,
                                     vnet_id=vnet,

diff --git a/test/test-cases/functional/ptf/sai_dash_utils.py b/test/test-cases/functional/ptf/sai_dash_utils.py
@@ -140,6 +140,7 @@ def eni_create(self, **kwargs):
             "pps": 100000,
             "flows": 100000,
             "admin_state": True,
+            "ha_scope_id": 0,
             "vm_underlay_dip": sai_ipaddress("0.0.0.0"),
             "vm_vni": 1,
             "vnet_id": 1,

diff --git a/test/test-cases/functional/ptf/saidashacl.py b/test/test-cases/functional/ptf/saidashacl.py
@@ -194,6 +194,7 @@ def setUpSwitch(self):
         self.eni = self.create_obj(sai_thrift_create_eni, sai_thrift_remove_eni, cps=10000,
                                    pps=100000, flows=100000,
                                    admin_state=True,
+                                   ha_scope_id=0,
                                    vm_underlay_dip=vm_underlay_dip,
                                    vm_vni=9,
                                    vnet_id=self.vnet,

diff --git a/test/test-cases/functional/ptf/saidashvnet_sanity.py b/test/test-cases/functional/ptf/saidashvnet_sanity.py
@@ -65,6 +65,7 @@ def configureVnet(self):
         self.eni = sai_thrift_create_eni(self.client, cps=10000,
                                          pps=100000, flows=100000,
                                          admin_state=True,
+                                         ha_scope_id=0,
                                          vm_underlay_dip=vm_underlay_dip,
                                          vm_vni=9,
                                          vnet_id=self.vnet,

diff --git a/test/test-cases/functional/saic/config_bidir_setup_commands.py b/test/test-cases/functional/saic/config_bidir_setup_commands.py
@@ -95,6 +95,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", ENI_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
@@ -137,6 +138,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
@@ -179,6 +181,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", NETWORK_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",

diff --git a/test/test-cases/functional/saic/config_inbound_setup_commands.py b/test/test-cases/functional/saic/config_inbound_setup_commands.py
@@ -103,6 +103,8 @@
       "100000",
       "SAI_ENI_ATTR_ADMIN_STATE",
       "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID",
+      "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
       ENI_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI",
@@ -180,6 +182,8 @@
       "100000",
       "SAI_ENI_ATTR_ADMIN_STATE",
       "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID",
+      "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
       NETWORK_VTEP_IP,
       "SAI_ENI_ATTR_VM_VNI",

diff --git a/test/test-cases/functional/saic/config_outbound_setup_commands.json b/test/test-cases/functional/saic/config_outbound_setup_commands.json
@@ -69,6 +69,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.1.11",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",
@@ -111,6 +112,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "221.0.2.101",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",

diff --git a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_eni.py
@@ -38,6 +38,8 @@ def test_vnet_eni_create(self, dpu):
                     "100000",
                     "SAI_ENI_ATTR_ADMIN_STATE",
                     "True",
+                    "SAI_ENI_ATTR_HA_SCOPE_ID",
+                    "0",
                     "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
                     "10.10.1.10",
                     "SAI_ENI_ATTR_VM_VNI",

diff --git a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_in_route.py b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_in_route.py
@@ -45,6 +45,8 @@ def test_vnet_inbound_routing_entry_create_setup(self, dpu):
                     "100000",
                     "SAI_ENI_ATTR_ADMIN_STATE",
                     "True",
+                    "SAI_ENI_ATTR_HA_SCOPE_ID",
+                    "0",
                     "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
                     "10.10.2.10",
                     "SAI_ENI_ATTR_VM_VNI",

diff --git a/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_out_route.py b/test/test-cases/functional/saic/sai-api/test_sai_api_vnet_out_route.py
@@ -44,6 +44,8 @@ def test_vnet_outbound_routing_entry_create(self, dpu):
                     "100000",
                     "SAI_ENI_ATTR_ADMIN_STATE",
                     "True",
+                    "SAI_ENI_ATTR_HA_SCOPE_ID",
+                    "0",
                     "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
                     "10.10.9.10",
                     "SAI_ENI_ATTR_VM_VNI",

diff --git a/...st-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py b/...st-cases/functional/saic/tutorial/test_sai_vnet_outbound_small_scale_config_via_dpugen.py
@@ -63,7 +63,7 @@ def make_create_commands(self):
                               '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_DASH_TUNNEL_DSCP_MODE", "SAI_DASH_TUNNEL_DSCP_MODE_PRESERVE_MODEL", "SAI_ENI_ATTR_DSCP", "0",
-                              "SAI_ENI_ATTR_DISABLE_FAST_PATH_ICMP_FLOW_REDIRECTION", "False"])
+                              "SAI_ENI_ATTR_DISABLE_FAST_PATH_ICMP_FLOW_REDIRECTION", "False", "SAI_ENI_ATTR_HA_SCOPE_ID", "0"])
 
         ret = add_extra_attrs('SAI_OBJECT_TYPE_OUTBOUND_CA_TO_PA_ENTRY', ret, [ 'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS', '0',
                               'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS_OVERRIDE', 'True' ])

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
@@ -87,6 +87,8 @@
       "100000",
       "SAI_ENI_ATTR_ADMIN_STATE",
       "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID",
+      "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
       "221.0.1.1",
       "SAI_ENI_ATTR_VM_VNI",
@@ -164,6 +166,8 @@
       "100000",
       "SAI_ENI_ATTR_ADMIN_STATE",
       "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID",
+      "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
       "221.0.1.2",
       "SAI_ENI_ATTR_VM_VNI",

diff --git a/test/test-cases/scale/saic/test_sai_vnet_outbound_scale.py b/test/test-cases/scale/saic/test_sai_vnet_outbound_scale.py
@@ -116,7 +116,7 @@ def make_create_vnet_config(self):
                               '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_DASH_TUNNEL_DSCP_MODE", "SAI_DASH_TUNNEL_DSCP_MODE_PRESERVE_MODEL", "SAI_ENI_ATTR_DSCP", "0",
-                              "SAI_ENI_ATTR_DISABLE_FAST_PATH_ICMP_FLOW_REDIRECTION", "False"])
+                              "SAI_ENI_ATTR_DISABLE_FAST_PATH_ICMP_FLOW_REDIRECTION", "False", "SAI_ENI_ATTR_HA_SCOPE_ID", "0"])
 
         ret = add_extra_attrs('SAI_OBJECT_TYPE_OUTBOUND_CA_TO_PA_ENTRY', ret, [ 'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS', '0',
                               'SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_METER_CLASS_OVERRIDE', 'True' ])

diff --git a/test/test-cases/scale/saic/vnet_inbound_setup_commands.json b/test/test-cases/scale/saic/vnet_inbound_setup_commands.json
@@ -65,6 +65,8 @@
       "100000",
       "SAI_ENI_ATTR_ADMIN_STATE",
       "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID",
+      "True",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
       "10.10.2.10",
       "SAI_ENI_ATTR_VM_VNI",

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
@@ -104,6 +104,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.1.1",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet_#4",
@@ -148,6 +149,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.2.1",
       "SAI_ENI_ATTR_VM_VNI", "10",
       "SAI_ENI_ATTR_VNET_ID", "$vnet_#5",

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
@@ -56,6 +56,7 @@
       "SAI_ENI_ATTR_PPS", "100000",
       "SAI_ENI_ATTR_FLOWS", "100000",
       "SAI_ENI_ATTR_ADMIN_STATE", "True",
+      "SAI_ENI_ATTR_HA_SCOPE_ID", "0",
       "SAI_ENI_ATTR_VM_UNDERLAY_DIP", "172.16.1.1",
       "SAI_ENI_ATTR_VM_VNI", "9",
       "SAI_ENI_ATTR_VNET_ID", "$vnet",

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
@@ -126,6 +126,8 @@
             "100000",
             "SAI_ENI_ATTR_ADMIN_STATE",
             "True",
+            "SAI_ENI_ATTR_HA_SCOPE_ID",
+            "0",
             "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
             "172.16.1.1",
             "SAI_ENI_ATTR_VM_VNI",
@@ -203,6 +205,8 @@
             "100000",
             "SAI_ENI_ATTR_ADMIN_STATE",
             "True",
+            "SAI_ENI_ATTR_HA_SCOPE_ID",
+            "0",
             "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
             "10.10.2.10",
             "SAI_ENI_ATTR_VM_VNI",
@@ -280,6 +284,8 @@
             "100000",
             "SAI_ENI_ATTR_ADMIN_STATE",
             "True",
+            "SAI_ENI_ATTR_HA_SCOPE_ID",
+            "0",
             "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
             "10.11.1.10",
             "SAI_ENI_ATTR_VM_VNI",
@@ -357,6 +363,8 @@
             "100000",
             "SAI_ENI_ATTR_ADMIN_STATE",
             "True",
+            "SAI_ENI_ATTR_HA_SCOPE_ID",
+            "0",
             "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
             "170.16.1.1",
             "SAI_ENI_ATTR_VM_VNI",

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
@@ -65,6 +65,8 @@
             "100000",
             "SAI_ENI_ATTR_ADMIN_STATE",
             "True",
+            "SAI_ENI_ATTR_HA_SCOPE_ID",
+            "0",
             "SAI_ENI_ATTR_VM_UNDERLAY_DIP",
             "172.16.1.1",
             "SAI_ENI_ATTR_VM_VNI",