X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvcl%2Ftest%2Ftest_vcl.py;h=f5a5bebdad817491a660370c99398a1fef6b033f;hb=1f13f8fd8a5f5f68e6e03825115c64383f17a1b5;hp=37ede7b697957e5c144787657e44b0a0594acbcd;hpb=45ab3ecb1897f5be4b2f9267bd64b15c06d0d022;p=vpp.git

diff --git a/src/vcl/test/test_vcl.py b/src/vcl/test/test_vcl.py
index 37ede7b6979..f5a5bebdad8 100644
--- a/src/vcl/test/test_vcl.py
+++ b/src/vcl/test/test_vcl.py
@@ -49,6 +49,7 @@ class VCLAppWorker(Worker):
 
 class VCLTestCase(VppTestCase):
     """ VCL Test Class """
+    extra_vpp_punt_config = ["session", "{", "poll-main", "}"]
 
     @classmethod
     def setUpClass(cls):
@@ -80,10 +81,10 @@ class VCLTestCase(VppTestCase):
         super(VCLTestCase, self).setUp()
 
     def cut_thru_setup(self):
-        self.vapi.session_enable_disable(is_enabled=1)
+        self.vapi.session_enable_disable(is_enable=1)
 
     def cut_thru_tear_down(self):
-        self.vapi.session_enable_disable(is_enabled=0)
+        self.vapi.session_enable_disable(is_enable=0)
 
     def cut_thru_test(self, server_app, server_args, client_app, client_args):
         self.env = {'VCL_VPP_API_SOCKET': self.api_sock,
@@ -103,7 +104,7 @@ class VCLTestCase(VppTestCase):
         self.sleep(self.post_test_sleep)
 
     def thru_host_stack_setup(self):
-        self.vapi.session_enable_disable(is_enabled=1)
+        self.vapi.session_enable_disable(is_enable=1)
         self.create_loopback_interfaces(2)
 
         table_id = 1
@@ -145,7 +146,7 @@ class VCLTestCase(VppTestCase):
             i.admin_down()
 
     def thru_host_stack_ipv6_setup(self):
-        self.vapi.session_enable_disable(is_enabled=1)
+        self.vapi.session_enable_disable(is_enable=1)
         self.create_loopback_interfaces(2)
 
         table_id = 1
@@ -186,7 +187,7 @@ class VCLTestCase(VppTestCase):
             i.set_table_ip6(0)
             i.admin_down()
 
-        self.vapi.session_enable_disable(is_enabled=0)
+        self.vapi.session_enable_disable(is_enable=0)
 
     @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.")
     def thru_host_stack_test(self, server_app, server_args,
@@ -261,8 +262,8 @@ class LDPCutThruTestCase(VCLTestCase):
         self.client_echo_test_args = ["-E", self.echo_phrase, "-X",
                                       self.server_addr, self.server_port]
         self.client_iperf3_timeout = 20
-        self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.server_addr]
-        self.server_iperf3_args = ["-V4d", "-s"]
+        self.client_iperf3_args = ["-4d", "-t 2", "-c", self.server_addr]
+        self.server_iperf3_args = ["-4d", "-s"]
         self.client_uni_dir_nsock_timeout = 20
         self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
                                                "-I", "2",
@@ -622,8 +623,8 @@ class LDPThruHostStackIperf(VCLTestCase):
 
         self.thru_host_stack_setup()
         self.client_iperf3_timeout = 20
-        self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.loop0.local_ip4]
-        self.server_iperf3_args = ["-V4d", "-s"]
+        self.client_iperf3_args = ["-4d", "-t 2", "-c", self.loop0.local_ip4]
+        self.server_iperf3_args = ["-4d", "-s"]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
@@ -657,9 +658,9 @@ class LDPThruHostStackIperfUdp(VCLTestCase):
 
         self.thru_host_stack_setup()
         self.client_iperf3_timeout = 20
-        self.client_iperf3_args = ["-V4d", "-t 2", "-u", "-l 1400",
+        self.client_iperf3_args = ["-4d", "-t 2", "-u", "-l 1400",
                                    "-c", self.loop0.local_ip4]
-        self.server_iperf3_args = ["-V4d", "-s"]
+        self.server_iperf3_args = ["-4d", "-s"]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
@@ -698,9 +699,9 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
         self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X",
                                            self.server_ipv6_addr,
                                            self.server_port]
-        self.client_ipv6_iperf3_args = ["-V6d", "-t 2", "-c",
+        self.client_ipv6_iperf3_args = ["-6d", "-t 2", "-c",
                                         self.server_ipv6_addr]
-        self.server_ipv6_iperf3_args = ["-V6d", "-s"]
+        self.server_ipv6_iperf3_args = ["-6d", "-s"]
         self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
                                                     "-6",
                                                     "-I", "2",