[SmartSwitch] Restore dash smartswitch vnet after protobuf updates and pr 19700 merge (#20998)

aronovic · web-flow · commit 195f5706a3d5 · 2025-11-10T09:30:25.000-08:00
Description of PR
This change restores the functionality of the dash smartswitch vnet testing after the latest changes to the proto buffers and pr 19700
The issue was that the vnet smartswitch test was failing becase the dash parser is now using the same method as for private link but is missing some cases used when parsing config templates for vnet.
Also some of the configurations from templates need to be updated based on the latest dash proto updates.
diff --git a/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml b/tests/common/plugins/conditional_mark/tests_mark_conditions.yaml
@@ -697,7 +697,7 @@ dash/test_dash_smartswitch_vnet.py:
     reason: "Currently dash tests are not supported on KVM or non-smartswitch T1s"
     conditions:
       - "asic_type in ['vs'] and https://github.com/sonic-net/sonic-mgmt/issues/16407"
-      - "hwsku not in ['Cisco-8102-28FH-DPU-O-T1', 'Mellanox-SN4280-O8C40', 'Mellanox-SN4280-O28']"
+      - "hwsku not in ['Cisco-8102-28FH-DPU-O-T1', 'Mellanox-SN4280-O8C40', 'Mellanox-SN4280-O28', 'Cisco-8102-28FH-DPU-O']"
 
 dash/test_dash_vnet.py:
   skip:
diff --git a/tests/dash/packets.py b/tests/dash/packets.py
@@ -511,6 +511,7 @@ def outbound_smartswitch_vnet_packets(
         ip_src=dash_config_info[LOCAL_PA_IP],
         ip_dst=dash_config_info[LOOPBACK_IP],
         udp_dport=vxlan_udp_dport,
+        udp_sport=VXLAN_UDP_BASE_SRC_PORT,
         with_udp_chksum=False,
         vxlan_vni=dash_config_info[VNET1_VNI],
         ip_ttl=64,
diff --git a/tests/dash/proto_utils.py b/tests/dash/proto_utils.py
@@ -6,11 +6,11 @@
 from ipaddress import ip_address
 
 from dash_api.appliance_pb2 import Appliance
-from dash_api.eni_pb2 import Eni
+from dash_api.eni_pb2 import Eni, State  # noqa: F401
 from dash_api.eni_route_pb2 import EniRoute
 from dash_api.route_group_pb2 import RouteGroup
 from dash_api.route_pb2 import Route
-from dash_api.route_type_pb2 import ActionType, RouteType, RouteTypeItem
+from dash_api.route_type_pb2 import ActionType, RouteType, RouteTypeItem, EncapType, RoutingType  # noqa: F401
 from dash_api.vnet_mapping_pb2 import VnetMapping
 from dash_api.vnet_pb2 import Vnet
 from dash_api.meter_policy_pb2 import MeterPolicy
@@ -92,6 +92,11 @@ def parse_dash_proto(key: str, proto_dict: dict):
     table_name = re.search(r"DASH_(\w+)_TABLE", key).group(1)
     message = PB_CLASS_MAP[table_name]()
     field_map = message.DESCRIPTOR.fields_by_name
+
+    if table_name == "ROUTING_TYPE":
+        pb = routing_type_from_json(proto_dict)
+        return pb
+
     new_dict = {}
     for key, value in proto_dict.items():
         if field_map[key].type == field_map[key].TYPE_MESSAGE:
@@ -111,6 +116,12 @@ def parse_dash_proto(key: str, proto_dict: dict):
         elif field_map[key].type == field_map[key].TYPE_BYTES:
             new_dict[key] = parse_byte_field(value)
 
+        elif field_map[key].type == field_map[key].TYPE_ENUM:
+            if isinstance(value, int):
+                new_dict[key] = value
+            else:
+                new_dict[key] = get_enum_type_from_str(field_map[key].enum_type.name, value)
+
         elif field_map[key].type in PB_INT_TYPES:
             new_dict[key] = int(value)
 
@@ -139,24 +150,21 @@ def get_enum_type_from_str(enum_type_str, enum_name_str):
 
 def routing_type_from_json(json_obj):
     pb = RouteType()
-    if isinstance(json_obj, list):
-        for item in json_obj:
-            pbi = RouteTypeItem()
-            pbi.action_name = item["action_name"]
+    route_type_items = json_obj['items']
+    for item in route_type_items:
+        pbi = RouteTypeItem()
+        pbi.action_name = item["action_name"]
+        if isinstance(item.get("action_type"), int):
+            pbi.action_type = item.get("action_type")
+        else:
             pbi.action_type = get_enum_type_from_str('ActionType', item.get("action_type"))
-            if item.get("encap_type") is not None:
+        if item.get("encap_type") is not None:
+            if isinstance(item.get("encap_type"), int):
+                pbi.encap_type = item.get("encap_type")
+            else:
                 pbi.encap_type = get_enum_type_from_str('EncapType', item.get("encap_type"))
-            if item.get("vni") is not None:
-                pbi.vni = int(item["vni"])
-            pb.items.append(pbi)
-    else:
-        pbi = RouteTypeItem()
-        pbi.action_name = json_obj["action_name"]
-        pbi.action_type = get_enum_type_from_str('ActionType', json_obj.get("action_type"))
-        if json_obj.get("encap_type") is not None:
-            pbi.encap_type = get_enum_type_from_str('EncapType', json_obj.get("encap_type"))
-        if json_obj.get("vni") is not None:
-            pbi.vni = int(json_obj["vni"])
+        if item.get("vni") is not None:
+            pbi.vni = int(item["vni"])
         pb.items.append(pbi)
     return pb
 
diff --git a/tests/dash/templates/dash_smartswitch_vnet_0.j2 b/tests/dash/templates/dash_smartswitch_vnet_0.j2
@@ -3,7 +3,8 @@
                 "DASH_APPLIANCE_TABLE:123" : {
                         "sip":"{{ loopback_ip }}",
                         "vm_vni":"{{ vm_vni }}",
-                        "local_region_id":"{{ local_region_id }}"
+                        "local_region_id":"{{ local_region_id }}",
+			"trusted_vnis": "100"
                 },
                 "OP": "{{ op }}"
         }
diff --git a/tests/dash/templates/dash_smartswitch_vnet_1.j2 b/tests/dash/templates/dash_smartswitch_vnet_1.j2
@@ -1,24 +1,30 @@
 [
         {
-                "DASH_ROUTING_TYPE_TABLE:vnet": {
-                "action_name": "action1",
-                "action_type": "maprouting"
-                },
+                "DASH_ROUTING_TYPE_TABLE:vnet": { "items": [
+                        {
+                                "action_name": "action1",
+                                "action_type": "maprouting"
+                        }
+                ]},
                 "OP": "{{ op }}"
         },
         {
-                "DASH_ROUTING_TYPE_TABLE:vnet_direct": {
-                "action_name": "action1",
-                "action_type": "maprouting"
-                },
+                "DASH_ROUTING_TYPE_TABLE:vnet_direct": { "items": [
+                        {
+                                "action_name": "action1",
+                                "action_type": "maprouting"
+                        }
+                ]},
                 "OP": "{{ op }}"
         },
         {
-                "DASH_ROUTING_TYPE_TABLE:vnet_encap": {
-                "action_name": "action1",
-                "action_type": "staticencap",
-                "encap_type": "vxlan"
-                },
+                "DASH_ROUTING_TYPE_TABLE:vnet_encap": { "items": [
+                        {
+                                "action_name": "action1",
+                                "action_type": "staticencap",
+                                "encap_type": "vxlan"
+                        }
+                ]},
                 "OP": "{{ op }}"
         },
         {
diff --git a/tests/dash/templates/dash_smartswitch_vnet_2.j2 b/tests/dash/templates/dash_smartswitch_vnet_2.j2
@@ -5,8 +5,7 @@
                         "mac_address":"{{ local_eni_mac }}",
                         "underlay_ip":"{{ local_pa_ip }}",
                         "admin_state":"enabled",
-                        "vnet":"{{ vnet1_name }}",
-                        "qos":"qos100"
+                        "vnet":"{{ vnet1_name }}"
                 },
                 "OP": "{{ op }}"
         },
diff --git a/tests/dash/templates/dash_smartswitch_vnet_3.j2 b/tests/dash/templates/dash_smartswitch_vnet_3.j2
@@ -4,16 +4,7 @@
                         "routing_type":"vnet_encap",
                         "underlay_ip":"{{ remote_pa_ip }}",
                         "mac_address":"{{ remote_eni_mac }}",
-                        "use_dst_vni":"true"
-                },
-                "OP": "{{ op }}"
-        },
-        {
-                "DASH_QOS_TABLE:qos100" : {
-                        "qos_id":"100",
-                        "bw":"4000000000",
-                        "cps":"10000000",
-                        "flows":"50000000"
+                        "use_dst_vni":true
                 },
                 "OP": "{{ op }}"
         },
