Update inner MAC addresses for PL test

Signed-off-by: Lawrence Lee <[email protected]>

Author: theasianpianist

tests/dash/packets.py

@@ -140,10 +140,10 @@ def inbound_pl_packets(config, inner_packet_type='udp', vxlan_udp_dport=4789):
     return gre_packet, masked_exp_packet
 
 
-def outbound_pl_packets(config, outer_encap, inner_packet_type='udp', vxlan_udp_dport=4789):
+def outbound_pl_packets(config, outer_encap, inner_packet_type='udp', vxlan_udp_dport=4789, vxlan_udp_sport=1234):
     inner_packet = generate_inner_packet(inner_packet_type)(
-        eth_src=pl.ENI_MAC,
-        eth_dst=pl.REMOTE_MAC,
+        eth_src=pl.REMOTE_MAC,
+        eth_dst=pl.ENI_MAC,
         ip_src=pl.VM1_CA,
         ip_dst=pl.PE_CA,
     )
@@ -155,6 +155,7 @@ def outbound_pl_packets(config, outer_encap, inner_packet_type='udp', vxlan_udp_
             ip_src=pl.VM1_PA,
             ip_dst=pl.APPLIANCE_VIP,
             udp_dport=vxlan_udp_dport,
+            udp_sport=vxlan_udp_sport,
             with_udp_chksum=False,
             vxlan_vni=int(pl.VM_VNI),
             inner_frame=inner_packet
@@ -198,6 +199,7 @@ def outbound_pl_packets(config, outer_encap, inner_packet_type='udp', vxlan_udp_
     exp_inner_packet[scapy.UDP] = inner_packet[scapy.UDP]
 
     exp_encap_packet = testutils.simple_gre_packet(
+        eth_dst=config[REMOTE_PTF_MAC],
         eth_src=config[DUT_MAC],
         ip_src=pl.APPLIANCE_VIP,
         ip_dst=pl.PE_PA,

tests/dash/test_dash_privatelink.py

@@ -51,28 +51,33 @@ def dpu_ip(duthost, dpu_index):
 
 
 @pytest.fixture(scope="module", autouse=True)
-def add_npu_static_routes(duthost, dpu_ip, dash_pl_config):
-    cmds = []
-    vm_nexthop_ip = get_interface_ip(duthost, dash_pl_config[LOCAL_DUT_INTF]).ip + 1
-    pe_nexthop_ip = get_interface_ip(duthost, dash_pl_config[REMOTE_DUT_INTF]).ip + 1
-    cmds.append(f"ip route replace {pl.APPLIANCE_VIP}/32 via {dpu_ip}")
-    cmds.append(f"ip route replace {pl.VM1_PA}/32 via {vm_nexthop_ip}")
-    cmds.append(f"ip route replace {pl.PE_PA}/32 via {pe_nexthop_ip}")
-    logger.info(f"Adding static routes: {cmds}")
-    duthost.shell_cmds(cmds=cmds)
+def add_npu_static_routes(duthost, dpu_ip, dash_pl_config, skip_config, skip_cleanup):
+    if not skip_config:
+        cmds = []
+        vm_nexthop_ip = get_interface_ip(duthost, dash_pl_config[LOCAL_DUT_INTF]).ip + 1
+        pe_nexthop_ip = get_interface_ip(duthost, dash_pl_config[REMOTE_DUT_INTF]).ip + 1
+        cmds.append(f"ip route replace {pl.APPLIANCE_VIP}/32 via {dpu_ip}")
+        cmds.append(f"ip route replace {pl.VM1_PA}/32 via {vm_nexthop_ip}")
+        cmds.append(f"ip route replace {pl.PE_PA}/32 via {pe_nexthop_ip}")
+        logger.info(f"Adding static routes: {cmds}")
+        duthost.shell_cmds(cmds=cmds)
 
     yield
 
-    cmds = []
-    cmds.append(f"ip route del {pl.APPLIANCE_VIP}/32 via {dpu_ip}")
-    cmds.append(f"ip route del {pl.VM1_PA}/32 via {vm_nexthop_ip}")
-    cmds.append(f"ip route del {pl.PE_PA}/32 via {pe_nexthop_ip}")
-    logger.info(f"Removing static routes: {cmds}")
-    duthost.shell_cmds(cmds=cmds)
+    if not skip_config and not skip_cleanup:
+        cmds = []
+        cmds.append(f"ip route del {pl.APPLIANCE_VIP}/32 via {dpu_ip}")
+        cmds.append(f"ip route del {pl.VM1_PA}/32 via {vm_nexthop_ip}")
+        cmds.append(f"ip route del {pl.PE_PA}/32 via {pe_nexthop_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):
+def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, skip_config):
+    if skip_config:
+        return
+
     logger.info(pl.ROUTING_TYPE_PL_CONFIG)
     base_config_messages = {
         **pl.APPLIANCE_CONFIG,