tcp: req app deq notification on fifo full

[vpp.git] / src / vcl / test / test_vcl.py

diff --git a/src/vcl/test/test_vcl.py b/src/vcl/test/test_vcl.py
index f6d6385..8950470 100644 (file)
--- 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):
@@ -86,7 +87,7 @@ class VCLTestCase(VppTestCase):
         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,
+        self.env = {'VCL_VPP_API_SOCKET': self.get_api_sock_path(),
                     'VCL_APP_SCOPE_LOCAL': "true"}
         worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
                                      self.logger, self.env)
@@ -191,7 +192,7 @@ class VCLTestCase(VppTestCase):
     @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.")
     def thru_host_stack_test(self, server_app, server_args,
                              client_app, client_args):
-        self.env = {'VCL_VPP_API_SOCKET': self.api_sock,
+        self.env = {'VCL_VPP_API_SOCKET': self.get_api_sock_path(),
                     'VCL_APP_SCOPE_GLOBAL': "true",
                     'VCL_APP_NAMESPACE_ID': "1",
                     'VCL_APP_NAMESPACE_SECRET': "1234"}
@@ -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",
@@ -280,6 +281,7 @@ class LDPCutThruTestCase(VCLTestCase):
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
     @unittest.skipUnless(running_extended_tests, "part of extended tests")
     def test_ldp_cut_thru_echo(self):
@@ -350,6 +352,7 @@ class VCLCutThruTestCase(VCLTestCase):
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
     def test_vcl_cut_thru_echo(self):
         """ run VCL cut thru echo test """
@@ -405,6 +408,7 @@ class VCLThruHostStackEcho(VCLTestCase):
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show app server"))
         self.logger.debug(self.vapi.cli("show session verbose"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
 
 class VCLThruHostStackTLS(VCLTestCase):
@@ -443,6 +447,7 @@ class VCLThruHostStackTLS(VCLTestCase):
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show app server"))
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
 
 class VCLThruHostStackBidirNsock(VCLTestCase):
@@ -475,6 +480,7 @@ class VCLThruHostStackBidirNsock(VCLTestCase):
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
     def test_vcl_thru_host_stack_bi_dir_nsock(self):
         """ run VCL thru host stack bi-directional (multiple sockets) test """
@@ -516,6 +522,7 @@ class LDPThruHostStackBidirNsock(VCLTestCase):
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
     def test_ldp_thru_host_stack_bi_dir_nsock(self):
         """ run LDP thru host stack bi-directional (multiple sockets) test """
@@ -622,8 +629,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()
@@ -631,6 +638,7 @@ class LDPThruHostStackIperf(VCLTestCase):
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
     @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.")
     def test_ldp_thru_host_stack_iperf3(self):
@@ -657,9 +665,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()
@@ -667,6 +675,7 @@ class LDPThruHostStackIperfUdp(VCLTestCase):
 
     def show_commands_at_teardown(self):
         self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
 
     @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.")
     def test_ldp_thru_host_stack_iperf3_udp(self):
@@ -688,6 +697,10 @@ class LDPIpv6CutThruTestCase(VCLTestCase):
     def tearDownClass(cls):
         super(LDPIpv6CutThruTestCase, cls).tearDownClass()
 
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
+
     def setUp(self):
         super(LDPIpv6CutThruTestCase, self).setUp()
 
@@ -698,9 +711,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",
@@ -764,6 +777,10 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
     def tearDownClass(cls):
         super(VCLIpv6CutThruTestCase, cls).tearDownClass()
 
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
+
     def setUp(self):
         super(VCLIpv6CutThruTestCase, self).setUp()
 
@@ -788,6 +805,10 @@ class VCLIpv6CutThruTestCase(VCLTestCase):
         super(VCLIpv6CutThruTestCase, self).tearDown()
         self.cut_thru_tear_down()
 
+    def show_commands_at_teardown(self):
+        self.logger.debug(self.vapi.cli("show session verbose 2"))
+        self.logger.debug(self.vapi.cli("show app mq"))
+
     def test_vcl_ipv6_cut_thru_echo(self):
         """ run VCL IPv6 cut thru echo test """