session: support multiple worker binds

[vpp.git] / test / test_vcl.py

diff --git a/test/test_vcl.py b/test/test_vcl.py
index cba8c67..8a7faad 100644 (file)
--- a/test/test_vcl.py
+++ b/test/test_vcl.py
@@ -14,17 +14,17 @@ class VCLAppWorker(Worker):
     """ VCL Test Application Worker """
 
     def __init__(self, build_dir, appname, args, logger, env={}):
-        vcl_lib_dir = "%s/vpp/.libs" % build_dir
+        vcl_lib_dir = "%s/vpp/lib" % build_dir
         if "iperf" in appname:
             app = appname
             env.update({'LD_PRELOAD':
-                        "%s/libvcl_ldpreload.so.0.0.0" % vcl_lib_dir})
+                        "%s/libvcl_ldpreload.so" % vcl_lib_dir})
+        elif "sock" in appname:
+            app = "%s/vpp/bin/%s" % (build_dir, appname)
+            env.update({'LD_PRELOAD':
+                        "%s/libvcl_ldpreload.so" % vcl_lib_dir})
         else:
-            app = "%s/%s" % (vcl_lib_dir, appname)
-            if not os.path.isfile(app):
-                app = "%s/vpp/%s" % (build_dir, appname)
-                env.update({'LD_PRELOAD':
-                            "%s/libvcl_ldpreload.so.0.0.0" % vcl_lib_dir})
+            app = "%s/vpp/bin/%s" % (build_dir, appname)
         self.args = [app] + args
         super(VCLAppWorker, self).__init__(self.args, logger, env)
 
@@ -43,7 +43,7 @@ class VCLTestCase(VppTestCase):
         self.server_args = [self.server_port]
         self.server_ipv6_addr = "::1"
         self.server_ipv6_args = ["-6", self.server_port]
-        self.timeout = 3
+        self.timeout = 10
         self.echo_phrase = "Hello, world! Jenny is a friend of mine."
 
         super(VCLTestCase, self).__init__(methodName)
@@ -68,12 +68,12 @@ class VCLTestCase(VppTestCase):
         worker_client.join(self.timeout)
         try:
             self.validateResults(worker_client, worker_server, self.timeout)
-        except Exception, error:
+        except Exception as error:
             self.fail("Failed with %s" % error)
 
     def thru_host_stack_setup(self):
         self.vapi.session_enable_disable(is_enabled=1)
-        self.create_loopback_interfaces(range(2))
+        self.create_loopback_interfaces(2)
 
         table_id = 1
 
@@ -117,7 +117,7 @@ class VCLTestCase(VppTestCase):
 
     def thru_host_stack_ipv6_setup(self):
         self.vapi.session_enable_disable(is_enabled=1)
-        self.create_loopback_interfaces(range(2))
+        self.create_loopback_interfaces(2)
 
         table_id = 1
 
@@ -182,7 +182,7 @@ class VCLTestCase(VppTestCase):
 
         try:
             self.validateResults(worker_client, worker_server, self.timeout)
-        except Exception, error:
+        except Exception as error:
             self.fail("Failed with %s" % error)
 
     def validateResults(self, worker_client, worker_server, timeout):
@@ -222,7 +222,7 @@ class VCLCutThruTestCase(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", "-c", self.server_addr]
+        self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.server_addr]
         self.server_iperf3_args = ["-V4d", "-s"]
         self.client_uni_dir_nsock_timeout = 60
         self.client_uni_dir_nsock_test_args = ["-I", "5", "-U", "-X",
@@ -483,7 +483,7 @@ class VCLThruHostStackIperfTestCase(VCLTestCase):
 
         self.thru_host_stack_setup()
         self.client_iperf3_timeout = 20
-        self.client_iperf3_args = ["-V4d", "-c", self.loop0.local_ip4]
+        self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.loop0.local_ip4]
         self.server_iperf3_args = ["-V4d", "-s"]
 
     def tearDown(self):
@@ -520,7 +520,8 @@ class VCLIpv6CutThruTestCase(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", "-c", self.server_ipv6_addr]
+        self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c",
+                                        self.server_ipv6_addr]
         self.server_ipv6_iperf3_args = ["-V6d", "-s"]
         self.client_ipv6_uni_dir_nsock_test_args = ["-6", "-I", "5",
                                                     "-U", "-X",
@@ -623,18 +624,21 @@ class VCLIpv6ThruHostStackTestCase(VCLTestCase):
     def test_ldp_ipv6_thru_host_stack_echo(self):
         """ run LDP IPv6 thru host stack echo test """
 
-        self.thru_host_stack_test("sock_test_server", self.server_ipv6_args,
+        self.thru_host_stack_test("sock_test_server",
+                                  self.server_ipv6_args,
                                   "sock_test_client",
                                   self.client_ipv6_echo_test_args)
         # TBD: Remove these when VPP thru host teardown config bug is fixed.
-        self.thru_host_stack_test("vcl_test_server", self.server_ipv6_args,
+        self.thru_host_stack_test("vcl_test_server",
+                                  self.server_ipv6_args,
                                   "vcl_test_client",
                                   self.client_ipv6_echo_test_args)
 
     def test_vcl_ipv6_thru_host_stack_echo(self):
         """ run VCL IPv6 thru host stack echo test """
 
-#        self.thru_host_stack_test("vcl_test_server", self.server_ipv6_args,
+#        self.thru_host_stack_test("vcl_test_server",
+#                                  self.server_ipv6_args,
 #                                  "vcl_test_client",
 #                                  self.client_ipv6_echo_test_args)
 
@@ -706,7 +710,8 @@ class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase):
         """ run LDP thru host stack bi-directional (multiple sockets) test """
 
         self.timeout = self.client_bi_dir_nsock_timeout
-        self.thru_host_stack_test("sock_test_server", self.server_ipv6_args,
+        self.thru_host_stack_test("sock_test_server",
+                                  self.server_ipv6_args,
                                   "sock_test_client",
                                   self.client_ipv6_bi_dir_nsock_test_args)
 
@@ -741,7 +746,8 @@ class VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase):
         """ run LDP thru host stack uni-directional (multiple sockets) test """
 
         self.timeout = self.client_uni_dir_nsock_timeout
-        self.thru_host_stack_test("sock_test_server", self.server_ipv6_args,
+        self.thru_host_stack_test("sock_test_server",
+                                  self.server_ipv6_args,
                                   "sock_test_client",
                                   self.client_ipv6_uni_dir_nsock_test_args)
 
@@ -789,7 +795,8 @@ class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase):
 
         self.thru_host_stack_ipv6_setup()
         self.client_iperf3_timeout = 20
-        self.client_ipv6_iperf3_args = ["-V6d", "-c", self.loop0.local_ip6]
+        self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c",
+                                        self.loop0.local_ip6]
         self.server_ipv6_iperf3_args = ["-V6d", "-s"]
 
     def tearDown(self):