X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_udp.py;h=03a0812a342ace2605199b9731d99db862232cc4;hb=06111a837;hp=40c814774bf7735aef20b5c897b32464954cd987;hpb=ead1e536d66d83b546528c32e2112085a97c8e13;p=vpp.git

diff --git a/test/test_udp.py b/test/test_udp.py
index 40c814774bf..03a0812a342 100644
--- a/test/test_udp.py
+++ b/test/test_udp.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python3
 import unittest
+from framework import tag_fixme_vpp_workers
 from framework import VppTestCase, VppTestRunner
 
 from vpp_udp_encap import find_udp_encap, VppUdpEncap
@@ -15,6 +16,7 @@ from scapy.contrib.mpls import MPLS
 NUM_PKTS = 67
 
 
+@tag_fixme_vpp_workers
 class TestUdpEncap(VppTestCase):
     """ UDP Encap Test Case """
 
@@ -60,7 +62,6 @@ class TestUdpEncap(VppTestCase):
         for i in self.pg_interfaces:
             i.unconfig_ip4()
             i.unconfig_ip6()
-            i.ip6_disable()
             i.set_table_ip4(0)
             i.set_table_ip6(0)
             i.admin_down()
@@ -169,7 +170,7 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IP(src="2.2.2.2", dst="1.1.0.1") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
+                 Raw(b'\xa5' * 100))
         rx = self.send_and_expect(self.pg0, p_4o4*NUM_PKTS, self.pg0)
         for p in rx:
             self.validate_outer4(p, udp_encap_0)
@@ -184,7 +185,7 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IP(src="2.2.2.2", dst="1.1.2.1") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
+                 Raw(b'\xa5' * 100))
         rx = self.send_and_expect(self.pg0, p_4o6*NUM_PKTS, self.pg2)
         for p in rx:
             self.validate_outer6(p, udp_encap_2)
@@ -199,7 +200,7 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IPv6(src="2001::100", dst="2001::1") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
+                 Raw(b'\xa5' * 100))
         rx = self.send_and_expect(self.pg0, p_6o4*NUM_PKTS, self.pg1)
         for p in rx:
             self.validate_outer4(p, udp_encap_1)
@@ -214,7 +215,7 @@ class TestUdpEncap(VppTestCase):
                        dst=self.pg0.local_mac) /
                  IPv6(src="2001::100", dst="2001::3") /
                  UDP(sport=1234, dport=1234) /
-                 Raw('\xa5' * 100))
+                 Raw(b'\xa5' * 100))
         rx = self.send_and_expect(self.pg0, p_6o6*NUM_PKTS, self.pg3)
         for p in rx:
             self.validate_outer6(p, udp_encap_3)
@@ -239,7 +240,7 @@ class TestUdpEncap(VppTestCase):
                          dst=self.pg0.local_mac) /
                    IP(src="2.2.2.2", dst="1.1.2.22") /
                    UDP(sport=1234, dport=1234) /
-                   Raw('\xa5' * 100))
+                   Raw(b'\xa5' * 100))
         rx = self.send_and_expect(self.pg0, p_4omo4*NUM_PKTS, self.pg1)
         for p in rx:
             self.validate_outer4(p, udp_encap_1)
@@ -248,6 +249,7 @@ class TestUdpEncap(VppTestCase):
         self.assertEqual(udp_encap_1.get_stats()['packets'], 2*NUM_PKTS)
 
 
+@tag_fixme_vpp_workers
 class TestUDP(VppTestCase):
     """ UDP Test Case """
 
@@ -261,7 +263,7 @@ class TestUDP(VppTestCase):
 
     def setUp(self):
         super(TestUDP, self).setUp()
-        self.vapi.session_enable_disable(is_enabled=1)
+        self.vapi.session_enable_disable(is_enable=1)
         self.create_loopback_interfaces(2)
 
         table_id = 0
@@ -278,9 +280,9 @@ class TestUDP(VppTestCase):
             table_id += 1
 
         # Configure namespaces
-        self.vapi.app_namespace_add_del(namespace_id="0".encode('ascii'),
+        self.vapi.app_namespace_add_del(namespace_id="0",
                                         sw_if_index=self.loop0.sw_if_index)
-        self.vapi.app_namespace_add_del(namespace_id="1".encode('ascii'),
+        self.vapi.app_namespace_add_del(namespace_id="1",
                                         sw_if_index=self.loop1.sw_if_index)
 
     def tearDown(self):
@@ -288,7 +290,7 @@ class TestUDP(VppTestCase):
             i.unconfig_ip4()
             i.set_table_ip4(0)
             i.admin_down()
-        self.vapi.session_enable_disable(is_enabled=0)
+        self.vapi.session_enable_disable(is_enable=0)
         super(TestUDP, self).tearDown()
 
     def test_udp_transfer(self):
@@ -321,6 +323,8 @@ class TestUDP(VppTestCase):
             self.logger.critical(error)
             self.assertNotIn("failed", error)
 
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+
         # Delete inter-table routes
         ip_t01.remove_vpp_config()
         ip_t10.remove_vpp_config()