diff --git a/tests/dash/test_dash_smartswitch_vnet.py b/tests/dash/test_dash_smartswitch_vnet.py
@@ -2,11 +2,15 @@
 import pytest
 import ptf.testutils as testutils
 import packets
+import time
+import json
 
-from constants import LOCAL_PTF_INTF, REMOTE_PA_IP, REMOTE_PTF_RECV_INTF, REMOTE_DUT_INTF
+from constants import LOCAL_PTF_INTF, REMOTE_PA_IP, REMOTE_PTF_RECV_INTF, REMOTE_DUT_INTF, \
+    VXLAN_UDP_BASE_SRC_PORT, VXLAN_UDP_SRC_PORT_MASK
 from gnmi_utils import apply_gnmi_file
 from dash_utils import render_template_to_host, apply_swssconfig_file
 from tests.dash.conftest import get_interface_ip
+from tests.common import config_reload
 
 APPLIANCE_VIP = "10.1.0.5"
 ENABLE_GNMI_API = True
@@ -21,47 +25,100 @@
 
 """
 Test prerequisites:
-- DPU needs the Appliance VIP configured as its loopback IP
 - Assign IPs to DPU-NPU dataplane interfaces
-- Default route on DPU to NPU
 """
 
 
 @pytest.fixture(scope="module", autouse=True)
