From e796e41cb0373380759a2934b26e59b378c13a5b Mon Sep 17 00:00:00 2001 From: ShaofengWu123 Date: Fri, 20 Dec 2024 09:45:09 +0000 Subject: [PATCH] test commit --- .../functional/ptf/saidashdpapp_sanity.py | 4 +- test/test-cases/functional/ptf/saidashflow.py | 81 +++++++++---------- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/test/test-cases/functional/ptf/saidashdpapp_sanity.py b/test/test-cases/functional/ptf/saidashdpapp_sanity.py index 1d6312590..a5f3ab3d5 100644 --- a/test/test-cases/functional/ptf/saidashdpapp_sanity.py +++ b/test/test-cases/functional/ptf/saidashdpapp_sanity.py @@ -332,6 +332,8 @@ def ageoutTcpTest(self): self.pkt_exp = vxlan_exp_pkt print("\tSending outbound packet TCP SYN ...") send_packet(self, 0, vxlan_pkt) + print("\tVerifying packet...") + verify_packet(self, self.pkt_exp, 0) print("\tVerifying flow created...") verify_flow(self.eni_mac, self.vnet & 0xffff, inner_pkt) time.sleep(35) @@ -346,7 +348,7 @@ def runTest(self): self.configureVnet() self.trafficUdpTest() self.trafficTcpTest() - self.ageoutTcpTest() + # self.ageoutTcpTest() def tearDown(self): diff --git a/test/test-cases/functional/ptf/saidashflow.py b/test/test-cases/functional/ptf/saidashflow.py index 804d087ce..f3e08b51a 100644 --- a/test/test-cases/functional/ptf/saidashflow.py +++ b/test/test-cases/functional/ptf/saidashflow.py @@ -514,47 +514,46 @@ def setupTest(self): exp_inner_dport = self.dst_port )) - # Test case xx: flow hit (5 tuple) - # action: encap_u0 | encap_u1 - # expected: pass - self.tests.append(FlowTest(saithrift = self, - name = "FlowHitActionEncapU0EncapU1", - create_entry = True, - switch_id = self.switch_id, - vnet_vni = self.vnet_vni, - vnet_id = self.vnet_id, - outbound_vni = self.outbound_vni, - eni_mac = self.vm_mac, - outer_smac = "00:00:00:00:00:00", - outer_dmac = "00:00:00:00:00:00", - outer_sip = self.src_vm_pa_ip, - outer_dip = self.vip, - inner_smac = self.vm_mac, - inner_dmac = self.dst_ca_mac, - protocol = 17, - inner_sip = self.src_vm_ca_ip, - inner_dip = self.dst_ca_ip, - inner_sport = self.src_vm_port, - inner_dport = self.dst_port, - priority = 1, - action = SAI_DASH_FLOW_ACTION_ENCAP_U0 | SAI_DASH_FLOW_ACTION_ENCAP_U1, - exp_receive = True, - exp_u0_smac = self.eni_mac, - exp_u0_dmac = self.underlay_dmac, - exp_u0_sip = self.src_vm_pa_ip, - exp_u0_dip = self.dst_pa_ip, - exp_u1_smac = "11:22:33:44:55:66", - exp_u1_dmac = "77:88:99:aa:bb:cc", - exp_u1_sip = "200.0.1.2", - exp_u1_dip = "200.3.4.5", - exp_inner_smac = self.vm_mac, - exp_inner_dmac = self.dst_ca_mac, - exp_inner_sip = self.src_vm_ca_ip, - exp_inner_dip = self.dst_ca_ip, - exp_inner_sport = self.src_vm_port, - exp_inner_dport = self.dst_port - )) - + # # Test case xx: flow hit (5 tuple) + # # action: encap_u0 | encap_u1 + # # expected: pass + # self.tests.append(FlowTest(saithrift = self, + # name = "FlowHitActionEncapU0EncapU1", + # create_entry = True, + # switch_id = self.switch_id, + # vnet_vni = self.vnet_vni, + # vnet_id = self.vnet_id, + # outbound_vni = self.outbound_vni, + # eni_mac = self.vm_mac, + # outer_smac = "00:00:00:00:00:00", + # outer_dmac = "00:00:00:00:00:00", + # outer_sip = self.src_vm_pa_ip, + # outer_dip = self.vip, + # inner_smac = self.vm_mac, + # inner_dmac = self.dst_ca_mac, + # protocol = 17, + # inner_sip = self.src_vm_ca_ip, + # inner_dip = self.dst_ca_ip, + # inner_sport = self.src_vm_port, + # inner_dport = self.dst_port, + # priority = 1, + # action = SAI_DASH_FLOW_ACTION_ENCAP_U0 | SAI_DASH_FLOW_ACTION_ENCAP_U1, + # exp_receive = True, + # exp_u0_smac = self.eni_mac, + # exp_u0_dmac = self.underlay_dmac, + # exp_u0_sip = self.src_vm_pa_ip, + # exp_u0_dip = self.dst_pa_ip, + # exp_u1_smac = "11:22:33:44:55:66", + # exp_u1_dmac = "77:88:99:aa:bb:cc", + # exp_u1_sip = "200.0.1.2", + # exp_u1_dip = "200.3.4.5", + # exp_inner_smac = self.vm_mac, + # exp_inner_dmac = self.dst_ca_mac, + # exp_inner_sip = self.src_vm_ca_ip, + # exp_inner_dip = self.dst_ca_ip, + # exp_inner_sport = self.src_vm_port, + # exp_inner_dport = self.dst_port + # )) # Test case 3: flow hit (5 tuple) # action: overlay dmac rewrite