vcl: add dtls test

[vpp.git] / test / test_vcl.py

diff --git a/test/test_vcl.py b/test/test_vcl.py
index 804e745..8bff4be 100644 (file)
--- a/test/test_vcl.py
+++ b/test/test_vcl.py
@@ -26,7 +26,11 @@ _have_iperf3 = have_app(iperf3)
 class VCLAppWorker(Worker):
     """ VCL Test Application Worker """
 
-    def __init__(self, build_dir, appname, args, logger, env={}):
+    def __init__(self, build_dir, appname, executable_args, logger, env=None,
+                 *args, **kwargs):
+
+        if env is None:
+            env = {}
         vcl_lib_dir = "%s/vpp/lib" % build_dir
         if "iperf" in appname:
             app = appname
@@ -38,12 +42,14 @@ class VCLAppWorker(Worker):
                         "%s/libvcl_ldpreload.so" % vcl_lib_dir})
         else:
             app = "%s/vpp/bin/%s" % (build_dir, appname)
-        self.args = [app] + args
-        super(VCLAppWorker, self).__init__(self.args, logger, env)
+        self.args = [app] + executable_args
+        super(VCLAppWorker, self).__init__(self.args, logger, env,
+                                           *args, **kwargs)
 
 
 class VCLTestCase(VppTestCase):
     """ VCL Test Class """
+    extra_vpp_punt_config = ["session", "{", "poll-main", "}"]
 
     @classmethod
     def setUpClass(cls):
@@ -75,13 +81,13 @@ 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_API_PREFIX': self.shm_prefix,
+        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)
@@ -98,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
@@ -115,9 +121,9 @@ class VCLTestCase(VppTestCase):
             table_id += 1
 
         # Configure namespaces
-        self.vapi.app_namespace_add_del(namespace_id=b"1", secret=1234,
+        self.vapi.app_namespace_add_del(namespace_id="1", secret=1234,
                                         sw_if_index=self.loop0.sw_if_index)
-        self.vapi.app_namespace_add_del(namespace_id=b"2", secret=5678,
+        self.vapi.app_namespace_add_del(namespace_id="2", secret=5678,
                                         sw_if_index=self.loop1.sw_if_index)
 
         # Add inter-table routes
@@ -140,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
@@ -156,9 +162,9 @@ class VCLTestCase(VppTestCase):
             table_id += 1
 
         # Configure namespaces
-        self.vapi.app_namespace_add_del(namespace_id=b"1", secret=1234,
+        self.vapi.app_namespace_add_del(namespace_id="1", secret=1234,
                                         sw_if_index=self.loop0.sw_if_index)
-        self.vapi.app_namespace_add_del(namespace_id=b"2", secret=5678,
+        self.vapi.app_namespace_add_del(namespace_id="2", secret=5678,
                                         sw_if_index=self.loop1.sw_if_index)
 
         # Add inter-table routes
@@ -181,12 +187,12 @@ 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,
                              client_app, client_args):
-        self.env = {'VCL_API_PREFIX': self.shm_prefix,
+        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"}
@@ -256,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 = ["-4", "-t 2", "-c", self.server_addr]
+        self.server_iperf3_args = ["-4", "-s"]
         self.client_uni_dir_nsock_timeout = 20
         self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
                                                "-I", "2",
@@ -275,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):
@@ -345,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 """
@@ -400,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):
@@ -438,6 +447,47 @@ 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 VCLThruHostStackDTLS(VCLTestCase):
+    """ VCL Thru Host Stack DTLS """
+
+    @classmethod
+    def setUpClass(cls):
+        super(VCLThruHostStackDTLS, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(VCLThruHostStackDTLS, cls).tearDownClass()
+
+    def setUp(self):
+        super(VCLThruHostStackDTLS, self).setUp()
+
+        self.thru_host_stack_setup()
+        self.client_uni_dir_dtls_timeout = 20
+        self.server_dtls_args = ["-p dtls", self.server_port]
+        self.client_uni_dir_dtls_test_args = ["-N", "1000", "-U", "-X",
+                                              "-p dtls", "-T 1400",
+                                              self.loop0.local_ip4,
+                                              self.server_port]
+
+    def test_vcl_thru_host_stack_dtls_uni_dir(self):
+        """ run VCL thru host stack uni-directional DTLS test """
+
+        self.timeout = self.client_uni_dir_dtls_timeout
+        self.thru_host_stack_test("vcl_test_server", self.server_dtls_args,
+                                  "vcl_test_client",
+                                  self.client_uni_dir_dtls_test_args)
+
+    def tearDown(self):
+        self.thru_host_stack_tear_down()
+        super(VCLThruHostStackDTLS, self).tearDown()
+
+    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):
@@ -470,6 +520,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 """
@@ -495,20 +546,15 @@ class LDPThruHostStackBidirNsock(VCLTestCase):
         super(LDPThruHostStackBidirNsock, self).setUp()
 
         self.thru_host_stack_setup()
-        if self.vppDebug:
-            self.client_bi_dir_nsock_timeout = 20
-            self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
-                                                  # OUCH! Host Stack Bug?
-                                                  # "-I", "2",
-                                                  self.loop0.local_ip4,
-                                                  self.server_port]
-        else:
-            self.client_bi_dir_nsock_timeout = 20
-            self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
-                                                  # OUCH! Host Stack Bug?
-                                                  # "-I", "2",
-                                                  self.loop0.local_ip4,
-                                                  self.server_port]
+        self.client_bi_dir_nsock_timeout = 20
+        self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+                                              # OUCH! Host Stack Bug?
+                                              # Only fails when running
+                                              # 'make test TEST_JOBS=auto'
+                                              # or TEST_JOBS > 1
+                                              # "-I", "2",
+                                              self.loop0.local_ip4,
+                                              self.server_port]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
@@ -516,6 +562,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 +669,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 = ["-4", "-t 2", "-c", self.loop0.local_ip4]
+        self.server_iperf3_args = ["-4", "-s"]
 
     def tearDown(self):
         self.thru_host_stack_tear_down()
