[vxlan-decap]: Minor fixes and acceleration

ansible/roles/test/files/ptftests/vxlan-decap.py

@@ -56,6 +56,8 @@ def generate_ArpResponderConfig(self):
         config = {}
         for test in self.tests:
             for port in test['acc_ports']:
+                if port == 0 or port == 1:
+                    continue
                 config['eth%d' % port] = [test['vlan_ip_prefix'] % port]
 
         with open('/tmp/vxlan_arpresponder.conf', 'w') as fp:
@@ -166,10 +168,13 @@ def runTest(self):
             print test['name']
             res_v = self.Vxlan(test)
             print "  Vxlan            = ", res_v
+
             res_f = self.RegularLAGtoVLAN(test)
             print "  RegularLAGtoVLAN = ", res_f
+
             res_t = self.RegularVLANtoLAG(test)
             print "  RegularVLANtoLAG = ", res_t
+
             print
             if self.vxlan_enabled:
                 self.assertTrue(res_v, "VxlanTest failed")
@@ -179,29 +184,34 @@ def runTest(self):
             self.assertTrue(res_t, "RegularVLANtoLAG test failed")
 
     def Vxlan(self, test):
-        rv = True
         for n in self.net_ports:
             for a in test['acc_ports']:
+                if a == 0 or a == 1:
+                    continue
                 res = self.checkVxlan(a, n, test)
-                rv = rv and res
+                if not res: return False
 
-        return rv
+        return True
 
     def RegularLAGtoVLAN(self, test):
-        rv = True
         for n in self.net_ports:
             for a in test['acc_ports']:
+                if a == 0 or a == 1:
+                    continue
                 res = self.checkRegularRegularLAGtoVLAN(a, n, test)
-                rv = rv and res
-        return rv
+                if not res: return False
+
+        return True
 
     def RegularVLANtoLAG(self, test):
-        rv = True
         for dst, ports in self.pc_info:
             for a in test['acc_ports']:
+                if a == 0 or a == 1:
+                    continue
                 res = self.checkRegularRegularVLANtoLAG(a, ports, dst, test)
-                rv = rv and res
-        return rv
+                if not res: return False
+
+        return True
 
     def checkRegularRegularVLANtoLAG(self, acc_port, pc_ports, dst_ip, test):
         rv = True
@@ -228,8 +238,10 @@ def checkRegularRegularVLANtoLAG(self, acc_port, pc_ports, dst_ip, test):
 
         for i in xrange(self.nr):
             testutils.send_packet(self, acc_port, packet)
-        nr_rcvd = testutils.count_matched_packets_all_ports(self, exp_packet, pc_ports, timeout=0.1)
-        rv = rv and (nr_rcvd == self.nr)
+        if self.nr == 1:
+            rv = rv and verify_packet_any_port(self, exp_packet, pc_ports)
+        else:
+            rv = rv and self.nr == testutils.count_matched_packets_all_ports(self, exp_packet, pc_ports, timeout=0.1)
         return rv
 
 
@@ -257,8 +269,10 @@ def checkRegularRegularLAGtoVLAN(self, acc_port, net_port, test):
 
         for i in xrange(self.nr):
             testutils.send_packet(self, net_port, packet)
-        nr_rcvd = testutils.count_matched_packets(self, exp_packet, acc_port, timeout=0.1)
-        rv = rv and (nr_rcvd == self.nr)
+        if self.nr == 1:
+            rv = rv and verify_packet_any_port(self, exp_packet, [acc_port])
+        else:
+            rv = rv and self.nr == testutils.count_matched_packets(self, exp_packet, acc_port, timeout=0.1)
         return rv
 
     def checkVxlan(self, acc_port, net_port, test):

ansible/roles/test/tasks/vxlan-decap.yml

@@ -54,6 +54,7 @@
         - vxlan_enabled=False
         - config_file='/tmp/vxlan_decap.json'
         - repetitions=1
+        ptf_extra_options: "--relax"
 
     - name: Configure vxlan decap for {{ item }}
       shell: sonic-cfggen -j /tmp/vxlan_db.{{ item }}.json --write-to-db
@@ -71,3 +72,4 @@
         - vxlan_enabled=True
         - config_file='/tmp/vxlan_decap.json'
         - count=1
+        ptf_extra_options: "--relax"