X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=7977c1d4e778badee44c1a676f6409c583d6872a;hb=785458895dac4fd1f337e0b949bf011c363da99a;hp=5bdc8e9b3429e538c42552e884bed2012bb5ed5b;hpb=dc2e251398b196a6fa3b2287f0755330757df02a;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index 5bdc8e9b342..7977c1d4e77 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Vpp VCL tests """ import unittest @@ -7,13 +7,30 @@ import subprocess import signal from framework import VppTestCase, VppTestRunner, running_extended_tests, \ Worker -from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, DpoProto +from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, FibPathProto + +iperf3 = '/usr/bin/iperf3' + + +def have_app(app): + try: + subprocess.check_output([app, '-v']) + except (subprocess.CalledProcessError, OSError): + return False + return True + + +_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 @@ -25,18 +42,28 @@ 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): + super(VCLTestCase, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLTestCase, cls).tearDownClass() - def __init__(self, methodName): + def setUp(self): var = "VPP_BUILD_DIR" self.build_dir = os.getenv(var, None) if self.build_dir is None: - raise Exception("Environment variable `%s' not set" % var) + raise EnvironmentError("Environment variable `%s' not set" % var) self.vppDebug = 'vpp_debug' in self.build_dir self.server_addr = "127.0.0.1" self.server_port = "22000" @@ -51,18 +78,17 @@ class VCLTestCase(VppTestCase): if os.path.isfile("/tmp/ldp_server_af_unix_socket"): os.remove("/tmp/ldp_server_af_unix_socket") - super(VCLTestCase, self).__init__(methodName) + 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) worker_server.start() @@ -78,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 @@ -95,10 +121,10 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="1", secret=1234, - sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add(namespace_id="2", secret=5678, - sw_if_index=self.loop1.sw_if_index) + 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="2", secret=5678, + sw_if_index=self.loop1.sw_if_index) # Add inter-table routes ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32, @@ -119,10 +145,8 @@ class VCLTestCase(VppTestCase): i.set_table_ip4(0) i.admin_down() - self.vapi.session_enable_disable(is_enabled=0) - 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 @@ -138,22 +162,20 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="1", secret=1234, - sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add(namespace_id="2", secret=5678, - sw_if_index=self.loop1.sw_if_index) + 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="2", secret=5678, + sw_if_index=self.loop1.sw_if_index) # Add inter-table routes ip_t01 = VppIpRoute(self, self.loop1.local_ip6, 128, [VppRoutePath("::0", 0xffffffff, - nh_table_id=2, - proto=DpoProto.DPO_PROTO_IP6)], - table_id=1, is_ip6=1) + nh_table_id=2)], + table_id=1) ip_t10 = VppIpRoute(self, self.loop0.local_ip6, 128, [VppRoutePath("::0", 0xffffffff, - nh_table_id=1, - proto=DpoProto.DPO_PROTO_IP6)], - table_id=2, is_ip6=1) + nh_table_id=1)], + table_id=2) ip_t01.add_vpp_config() ip_t10.add_vpp_config() self.logger.debug(self.vapi.cli("show interface addr")) @@ -165,11 +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"} @@ -193,10 +216,12 @@ class VCLTestCase(VppTestCase): self.sleep(self.post_test_sleep) def validateResults(self, worker_client, worker_server, timeout): + if worker_server.process is None: + raise RuntimeError('worker_server is not running.') if os.path.isdir('/proc/{}'.format(worker_server.process.pid)): self.logger.info("Killing server worker process (pid %d)" % worker_server.process.pid) - os.killpg(os.getpgid(worker_server.process.pid), signal.SIGKILL) + os.killpg(os.getpgid(worker_server.process.pid), signal.SIGTERM) worker_server.join() self.logger.info("Client worker result is `%s'" % worker_client.result) error = False @@ -209,12 +234,12 @@ class VCLTestCase(VppTestCase): os.killpg(os.getpgid(worker_client.process.pid), signal.SIGKILL) worker_client.join() - except: + except OSError: self.logger.debug( "Couldn't kill client worker process") raise if error: - raise Exception( + raise RuntimeError( "Timeout! Client worker did not finish in %ss" % timeout) self.assert_equal(worker_client.result, 0, "Binary test return code") @@ -222,6 +247,14 @@ class VCLTestCase(VppTestCase): class LDPCutThruTestCase(VCLTestCase): """ LDP Cut Thru Tests """ + @classmethod + def setUpClass(cls): + super(LDPCutThruTestCase, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(LDPCutThruTestCase, cls).tearDownClass() + def setUp(self): super(LDPCutThruTestCase, self).setUp() @@ -229,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", @@ -243,32 +276,29 @@ class LDPCutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): + super(LDPCutThruTestCase, self).tearDown() self.cut_thru_tear_down() - super(LDPCutThruTestCase, 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(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_echo(self): """ run LDP cut thru echo test """ self.cut_thru_test("sock_test_server", self.server_args, "sock_test_client", self.client_echo_test_args) + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") def test_ldp_cut_thru_iperf3(self): """ run LDP cut thru iperf3 test """ - try: - subprocess.check_output(['iperf3', '-v']) - except subprocess.CalledProcessError: - 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) + self.cut_thru_test(iperf3, self.server_iperf3_args, + iperf3, self.client_iperf3_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @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 """ @@ -277,7 +307,8 @@ class LDPCutThruTestCase(VCLTestCase): "sock_test_client", self.client_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("sock test apps need to be improved") def test_ldp_cut_thru_bi_dir_nsock(self): """ run LDP cut thru bi-directional (multiple sockets) test """ @@ -290,6 +321,14 @@ class LDPCutThruTestCase(VCLTestCase): class VCLCutThruTestCase(VCLTestCase): """ VCL Cut Thru Tests """ + @classmethod + def setUpClass(cls): + super(VCLCutThruTestCase, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLCutThruTestCase, cls).tearDownClass() + def setUp(self): super(VCLCutThruTestCase, self).setUp() @@ -309,10 +348,12 @@ class VCLCutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): - self.cut_thru_tear_down() - super(VCLCutThruTestCase, 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")) + def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ @@ -336,55 +377,130 @@ class VCLCutThruTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class LDPThruHostStackEcho(VCLTestCase): - """ LDP Thru Host Stack Echo """ +class VCLThruHostStackEcho(VCLTestCase): + """ VCL Thru Host Stack Echo """ + + @classmethod + def setUpClass(cls): + super(VCLThruHostStackEcho, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackEcho, cls).tearDownClass() def setUp(self): - super(LDPThruHostStackEcho, self).setUp() + super(VCLThruHostStackEcho, self).setUp() self.thru_host_stack_setup() + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", + self.loop0.local_ip4, + self.server_port] self.client_echo_test_args = ["-E", self.echo_phrase, "-X", self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() - super(LDPThruHostStackEcho, self).tearDown() + super(VCLThruHostStackEcho, self).tearDown() - def test_ldp_thru_host_stack_echo(self): - """ run LDP thru host stack echo test """ + 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")) - self.thru_host_stack_test("sock_test_server", self.server_args, - "sock_test_client", - self.client_echo_test_args) +class VCLThruHostStackTLS(VCLTestCase): + """ VCL Thru Host Stack TLS """ -class VCLThruHostStackEcho(VCLTestCase): - """ VCL Thru Host Stack Echo """ + @classmethod + def setUpClass(cls): + super(VCLThruHostStackTLS, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackTLS, cls).tearDownClass() def setUp(self): - super(VCLThruHostStackEcho, self).setUp() + super(VCLThruHostStackTLS, self).setUp() self.thru_host_stack_setup() - self.client_bi_dir_nsock_timeout = 20 - self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", - "-I", "2", + self.client_uni_dir_tls_timeout = 20 + self.server_tls_args = ["-L", self.server_port] + self.client_uni_dir_tls_test_args = ["-N", "1000", "-U", "-X", "-L", + self.loop0.local_ip4, + self.server_port] + + def test_vcl_thru_host_stack_tls_uni_dir(self): + """ run VCL thru host stack uni-directional TLS test """ + + self.timeout = self.client_uni_dir_tls_timeout + self.thru_host_stack_test("vcl_test_server", self.server_tls_args, + "vcl_test_client", + self.client_uni_dir_tls_test_args) + + def tearDown(self): + self.thru_host_stack_tear_down() + super(VCLThruHostStackTLS, 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 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] - self.client_echo_test_args = ["-E", self.echo_phrase, "-X", - 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.logger.debug(self.vapi.cli("show app server")) - self.logger.debug(self.vapi.cli("show session verbose")) self.thru_host_stack_tear_down() - super(VCLThruHostStackEcho, self).tearDown() + 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): """ VCL Thru Host Stack Bidir Nsock """ + @classmethod + def setUpClass(cls): + super(VCLThruHostStackBidirNsock, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackBidirNsock, cls).tearDownClass() + def setUp(self): super(VCLThruHostStackBidirNsock, self).setUp() @@ -402,6 +518,10 @@ class VCLThruHostStackBidirNsock(VCLTestCase): self.thru_host_stack_tear_down() super(VCLThruHostStackBidirNsock, 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")) + def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -414,29 +534,36 @@ class VCLThruHostStackBidirNsock(VCLTestCase): class LDPThruHostStackBidirNsock(VCLTestCase): """ LDP Thru Host Stack Bidir Nsock """ + @classmethod + def setUpClass(cls): + super(LDPThruHostStackBidirNsock, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(LDPThruHostStackBidirNsock, cls).tearDownClass() + def setUp(self): 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() super(LDPThruHostStackBidirNsock, 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")) + def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -449,6 +576,14 @@ class LDPThruHostStackBidirNsock(VCLTestCase): class LDPThruHostStackNsock(VCLTestCase): """ LDP Thru Host Stack Nsock """ + @classmethod + def setUpClass(cls): + super(LDPThruHostStackNsock, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(LDPThruHostStackNsock, cls).tearDownClass() + def setUp(self): super(LDPThruHostStackNsock, self).setUp() @@ -481,6 +616,14 @@ class LDPThruHostStackNsock(VCLTestCase): class VCLThruHostStackNsock(VCLTestCase): """ VCL Thru Host Stack Nsock """ + @classmethod + def setUpClass(cls): + super(VCLThruHostStackNsock, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackNsock, cls).tearDownClass() + def setUp(self): super(VCLThruHostStackNsock, self).setUp() @@ -513,37 +656,91 @@ class VCLThruHostStackNsock(VCLTestCase): class LDPThruHostStackIperf(VCLTestCase): """ LDP Thru Host Stack Iperf """ + @classmethod + def setUpClass(cls): + super(LDPThruHostStackIperf, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(LDPThruHostStackIperf, cls).tearDownClass() + def setUp(self): super(LDPThruHostStackIperf, self).setUp() 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() super(LDPThruHostStackIperf, 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(self): """ run LDP thru host stack iperf3 test """ - try: - subprocess.check_output(['iperf3', '-v']) - except subprocess.CalledProcessError: - 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) + + +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) + self.thru_host_stack_test(iperf3, self.server_iperf3_args, + iperf3, self.client_iperf3_args) class LDPIpv6CutThruTestCase(VCLTestCase): """ LDP IPv6 Cut Thru Tests """ + @classmethod + def setUpClass(cls): + super(LDPIpv6CutThruTestCase, cls).setUpClass() + + @classmethod + 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() @@ -554,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", @@ -569,9 +766,8 @@ class LDPIpv6CutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): - self.cut_thru_tear_down() - super(LDPIpv6CutThruTestCase, self).tearDown() + self.cut_thru_tear_down() def test_ldp_ipv6_cut_thru_echo(self): """ run LDP IPv6 cut thru echo test """ @@ -581,23 +777,16 @@ class LDPIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_echo_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.") + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_ipv6_cut_thru_iperf3(self): """ run LDP IPv6 cut thru iperf3 test """ - try: - subprocess.check_output(['iperf3', '-v']) - except: - self.logger.error("WARNING: 'iperf3' is not installed,") - self.logger.error( - " 'test_ldp_ipv6_cut_thru_iperf3' not run!") - return - self.timeout = self.client_iperf3_timeout - self.cut_thru_test("iperf3", self.server_ipv6_iperf3_args, - "iperf3", self.client_ipv6_iperf3_args) + self.cut_thru_test(iperf3, self.server_ipv6_iperf3_args, + iperf3, self.client_ipv6_iperf3_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_ipv6_cut_thru_uni_dir_nsock(self): """ run LDP IPv6 cut thru uni-directional (multiple sockets) test """ @@ -606,7 +795,8 @@ class LDPIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("sock test apps need to be improved") def test_ldp_ipv6_cut_thru_bi_dir_nsock(self): """ run LDP IPv6 cut thru bi-directional (multiple sockets) test """ @@ -619,6 +809,18 @@ class LDPIpv6CutThruTestCase(VCLTestCase): class VCLIpv6CutThruTestCase(VCLTestCase): """ VCL IPv6 Cut Thru Tests """ + @classmethod + def setUpClass(cls): + super(VCLIpv6CutThruTestCase, cls).setUpClass() + + @classmethod + 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() @@ -640,9 +842,12 @@ class VCLIpv6CutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): + super(VCLIpv6CutThruTestCase, self).tearDown() self.cut_thru_tear_down() - super(VCLIpv6CutThruTestCase, 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")) def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """ @@ -652,7 +857,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "vcl_test_client", self.client_ipv6_echo_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_vcl_ipv6_cut_thru_uni_dir_nsock(self): """ run VCL IPv6 cut thru uni-directional (multiple sockets) test """ @@ -661,7 +866,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "vcl_test_client", self.client_ipv6_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_vcl_ipv6_cut_thru_bi_dir_nsock(self): """ run VCL IPv6 cut thru bi-directional (multiple sockets) test """ @@ -674,6 +879,14 @@ class VCLIpv6CutThruTestCase(VCLTestCase): class VCLIpv6ThruHostStackEcho(VCLTestCase): """ VCL IPv6 Thru Host Stack Echo """ + @classmethod + def setUpClass(cls): + super(VCLIpv6ThruHostStackEcho, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLIpv6ThruHostStackEcho, cls).tearDownClass() + def setUp(self): super(VCLIpv6ThruHostStackEcho, self).setUp()