Make sc pick up latest updates

Signed-off-by: Marian Pritsak <marianp@mellanox.com>
sonic-net · May 28, 2024 · 1ade41e · 1ade41e
1 parent a0d995a
commit 1ade41e
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 16 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
@@ -6,7 +6,7 @@
 PPS = 100
 PACKET_LENGTH = 128
 ENI_IP = "1.1.0.1"
-NETWORK_IP1 = "1.128.0.1"
+NETWORK_IP1 = "1.128.0.2"
 NETWORK_IP2 = "1.128.0.3"
 
 DPU_VTEP_IP = "221.0.0.2"

diff --git a/test/test-cases/functional/saic/config_inbound_setup_commands.py b/test/test-cases/functional/saic/config_inbound_setup_commands.py
@@ -6,7 +6,7 @@
 PPS = 100
 PACKET_LENGTH = 128
 ENI_IP = "1.1.0.1"
-NETWORK_IP1 = "1.128.0.1"
+NETWORK_IP1 = "1.128.1.1"
 NETWORK_IP2 = "1.128.0.2"
 
 DPU_VTEP_IP = "221.0.0.2"

diff --git a/test/test-cases/functional/saic/config_outbound_setup_commands.json b/test/test-cases/functional/saic/config_outbound_setup_commands.json
@@ -231,7 +231,7 @@
     "key": {
       "switch_id": "$SWITCH_ID",
       "dst_vnet_id": "$vnet",
-      "dip": "1.128.0.1"
+      "dip": "1.128.0.2"
     },
     "attributes": [
       "SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION", "SAI_OUTBOUND_CA_TO_PA_ENTRY_ACTION_SET_TUNNEL_MAPPING",

diff --git a/test/test-cases/functional/saic/test_vm_to_vm_commn_acl_outbound.py b/test/test-cases/functional/saic/test_vm_to_vm_commn_acl_outbound.py
@@ -39,7 +39,7 @@
 PACKET_LENGTH = 128
 ENI_IP = "1.1.0.1"
 NETWORK_IP2 = "1.128.0.2"
-NETWORK_IP1 = "1.128.0.1"
+NETWORK_IP1 = "1.128.1.1"
 DPU_VTEP_IP = "221.0.0.2"
 ENI_VTEP_IP = "221.0.1.11"
 NETWORK_VTEP_IP = "221.0.2.101"

diff --git a/test/test-cases/functional/saic/test_vm_to_vm_commn_udp_outbound.py b/test/test-cases/functional/saic/test_vm_to_vm_commn_udp_outbound.py
@@ -40,7 +40,7 @@
 TRAFFIC_SLEEP_TIME = (TOTALPACKETS / PPS) + 2 
 PACKET_LENGTH = 128
 ENI_IP = "1.1.0.1"
-NETWORK_IP1 = "1.128.0.1"
+NETWORK_IP1 = "1.128.0.2"
 NETWORK_IP2 = "1.128.0.3"
 DPU_VTEP_IP = "221.0.0.2"
 ENI_VTEP_IP = "221.0.1.11"

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
@@ -282,7 +282,7 @@
     "key": {
       "switch_id": "$SWITCH_ID",
       "routing_group_id": "$rg",
-      "destination": "1.128.0.1/9"
+      "destination": "1.128.0.2/9"
     },
     "attributes": [
       "SAI_OUTBOUND_ROUTING_ENTRY_ATTR_ACTION",
@@ -322,7 +322,7 @@
     "key": {
       "switch_id": "$SWITCH_ID",
       "dst_vnet_id": "$vnet_#5000",
-      "dip": "1.128.0.1"
+      "dip": "1.128.0.2"
     },
     "attributes": [
       "SAI_OUTBOUND_CA_TO_PA_ENTRY_ATTR_ACTION",

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
@@ -79,7 +79,7 @@
             'count': NUMBER_OF_ENI * NUMBER_OF_ORE,  # Full count: OREs per ENI and VNET
             'SWITCH_ID': '$SWITCH_ID',
             'ACTION': 'ROUTE_VNET',
-            'DESTINATION': 	{'count': NUMBER_OF_ORE,'start': "1.128.0.1/9",'step': '0.0.0.2'},
+            'DESTINATION': 	{'count': NUMBER_OF_ORE,'start': "1.128.0.2/9",'step': '0.0.0.2'},
             'ENI_ID': 		{'count': NUMBER_OF_ENI,'start': '$eni_#{0}','delay': NUMBER_OF_ORE},
             'DST_VNET_ID': 	{'count': NUMBER_OF_VNET,'start': '$vnet_#{0}','delay': NUMBER_OF_ORE}
         }
@@ -88,7 +88,7 @@
     'DASH_OUTBOUND_CA_TO_PA': {
         'ocpe': {
             'count': (NUMBER_OF_ENI * NUMBER_OF_ORE) * NUMBER_OF_OCPE, 'SWITCH_ID': '$SWITCH_ID',  # 2 Per ORE
-            'DIP': {'count': NUMBER_OF_ORE * NUMBER_OF_OCPE,'start': '1.128.0.1','step': '0.0.0.1'},
+            'DIP': {'count': NUMBER_OF_ORE * NUMBER_OF_OCPE,'start': '1.128.0.2','step': '0.0.0.1'},
             'DST_VNET_ID': 	{'count': NUMBER_OF_VNET,'start': '$vnet_#{0}','delay': NUMBER_OF_ORE},
             'UNDERLAY_DIP': {'count': NUMBER_OF_ENI * NUMBER_OF_ORE,'start': '221.0.1.1','step': '0.0.1.0'},
             'OVERLAY_DMAC': {'count': NUMBER_OF_ENI * NUMBER_OF_ORE,'start': '00:1B:6E:00:00:01'},

diff --git a/test/test-cases/scale/vnet2vnet/48K-ips/test_vxlan_8vpc_48K-ips.py b/test/test-cases/scale/vnet2vnet/48K-ips/test_vxlan_8vpc_48K-ips.py
@@ -1034,7 +1034,7 @@ def _build_node_ips(count, vpc, nodetype="client"):
             IP_STEP3 = int(ipaddress.ip_address(u'0.1.0.0'))
             IP_STEP4 = int(ipaddress.ip_address(u'1.0.0.0'))
             IP_STEPE = int(ipaddress.ip_address(u'0.0.0.2'))
-            IP_C_START = ipaddress.ip_address(u'1.128.0.1')
+            IP_C_START = ipaddress.ip_address(u'1.128.0.2')
             IP_S_START = ipaddress.ip_address(u'1.1.0.1')
 
             if nodetype in "client":

diff --git a/test/test-cases/scale/vnet2vnet/48K-ips/testdata_vxlan_8vpc_48K-ips.py b/test/test-cases/scale/vnet2vnet/48K-ips/testdata_vxlan_8vpc_48K-ips.py
@@ -36,14 +36,14 @@
                     "StaticInfoCount": 6000, 
                     "Vni": 1, 
                     "RemoteVmStaticIpv4": {
-                                            "start_value":"1.128.0.1",
+                                            "start_value":"1.128.0.2",
                                             "step_value":"0.4.0.0",
                                             "increments":[("0.0.1.0", 1000,[])],"ng_step":"1.0.0.0"
                                             }
                     },
 
             "ieth_local": {"mac": "00:1b:6e:00:00:01",'step':'00:00:00:00:00:01'},
-            "iipv4_local": {"ip": "1.1.0.1", "gip": "1.128.0.1","prefix":9,'ip_step':'0.0.0.1','ip_ng1_step':'1.0.0.0','gip_step':'0.0.0.0','gip_ng1_step':'1.0.0.0'},
+            "iipv4_local": {"ip": "1.1.0.1", "gip": "1.128.0.2","prefix":9,'ip_step':'0.0.0.1','ip_ng1_step':'1.0.0.0','gip_step':'0.0.0.0','gip_ng1_step':'1.0.0.0'},
         },
         2: {
             "underlay_routing":"BGP",#"BGP"
@@ -88,7 +88,7 @@
                             },
             "iipv4_allow": {
                             "ip": {
-                                    "start_value":'1.128.0.1',
+                                    "start_value":'1.128.0.2',
                                     "step_value":"0.4.0.0",
                                     "increments":[("0.0.2.0", 500,[])],
                                     "ng_step":"1.0.0.0"

diff --git a/test/test-cases/scale/vnet2vnet/one-ip/dash_1vpc_1ip_peer.json b/test/test-cases/scale/vnet2vnet/one-ip/dash_1vpc_1ip_peer.json
@@ -42,12 +42,12 @@
                         ],
                         "src_addrs": [
                             "1.1.0.1/32",
-                            "1.128.0.1/32"
+                            "1.128.0.2/32"
                         ],
                         "src_ports": [],
                         "dst_addrs":  [
                             "1.1.0.1/32",
-                            "1.128.0.1/32"
+                            "1.128.0.2/32"
                         ],
                         "dst_ports": []
                     }
@@ -100,7 +100,7 @@
                 "mappings" : [
                     {
                         "routing-type": "vpc-direct",
-                        "overlay-ip-address": "1.128.0.1/32", 
+                        "overlay-ip-address": "1.128.0.2/32", 
                         "underlay-ip-address": "221.0.2.1/32", 
                         "mac": "00:1B:6E:80:00:01" 
                     }