[DASH] Update the dash eni counter test to align with the latest PL test change (sonic-net#21196)

* Update the dash eni counter test to align with the latest PL test change

* Update packets.py to fix pre-commit

* Update test_dash_eni_counter.py to fix pre-commit

---------

Co-authored-by: Nikolay Mirin <[email protected]>

Author: 2 people

tests/dash/packets.py

@@ -119,7 +119,8 @@ def set_do_not_care_layer(mask, layer, field_name, n=1):
 
 
 def inbound_pl_packets(
-    config, floating_nic=False, inner_packet_type="udp", vxlan_udp_dport=4789, inner_sport=4567, inner_dport=6789
+    config, floating_nic=False, inner_packet_type="udp", vxlan_udp_dport=4789, inner_sport=4567, inner_dport=6789,
+    vxlan_udp_base_src_port=VXLAN_UDP_BASE_SRC_PORT, vxlan_udp_src_port_mask=VXLAN_UDP_SRC_PORT_MASK
 ):
     inner_sip = get_pl_overlay_dip(  # not a typo, inner DIP/SIP are reversed for inbound direction
         pl.PE_CA, pl.PL_OVERLAY_DIP, pl.PL_OVERLAY_DIP_MASK
@@ -129,14 +130,16 @@ def inbound_pl_packets(
         pl.VM1_CA, pl.PL_OVERLAY_SIP, pl.PL_OVERLAY_SIP_MASK, pl.PL_ENCODING_IP, pl.PL_ENCODING_MASK
     )
 
+    l4_protocol_key = get_scapy_l4_protocol_key(inner_packet_type)
+
     inner_packet = generate_inner_packet(inner_packet_type, ipv6=True)(
         eth_src=pl.REMOTE_MAC,
         eth_dst=pl.ENI_MAC,
         ipv6_src=inner_sip,
         ipv6_dst=inner_dip,
-        udp_sport=inner_sport,
-        udp_dport=inner_dport,
     )
+    inner_packet[l4_protocol_key].sport = inner_sport
+    inner_packet[l4_protocol_key].dport = inner_dport
 
     gre_packet = testutils.simple_gre_packet(
         eth_dst=config[DUT_MAC],
@@ -166,7 +169,7 @@ def inbound_pl_packets(
         ip_ttl=254,
         ip_id=0,
         udp_dport=vxlan_udp_dport,
-        udp_sport=VXLAN_UDP_BASE_SRC_PORT,
+        udp_sport=vxlan_udp_base_src_port,
         vxlan_vni=pl.ENCAP_VNI if floating_nic else int(pl.VNET1_VNI),
         inner_frame=exp_inner_packet,
     )
@@ -175,7 +178,7 @@ def inbound_pl_packets(
     masked_exp_packet.set_do_not_care_packet(scapy.Ether, "src")
     masked_exp_packet.set_do_not_care_packet(scapy.Ether, "dst")
     masked_exp_packet.set_do_not_care_packet(scapy.UDP, "chksum")
-    masked_exp_packet.set_do_not_care(8 * (34 + 2) - VXLAN_UDP_SRC_PORT_MASK, VXLAN_UDP_SRC_PORT_MASK)
+    masked_exp_packet.set_do_not_care(8 * (34 + 2) - vxlan_udp_src_port_mask, vxlan_udp_src_port_mask)
     masked_exp_packet.set_do_not_care_packet(scapy.IP, "ttl")
     masked_exp_packet.set_do_not_care_packet(scapy.IP, "chksum")
     if floating_nic:
@@ -227,15 +230,17 @@ def outbound_pl_packets(
     vni=None
 ):
     outer_vni = int(vni if vni else pl.VM_VNI)
+
+    l4_protocol_key = get_scapy_l4_protocol_key(inner_packet_type)
+
     inner_packet = generate_inner_packet(inner_packet_type)(
         eth_src=pl.VM_MAC if floating_nic else pl.ENI_MAC,
         eth_dst=pl.ENI_MAC if floating_nic else pl.REMOTE_MAC,
         ip_src=pl.VM1_CA,
         ip_dst=pl.PE_CA,
-        udp_sport=inner_sport,
-        udp_dport=inner_dport,
     )
-    l4_protocol_key = get_scapy_l4_protocol_key(inner_packet_type)
+    inner_packet[l4_protocol_key].sport = inner_sport
+    inner_packet[l4_protocol_key].dport = inner_dport
 
     if outer_encap == "vxlan":
         outer_packet = testutils.simple_vxlan_packet(

tests/dash/test_dash_eni_counter.py

@@ -6,10 +6,9 @@
 import ptf.testutils as testutils
 import pytest
 from constants import LOCAL_PTF_INTF, LOCAL_DUT_INTF, REMOTE_DUT_INTF, REMOTE_PTF_RECV_INTF, \
-    REMOTE_PTF_SEND_INTF, VXLAN_UDP_BASE_SRC_PORT
+    REMOTE_PTF_SEND_INTF
 from gnmi_utils import apply_messages
 from packets import outbound_pl_packets, inbound_pl_packets
-from tests.common import config_reload
 from tests.common.plugins.allure_wrapper import allure_step_wrapper as allure
 from tests.common.helpers.assertions import pytest_assert
 from tests.common.utilities import wait_until
@@ -51,7 +50,7 @@ def setup_npu_routes(duthost, dash_pl_config, skip_config, skip_cleanup, dpu_ind
 
 
 @pytest.fixture(autouse=True, scope="module")
-def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, dpuhosts, skip_config, set_vxlan_udp_sport_range):
+def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, dpuhosts, skip_config):
     if skip_config:
         return
     dpuhost = dpuhosts[dpu_index]
@@ -68,7 +67,7 @@ def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, dpuhosts, skip
     apply_messages(localhost, duthost, ptfhost, base_config_messages, dpuhost.dpu_index)
 
     route_and_mapping_messages = {
-        **pl.PE1_VNET_MAPPING_CONFIG,
+        **pl.PE_VNET_MAPPING_CONFIG,
         **pl.PE_SUBNET_ROUTE_CONFIG,
         **pl.VM_SUBNET_ROUTE_CONFIG
     }
@@ -95,9 +94,6 @@ def common_setup_teardown(localhost, duthost, ptfhost, dpu_index, dpuhosts, skip
     apply_messages(localhost, duthost, ptfhost, route_and_mapping_messages, dpuhost.dpu_index, False)
     apply_messages(localhost, duthost, ptfhost, base_config_messages, dpuhost.dpu_index, False)
 
-    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)
-
 
 @pytest.fixture(scope="function", params=["vxlan", "gre"])
 def outer_encap(request):
@@ -239,7 +235,8 @@ def test_inbound_pkt_eni_counter(
         packet_number = 1
 
         vm_to_dpu_pkt, _ = outbound_pl_packets(dash_pl_config, outer_encap, inner_packet_type=inner_packet_type)
-        pe_to_dpu_pkt, exp_dpu_to_vm_pkt = inbound_pl_packets(dash_pl_config, inner_packet_type=inner_packet_type)
+        pe_to_dpu_pkt, exp_dpu_to_vm_pkt = inbound_pl_packets(
+            dash_pl_config, inner_packet_type=inner_packet_type, vxlan_udp_src_port_mask=16)
 
         with allure.step("send outbound and inbound packet and verify the relevant eni counter"):
             eni_counter_check_point_dict = {"SAI_ENI_STAT_FLOW_CREATED": 1,