diff options
| -rw-r--r-- | test/test_vcl.py | 138 |
1 files changed, 102 insertions, 36 deletions
diff --git a/test/test_vcl.py b/test/test_vcl.py index 2cfb0ff05ca..73537f6dfc3 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -3,27 +3,33 @@ import unittest import os +import subprocess import signal from framework import VppTestCase, VppTestRunner, running_extended_tests, \ Worker from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath -class VclAppWorker(Worker): +class VCLAppWorker(Worker): """ VCL Test Application Worker """ def __init__(self, build_dir, appname, args, logger, env={}): vcl_lib_dir = "%s/vpp/.libs" % build_dir - app = "%s/%s" % (vcl_lib_dir, appname) - if not os.path.isfile(app): - app = "%s/vpp/%s" % (build_dir, appname) + if "iperf" in appname: + app = appname env.update({'LD_PRELOAD': "%s/libvcl_ldpreload.so.0.0.0" % 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}) self.args = [app] + args - super(VclAppWorker, self).__init__(self.args, logger, env) + super(VCLAppWorker, self).__init__(self.args, logger, env) -class VclTestCase(VppTestCase): +class VCLTestCase(VppTestCase): """ VCL Test Class """ def __init__(self, methodName): @@ -34,10 +40,11 @@ class VclTestCase(VppTestCase): self.vppDebug = 'vpp_debug' in self.build_dir self.server_addr = "127.0.0.1" self.server_port = "22000" + self.server_args = [self.server_port] self.timeout = 3 self.echo_phrase = "Hello, world! Jenny is a friend of mine." - super(VclTestCase, self).__init__(methodName) + super(VCLTestCase, self).__init__(methodName) def cut_thru_setup(self): self.vapi.session_enable_disable(is_enabled=1) @@ -45,16 +52,15 @@ class VclTestCase(VppTestCase): def cut_thru_tear_down(self): self.vapi.session_enable_disable(is_enabled=0) - def cut_thru_test(self, server_app, client_app, client_args): + def cut_thru_test(self, server_app, server_args, client_app, client_args): self.env = {'VCL_API_PREFIX': self.shm_prefix, 'VCL_APP_SCOPE_LOCAL': "true"} - worker_server = VclAppWorker(self.build_dir, server_app, - [self.server_port], + worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() self.sleep(0.2) - worker_client = VclAppWorker(self.build_dir, client_app, client_args, + worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) worker_client.start() worker_client.join(self.timeout) @@ -106,21 +112,21 @@ class VclTestCase(VppTestCase): self.vapi.session_enable_disable(is_enabled=0) - def thru_host_stack_test(self, server_app, client_app, client_args): + def thru_host_stack_test(self, server_app, server_args, + client_app, client_args): self.env = {'VCL_API_PREFIX': self.shm_prefix, 'VCL_APP_SCOPE_GLOBAL': "true", 'VCL_APP_NAMESPACE_ID': "0", 'VCL_APP_NAMESPACE_SECRET': "1234"} - worker_server = VclAppWorker(self.build_dir, server_app, - [self.server_port], + worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() self.sleep(0.2) self.env.update({'VCL_APP_NAMESPACE_ID': "1", 'VCL_APP_NAMESPACE_SECRET': "5678"}) - worker_client = VclAppWorker(self.build_dir, client_app, client_args, + worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) worker_client.start() worker_client.join(self.timeout) @@ -157,7 +163,7 @@ class VclTestCase(VppTestCase): self.assert_equal(worker_client.result, 0, "Binary test return code") -class VCLCutThruTestCase(VclTestCase): +class VCLCutThruTestCase(VCLTestCase): """ VCL Cut Thru Tests """ def setUp(self): @@ -166,6 +172,9 @@ class VCLCutThruTestCase(VclTestCase): self.cut_thru_setup() self.client_echo_test_args = [self.server_addr, self.server_port, "-E", self.echo_phrase, "-X"] + self.client_iperf3_timeout = 20 + self.client_iperf3_args = ["-V4d", "-c", self.server_addr] + self.server_iperf3_args = ["-V4d", "-s"] self.client_uni_dir_nsock_timeout = 60 self.client_uni_dir_nsock_test_args = [self.server_addr, self.server_port, @@ -183,15 +192,30 @@ class VCLCutThruTestCase(VclTestCase): def test_ldp_cut_thru_echo(self): """ run LDP cut thru echo test """ - self.cut_thru_test("sock_test_server", "sock_test_client", - self.client_echo_test_args) + self.cut_thru_test("sock_test_server", self.server_args, + "sock_test_client", self.client_echo_test_args) + + def test_ldp_cut_thru_iperf3(self): + """ run LDP cut thru iperf3 test """ + + try: + subprocess.check_output(['iperf3', '-v']) + except: + self.logger.error("WARNING: 'iperf3' is not installed,") + self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") + return + + self.timeout = self.client_iperf3_timeout + self.cut_thru_test("iperf3", self.server_iperf3_args, + "iperf3", self.client_iperf3_args) @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_cut_thru_uni_dir_nsock(self): """ run LDP cut thru uni-directional (multiple sockets) test """ self.timeout = self.client_uni_dir_nsock_timeout - self.cut_thru_test("sock_test_server", "sock_test_client", + self.cut_thru_test("sock_test_server", self.server_args, + "sock_test_client", self.client_uni_dir_nsock_test_args) @unittest.skipUnless(running_extended_tests(), "part of extended tests") @@ -199,21 +223,23 @@ class VCLCutThruTestCase(VclTestCase): """ run LDP cut thru bi-directional (multiple sockets) test """ self.timeout = self.client_bi_dir_nsock_timeout - self.cut_thru_test("sock_test_server", "sock_test_client", + self.cut_thru_test("sock_test_server", self.server_args, + "sock_test_client", self.client_bi_dir_nsock_test_args) def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ - self.cut_thru_test("vcl_test_server", "vcl_test_client", - self.client_echo_test_args) + self.cut_thru_test("vcl_test_server", self.server_args, + "vcl_test_client", self.client_echo_test_args) @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_cut_thru_uni_dir_nsock(self): """ run VCL cut thru uni-directional (multiple sockets) test """ self.timeout = self.client_uni_dir_nsock_timeout - self.cut_thru_test("vcl_test_server", "vcl_test_client", + self.cut_thru_test("vcl_test_server", self.server_args, + "vcl_test_client", self.client_uni_dir_nsock_test_args) @unittest.skipUnless(running_extended_tests(), "part of extended tests") @@ -221,11 +247,12 @@ class VCLCutThruTestCase(VclTestCase): """ run VCL cut thru bi-directional (multiple sockets) test """ self.timeout = self.client_bi_dir_nsock_timeout - self.cut_thru_test("vcl_test_server", "vcl_test_client", + self.cut_thru_test("vcl_test_server", self.server_args, + "vcl_test_client", self.client_bi_dir_nsock_test_args) -class VCLThruHostStackTestCase(VclTestCase): +class VCLThruHostStackTestCase(VCLTestCase): """ VCL Thru Host Stack Tests """ def setUp(self): @@ -244,17 +271,20 @@ class VCLThruHostStackTestCase(VclTestCase): def test_ldp_thru_host_stack_echo(self): """ run LDP thru host stack echo test """ - self.thru_host_stack_test("sock_test_server", "sock_test_client", + self.thru_host_stack_test("sock_test_server", self.server_args, + "sock_test_client", self.client_echo_test_args) # TBD: Remove these when VPP thru host teardown config bug is fixed. - self.thru_host_stack_test("vcl_test_server", "vcl_test_client", + self.thru_host_stack_test("vcl_test_server", self.server_args, + "vcl_test_client", self.client_echo_test_args) def test_vcl_thru_host_stack_echo(self): """ run VCL thru host stack echo test """ # TBD: Enable this when VPP thru host teardown config bug is fixed. - # self.thru_host_stack_test("vcl_test_server", "vcl_test_client", + # self.thru_host_stack_test("vcl_test_server", self.server_args, + # "vcl_test_client", # self.client_echo_test_args) # TBD: Remove VCLThruHostStackExtended*TestCase classes and move @@ -262,7 +292,7 @@ class VCLThruHostStackTestCase(VclTestCase): # is fixed. -class VCLThruHostStackExtendedATestCase(VclTestCase): +class VCLThruHostStackExtendedATestCase(VCLTestCase): """ VCL Thru Host Stack Extended Tests """ def setUp(self): @@ -287,11 +317,12 @@ class VCLThruHostStackExtendedATestCase(VclTestCase): """ run VCL thru host stack bi-directional (multiple sockets) test """ self.timeout = self.client_bi_dir_nsock_timeout - self.thru_host_stack_test("vcl_test_server", "vcl_test_client", + self.thru_host_stack_test("vcl_test_server", self.server_args, + "vcl_test_client", self.client_bi_dir_nsock_test_args) -class VCLThruHostStackExtendedBTestCase(VclTestCase): +class VCLThruHostStackExtendedBTestCase(VCLTestCase): """ VCL Thru Host Stack Extended Tests """ def setUp(self): @@ -316,11 +347,12 @@ class VCLThruHostStackExtendedBTestCase(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", "sock_test_client", + self.thru_host_stack_test("sock_test_server", self.server_args, + "sock_test_client", self.client_bi_dir_nsock_test_args) -class VCLThruHostStackExtendedCTestCase(VclTestCase): +class VCLThruHostStackExtendedCTestCase(VCLTestCase): """ VCL Thru Host Stack Extended Tests """ def setUp(self): @@ -349,11 +381,12 @@ class VCLThruHostStackExtendedCTestCase(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", "sock_test_client", + self.thru_host_stack_test("sock_test_server", self.server_args, + "sock_test_client", self.client_uni_dir_nsock_test_args) -class VCLThruHostStackExtendedDTestCase(VclTestCase): +class VCLThruHostStackExtendedDTestCase(VCLTestCase): """ VCL Thru Host Stack Extended Tests """ def setUp(self): @@ -382,9 +415,42 @@ class VCLThruHostStackExtendedDTestCase(VclTestCase): """ run VCL thru host stack uni-directional (multiple sockets) test """ self.timeout = self.client_uni_dir_nsock_timeout - self.thru_host_stack_test("vcl_test_server", "vcl_test_client", + self.thru_host_stack_test("vcl_test_server", self.server_args, + "vcl_test_client", self.client_uni_dir_nsock_test_args) +class VCLThruHostStackIperfTestCase(VCLTestCase): + """ VCL Thru Host Stack Iperf Tests """ + + def setUp(self): + super(VCLThruHostStackIperfTestCase, self).setUp() + + self.thru_host_stack_setup() + self.client_iperf3_timeout = 20 + self.client_iperf3_args = ["-V4d", "-c", self.loop0.local_ip4] + self.server_iperf3_args = ["-V4d", "-s"] + + def tearDown(self): + self.thru_host_stack_tear_down() + + super(VCLThruHostStackIperfTestCase, self).tearDown() + + def test_ldp_thru_host_stack_iperf3(self): + """ run LDP thru host stack iperf3 test """ + + try: + subprocess.check_output(['iperf3', '-v']) + except: + self.logger.error("WARNING: 'iperf3' is not installed,") + self.logger.error( + " 'test_ldp_thru_host_stack_iperf3' not run!") + return + + self.timeout = self.client_iperf3_timeout + self.thru_host_stack_test("iperf3", self.server_iperf3_args, + "iperf3", self.client_iperf3_args) + + if __name__ == '__main__': unittest.main(testRunner=VppTestRunner) |