-def add_dpu_static_route(duthost, dpu_ip):
-    cmd = f"ip route replace {APPLIANCE_VIP}/32 via {dpu_ip}"
-    duthost.shell(cmd)
+def dpu_setup_vnet(duthost, dpuhosts, dpu_index, skip_config):
+    if skip_config:
 
-    yield
+        return
+    dpuhost = dpuhosts[dpu_index]
+    # explicitly add mgmt IP route so the default route doesn't disrupt SSH access
+    dpuhost.shell(f'ip route replace {duthost.mgmt_ip}/32 via 169.254.200.254')
+    intfs = dpuhost.shell("show ip int")["stdout"]
+    dpu_cmds = list()
+    if "Loopback0" not in intfs:
+        dpu_cmds.append("config loopback add Loopback0")
+        dpu_cmds.append(f"config int ip add Loopback0 {APPLIANCE_VIP}/32")
 
-    duthost.shell(f"ip route del {APPLIANCE_VIP}/32 via {dpu_ip}")
+    dpu_cmds.append(f"ip route replace default via {dpuhost.npu_data_port_ip}")
+    dpuhost.shell_cmds(cmds=dpu_cmds)
 
 
 @pytest.fixture(scope="module", autouse=True)
-def add_npu_static_routes(duthost, dpu_ip, dash_smartswitch_vnet_config, skip_config, skip_cleanup):
+def add_npu_static_routes_vnet(duthost, dash_smartswitch_vnet_config, skip_config, skip_cleanup, dpu_index, dpuhosts):
     if not skip_config:
+        dpuhost = dpuhosts[dpu_index]
         cmds = []
         pe_nexthop_ip = get_interface_ip(duthost, dash_smartswitch_vnet_config[REMOTE_DUT_INTF]).ip + 1
         cmds.append(f"ip route replace {dash_smartswitch_vnet_config[REMOTE_PA_IP]}/32 via {pe_nexthop_ip}")
+        cmds.append(f"ip route replace {APPLIANCE_VIP}/32 via {dpuhost.dpu_data_port_ip}")
         logger.info(f"Adding static routes: {cmds}")
         duthost.shell_cmds(cmds=cmds)
 
     yield
 
     if not skip_config and not skip_cleanup:
+        dpuhost = dpuhosts[dpu_index]
         cmds = []
         cmds.append(f"ip route del {dash_smartswitch_vnet_config[REMOTE_PA_IP]}/32 via {pe_nexthop_ip}")