@@ -631,6 +678,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):
@@ -641,6 +689,43 @@ class LDPThruHostStackIperf(VCLTestCase):
                                   iperf3, self.client_iperf3_args)
 
 
+class LDPThruHostStackIperfUdp(VCLTestCase):
+    """ LDP Thru Host Stack Iperf UDP """
+
+    @classmethod
+    def setUpClass(cls):
+        super(LDPThruHostStackIperfUdp, cls).setUpClass()
+
+    @classmethod
+    def tearDownClass(cls):
+        super(LDPThruHostStackIperfUdp, cls).tearDownClass()
+
+    def setUp(self):
+        super(LDPThruHostStackIperfUdp, self).setUp()
+
+        self.thru_host_stack_setup()
+        self.client_iperf3_timeout = 20
+        self.client_iperf3_args = ["-4", "-t 2", "-u", "-l 1400",
+                                   "-c", self.loop0.local_ip4]
+        self.server_iperf3_args = ["-4", "-s"]
+
+    def tearDown(self):
+        self.thru_host_stack_tear_down()
+        super(LDPThruHostStackIperfUdp, self).tearDown()
+
+    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):
+        """ run LDP thru host stack iperf3 UDP test """
+
+        self.timeout = self.client_iperf3_timeout
+        self.thru_host_stack_test(iperf3, self.server_iperf3_args,
+                                  iperf3, self.client_iperf3_args)
+
+
 class LDPIpv6CutThruTestCase(VCLTestCase):
     """ LDP IPv6 Cut Thru Tests """
 
@@ -652,6 +737,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()
 
@@ -662,9 +751,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 = ["-6", "-t 2", "-c",
                                         self.server_ipv6_addr]
-        self.server_ipv6_iperf3_args = ["-V6d", "-s"]
+        self.server_ipv6_iperf3_args = ["-6", "-s"]
         self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
                                                     "-6",
                                                     "-I", "2",
@@ -728,6 +817,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()
 
@@ -752,6 +845,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 """