+        cmds.append(f"ip route del {APPLIANCE_VIP}/32 via {dpuhost.dpu_data_port_ip}")
         logger.info(f"Removing static routes: {cmds}")
         duthost.shell_cmds(cmds=cmds)
 
 
-@pytest.fixture(autouse=True)
-def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, dash_smartswitch_vnet_config, skip_config):
+@pytest.fixture(scope="module", autouse=True)
+def set_vxlan_udp_sport_range(dpuhosts, dpu_index):
+    """
+    Configure VXLAN UDP source port range in dpu configuration.
+    """
+    dpuhost = dpuhosts[dpu_index]
+    vxlan_sport_config = [
+        {
+            "SWITCH_TABLE:switch": {
+                "vxlan_sport": VXLAN_UDP_BASE_SRC_PORT,
+                "vxlan_mask": VXLAN_UDP_SRC_PORT_MASK
+            },
+            "OP": "SET"
+        }
+    ]
+
+    logger.info(f"Setting VXLAN source port config: {vxlan_sport_config}")
+    config_path = "/tmp/vxlan_sport_config.json"
+    dpuhost.copy(content=json.dumps(vxlan_sport_config, indent=4), dest=config_path, verbose=False)
+    apply_swssconfig_file(dpuhost, config_path)
+    if 'pensando' in dpuhost.facts['asic_type']:
+        logger.warning("Applying Pensando DPU VXLAN sport workaround")
+        dpuhost.shell("pdsctl debug update device --vxlan-port 4789 --vxlan-src-ports 5120-5247")
+    yield
+    if str(VXLAN_UDP_BASE_SRC_PORT) in dpuhost.shell("redis-cli -n 0 hget SWITCH_TABLE:switch vxlan_sport")['stdout']:
+        config_reload(dpuhost, safe_reload=True, yang_validate=False)
+
+
+@pytest.fixture(scope="module", autouse=True)
+def common_setup_teardown(
+        localhost,
+        duthost,
+        ptfhost,
+        dpu_index,
+        dash_smartswitch_vnet_config,
+        skip_config,
+        dpuhosts,
+        add_npu_static_routes_vnet,
+        dpu_setup_vnet,
+        set_vxlan_udp_sport_range):
     if skip_config:
         return
 
-    host = f"dpu{dpu_index}"
+    dpuhost = dpuhosts[dpu_index]
+    host = f"dpu{dpuhost.dpu_index}"
     op = "SET"
+    # Until this fix and related are in 202506 release this workaround is needed
+    # Issue observed is that first set of DASH objects is not configured
+    # https://github.com/sonic-net/sonic-swss-common/pull/1068
+    time.sleep(180)
     for i in range(0, 4):
         config = f"dash_smartswitch_vnet_{i}"
         template_name = "{}.j2".format(config)
@@ -74,29 +131,20 @@ def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, dash_smartswit
 
     yield
 
-    op = "DEL"
-    for i in reversed(range(0, 4)):
-        config = f"dash_smartswitch_vnet_{i}"
-        template_name = "{}.j2".format(config)
-        dest_path = "/tmp/{}.json".format(config)
-        render_template_to_host(template_name, duthost, dest_path, dash_smartswitch_vnet_config, op=op)
-        if ENABLE_GNMI_API:
-            apply_gnmi_file(localhost, duthost, ptfhost, dest_path, None, 5, 1024, host)
-        else:
-            apply_swssconfig_file(duthost, dest_path)
+    # Route rule removal is broken so config reload to cleanup for now
+    # https://github.com/sonic-net/sonic-buildimage/issues/23590
+    config_reload(dpuhost, safe_reload=True, yang_validate=False)
 
 
 def test_smartswitch_outbound_vnet(
         ptfadapter,
         dash_smartswitch_vnet_config,
         skip_dataplane_checking,
-        inner_packet_type,
-        vxlan_udp_dport):
+        inner_packet_type):
 
     if skip_dataplane_checking:
         return
     _, vxlan_packet, expected_packet = packets.outbound_smartswitch_vnet_packets(dash_smartswitch_vnet_config,
-                                                                                 vxlan_udp_dport=vxlan_udp_dport,
                                                                                  inner_packet_type=inner_packet_type)
     ptfadapter.dataplane.flush()
     testutils.send(ptfadapter, dash_smartswitch_vnet_config[LOCAL_PTF_INTF], vxlan_packet, 1)
