X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=18279e9f226e3a5dca6215b23bfed87554ce3b3b;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=2a36304876d3184b3efa0547b482d78160949a93;hpb=b8c72a4a8d8bd330ab62dc0c9461cac2b137575b;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index 2a36304876d..18279e9f226 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -7,7 +7,7 @@ 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 class VCLAppWorker(Worker): @@ -32,7 +32,15 @@ class VCLAppWorker(Worker): class VCLTestCase(VppTestCase): """ VCL Test Class """ - def __init__(self, methodName): + @classmethod + def setUpClass(cls): + super(VCLTestCase, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLTestCase, cls).tearDownClass() + + def setUp(self): var = "VPP_BUILD_DIR" self.build_dir = os.getenv(var, None) if self.build_dir is None: @@ -43,10 +51,15 @@ class VCLTestCase(VppTestCase): self.server_args = [self.server_port] self.server_ipv6_addr = "::1" self.server_ipv6_args = ["-6", self.server_port] - self.timeout = 10 + self.timeout = 20 self.echo_phrase = "Hello, world! Jenny is a friend of mine." + self.pre_test_sleep = 0.3 + self.post_test_sleep = 0.2 + + 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) @@ -61,7 +74,7 @@ class VCLTestCase(VppTestCase): worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() - self.sleep(0.2) + self.sleep(self.pre_test_sleep) worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) worker_client.start() @@ -70,6 +83,7 @@ class VCLTestCase(VppTestCase): self.validateResults(worker_client, worker_server, self.timeout) except Exception as error: self.fail("Failed with %s" % error) + self.sleep(self.post_test_sleep) def thru_host_stack_setup(self): self.vapi.session_enable_disable(is_enabled=1) @@ -89,10 +103,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=b"1", secret=1234, + sw_if_index=self.loop0.sw_if_index) + self.vapi.app_namespace_add_del(namespace_id=b"2", secret=5678, + sw_if_index=self.loop1.sw_if_index) # Add inter-table routes ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32, @@ -113,8 +127,6 @@ 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.create_loopback_interfaces(2) @@ -132,22 +144,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=b"1", secret=1234, + sw_if_index=self.loop0.sw_if_index) + self.vapi.app_namespace_add_del(namespace_id=b"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")) @@ -171,7 +181,7 @@ class VCLTestCase(VppTestCase): worker_server = VCLAppWorker(self.build_dir, server_app, server_args, self.logger, self.env) worker_server.start() - self.sleep(0.2) + self.sleep(self.pre_test_sleep) self.env.update({'VCL_APP_NAMESPACE_ID': "2", 'VCL_APP_NAMESPACE_SECRET': "5678"}) @@ -184,6 +194,7 @@ class VCLTestCase(VppTestCase): self.validateResults(worker_client, worker_server, self.timeout) except Exception as error: self.fail("Failed with %s" % error) + self.sleep(self.post_test_sleep) def validateResults(self, worker_client, worker_server, timeout): if os.path.isdir('/proc/{}'.format(worker_server.process.pid)): @@ -200,9 +211,9 @@ class VCLTestCase(VppTestCase): "Timeout: %ss! Killing client worker process (pid %d)" % (timeout, worker_client.process.pid)) os.killpg(os.getpgid(worker_client.process.pid), - signal.SIGTERM) + signal.SIGKILL) worker_client.join() - except: + except OSError: self.logger.debug( "Couldn't kill client worker process") raise @@ -212,34 +223,45 @@ class VCLTestCase(VppTestCase): self.assert_equal(worker_client.result, 0, "Binary test return code") -class VCLCutThruTestCase(VCLTestCase): - """ VCL Cut Thru Tests """ +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(VCLCutThruTestCase, self).setUp() + super(LDPCutThruTestCase, self).setUp() self.cut_thru_setup() 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 5", "-c", self.server_addr] + self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.server_addr] self.server_iperf3_args = ["-V4d", "-s"] - self.client_uni_dir_nsock_timeout = 60 + self.client_uni_dir_nsock_timeout = 20 self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", "-I", "2", self.server_addr, self.server_port] - self.client_bi_dir_nsock_timeout = 120 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", "-I", "2", self.server_addr, self.server_port] def tearDown(self): + super(LDPCutThruTestCase, self).tearDown() 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")) + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_echo(self): """ run LDP cut thru echo test """ @@ -252,14 +274,26 @@ class VCLCutThruTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) except subprocess.CalledProcessError: - self.logger.error("WARNING: 'iperf3' is not installed,") + self.logger.error( + "WARNING: Subprocess returned non-0 running 'iperf3 -v") self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") return + except OSError as e: + self.logger.error( + "WARNING: Subprocess returned with OS error (%s) %s\n" + " 'iperf3' is likely not installed,", + e.errno, e.strerror) + self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") + return + except Exception: + self.logger.exception( + "Subprocess returned non-0 running 'iperf3 -v") 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 """ @@ -268,6 +302,7 @@ class VCLCutThruTestCase(VCLTestCase): "sock_test_client", self.client_uni_dir_nsock_test_args) + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_bi_dir_nsock(self): """ run LDP cut thru bi-directional (multiple sockets) test """ @@ -276,6 +311,42 @@ class VCLCutThruTestCase(VCLTestCase): "sock_test_client", self.client_bi_dir_nsock_test_args) + +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() + + self.cut_thru_setup() + self.client_echo_test_args = ["-E", self.echo_phrase, "-X", + self.server_addr, self.server_port] + + self.client_uni_dir_nsock_timeout = 20 + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", "2", + self.server_addr, + self.server_port] + self.client_bi_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-I", "2", + self.server_addr, + self.server_port] + + def tearDown(self): + super(VCLCutThruTestCase, self).tearDown() + + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) + def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ @@ -299,70 +370,107 @@ class VCLCutThruTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackTestCase(VCLTestCase): - """ VCL Thru Host Stack Tests """ +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(VCLThruHostStackTestCase, 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(VCLThruHostStackEcho, self).tearDown() - super(VCLThruHostStackTestCase, 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")) - def test_ldp_thru_host_stack_echo(self): - """ run LDP thru host stack echo test """ - 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", self.server_args, +class VCLThruHostStackTLS(VCLTestCase): + """ VCL Thru Host Stack TLS """ + + @classmethod + def setUpClass(cls): + super(VCLThruHostStackTLS, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackTLS, cls).tearDownClass() + + def setUp(self): + super(VCLThruHostStackTLS, self).setUp() + + self.thru_host_stack_setup() + 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_echo_test_args) + self.client_uni_dir_tls_test_args) + + def tearDown(self): + self.thru_host_stack_tear_down() + super(VCLThruHostStackTLS, self).tearDown() - def test_vcl_thru_host_stack_echo(self): - """ run VCL 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 2")) - # TBD: Enable this when VPP thru host teardown config bug is fixed. - # self.thru_host_stack_test("vcl_test_server", self.server_args, - # "vcl_test_client", - # self.client_echo_test_args) - # TBD: Remove VCLThruHostStackGroup*TestCase classes and move - # tests here when VPP thru host teardown/setup config bug - # is fixed. +class VCLThruHostStackBidirNsock(VCLTestCase): + """ VCL Thru Host Stack Bidir Nsock """ + @classmethod + def setUpClass(cls): + super(VCLThruHostStackBidirNsock, cls).setUpClass() -class VCLThruHostStackNSessionBidirTestCase(VCLTestCase): - """ VCL Thru Host Stack NSession Bidir Tests """ + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackBidirNsock, cls).tearDownClass() def setUp(self): - super(VCLThruHostStackNSessionBidirTestCase, self).setUp() + super(VCLThruHostStackBidirNsock, self).setUp() self.thru_host_stack_setup() - if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", - "-I", "2", - self.loop0.local_ip4, - self.server_port] - else: - self.client_bi_dir_nsock_timeout = 90 - self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", - "-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", + "-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(VCLThruHostStackBidirNsock, self).tearDown() - super(VCLThruHostStackNSessionBidirTestCase, self).tearDown() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -373,22 +481,30 @@ class VCLThruHostStackNSessionBidirTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackGroupBTestCase(VCLTestCase): - """ VCL Thru Host Stack Group B Tests """ +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(VCLThruHostStackGroupBTestCase, self).setUp() + super(LDPThruHostStackBidirNsock, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 + 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 = 60 + self.client_bi_dir_nsock_timeout = 20 self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", # OUCH! Host Stack Bug? # "-I", "2", @@ -397,8 +513,10 @@ class VCLThruHostStackGroupBTestCase(VCLTestCase): def tearDown(self): self.thru_host_stack_tear_down() + super(LDPThruHostStackBidirNsock, self).tearDown() - super(VCLThruHostStackGroupBTestCase, self).tearDown() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -409,18 +527,26 @@ class VCLThruHostStackGroupBTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackGroupCTestCase(VCLTestCase): - """ VCL Thru Host Stack Group C Tests """ +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(VCLThruHostStackGroupCTestCase, self).setUp() + super(LDPThruHostStackNsock, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -430,8 +556,7 @@ class VCLThruHostStackGroupCTestCase(VCLTestCase): def tearDown(self): self.thru_host_stack_tear_down() - - super(VCLThruHostStackGroupCTestCase, self).tearDown() + super(LDPThruHostStackNsock, self).tearDown() def test_ldp_thru_host_stack_uni_dir_nsock(self): """ run LDP thru host stack uni-directional (multiple sockets) test """ @@ -442,18 +567,26 @@ class VCLThruHostStackGroupCTestCase(VCLTestCase): self.client_uni_dir_nsock_test_args) -class VCLThruHostStackGroupDTestCase(VCLTestCase): - """ VCL Thru Host Stack Group D Tests """ +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(VCLThruHostStackGroupDTestCase, self).setUp() + super(VCLThruHostStackNsock, self).setUp() self.thru_host_stack_setup() if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "2" else: - self.client_uni_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 self.numSockets = "5" self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -463,8 +596,7 @@ class VCLThruHostStackGroupDTestCase(VCLTestCase): def tearDown(self): self.thru_host_stack_tear_down() - - super(VCLThruHostStackGroupDTestCase, self).tearDown() + super(VCLThruHostStackNsock, self).tearDown() def test_vcl_thru_host_stack_uni_dir_nsock(self): """ run VCL thru host stack uni-directional (multiple sockets) test """ @@ -475,21 +607,31 @@ class VCLThruHostStackGroupDTestCase(VCLTestCase): self.client_uni_dir_nsock_test_args) -class VCLThruHostStackIperfTestCase(VCLTestCase): - """ VCL Thru Host Stack Iperf Tests """ +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(VCLThruHostStackIperfTestCase, self).setUp() + super(LDPThruHostStackIperf, self).setUp() self.thru_host_stack_setup() self.client_iperf3_timeout = 20 - self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.loop0.local_ip4] + self.client_iperf3_args = ["-V4d", "-t 2", "-c", self.loop0.local_ip4] self.server_iperf3_args = ["-V4d", "-s"] def tearDown(self): self.thru_host_stack_tear_down() + super(LDPThruHostStackIperf, self).tearDown() - super(VCLThruHostStackIperfTestCase, self).tearDown() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show session verbose 2")) def test_ldp_thru_host_stack_iperf3(self): """ run LDP thru host stack iperf3 test """ @@ -501,26 +643,42 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): self.logger.error( " 'test_ldp_thru_host_stack_iperf3' not run!") return + except OSError as e: + self.logger.error("WARNING: 'iperf3' is not installed,") + self.logger.error(" 'test' not run!") + return + except Exception as e: + self.logger.error("WARNING: 'iperf3' unexpected error,") + self.logger.error(" 'test' 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 VCLIpv6CutThruTestCase(VCLTestCase): - """ VCL IPv6 Cut Thru Tests """ +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 setUp(self): - super(VCLIpv6CutThruTestCase, self).setUp() + super(LDPIpv6CutThruTestCase, self).setUp() self.cut_thru_setup() self.client_iperf3_timeout = 20 - self.client_uni_dir_nsock_timeout = 60 - self.client_bi_dir_nsock_timeout = 120 + self.client_uni_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_timeout = 20 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 5", "-c", + self.client_ipv6_iperf3_args = ["-V6d", "-t 2", "-c", self.server_ipv6_addr] self.server_ipv6_iperf3_args = ["-V6d", "-s"] self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", @@ -535,10 +693,9 @@ class VCLIpv6CutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): + super(LDPIpv6CutThruTestCase, self).tearDown() self.cut_thru_tear_down() - super(VCLIpv6CutThruTestCase, self).tearDown() - def test_ldp_ipv6_cut_thru_echo(self): """ run LDP IPv6 cut thru echo test """ @@ -547,6 +704,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_echo_test_args) + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_ipv6_cut_thru_iperf3(self): """ run LDP IPv6 cut thru iperf3 test """ @@ -562,6 +720,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): 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") def test_ldp_ipv6_cut_thru_uni_dir_nsock(self): """ run LDP IPv6 cut thru uni-directional (multiple sockets) test """ @@ -570,6 +729,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_uni_dir_nsock_test_args) + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_ipv6_cut_thru_bi_dir_nsock(self): """ run LDP IPv6 cut thru bi-directional (multiple sockets) test """ @@ -578,6 +738,42 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_bi_dir_nsock_test_args) + +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 setUp(self): + super(VCLIpv6CutThruTestCase, self).setUp() + + self.cut_thru_setup() + self.client_uni_dir_nsock_timeout = 20 + self.client_bi_dir_nsock_timeout = 20 + self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", + self.server_ipv6_addr, + self.server_port] + self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-6", + "-I", "2", + self.server_ipv6_addr, + self.server_port] + self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X", + "-6", + "-I", "2", + self.server_ipv6_addr, + self.server_port] + + def tearDown(self): + super(VCLIpv6CutThruTestCase, self).tearDown() + self.cut_thru_tear_down() + def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """ @@ -586,6 +782,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "vcl_test_client", self.client_ipv6_echo_test_args) + @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 """ @@ -594,6 +791,7 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "vcl_test_client", self.client_ipv6_uni_dir_nsock_test_args) + @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 """ @@ -603,11 +801,19 @@ class VCLIpv6CutThruTestCase(VCLTestCase): self.client_ipv6_bi_dir_nsock_test_args) -class VCLIpv6ThruHostStackTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Tests """ +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(VCLIpv6ThruHostStackTestCase, self).setUp() + super(VCLIpv6ThruHostStackEcho, self).setUp() self.thru_host_stack_ipv6_setup() self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", @@ -616,210 +822,15 @@ class VCLIpv6ThruHostStackTestCase(VCLTestCase): def tearDown(self): self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackTestCase, self).tearDown() - - 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, - "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, - "vcl_test_client", - self.client_ipv6_echo_test_args) + super(VCLIpv6ThruHostStackEcho, self).tearDown() 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, -# "vcl_test_client", -# self.client_ipv6_echo_test_args) - - # TBD: Remove VCLIpv6ThruHostStackGroup*TestCase classes and move - # tests here when VPP thru host teardown/setup config bug - # is fixed. - - -class VCLIpv6ThruHostStackGroupATestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Group A Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackGroupATestCase, self).setUp() - - self.thru_host_stack_ipv6_setup() - if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", - "-B", "-X", "-6", - "-I", "2", - self.loop0.local_ip6, - self.server_port] - else: - self.client_bi_dir_nsock_timeout = 90 - self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", - "-B", "-X", "-6", - "-I", "2", - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackGroupATestCase, self).tearDown() - - def test_vcl_thru_host_stack_bi_dir_nsock(self): - """ 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", self.server_ipv6_args, - "vcl_test_client", - self.client_ipv6_bi_dir_nsock_test_args) - - -class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Group B Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackGroupBTestCase, self).setUp() - - self.thru_host_stack_ipv6_setup() - if self.vppDebug: - self.client_bi_dir_nsock_timeout = 120 - self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", - "-B", "-X", "-6", - # OUCH! Host Stack Bug? - # "-I", "2", - self.loop0.local_ip6, - self.server_port] - else: - self.client_bi_dir_nsock_timeout = 60 - self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", - "-B", "-X", "-6", - # OUCH! Host Stack Bug? - # "-I", "2", - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackGroupBTestCase, self).tearDown() - - def test_ldp_thru_host_stack_bi_dir_nsock(self): - """ 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, - "sock_test_client", - self.client_ipv6_bi_dir_nsock_test_args) - - -class VCLIpv6ThruHostStackGroupCTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Group C Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackGroupCTestCase, self).setUp() - - self.thru_host_stack_ipv6_setup() - if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 - self.numSockets = "2" - else: - self.client_uni_dir_nsock_timeout = 120 - self.numSockets = "5" - - self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", - "-6", - "-I", self.numSockets, - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackGroupCTestCase, self).tearDown() - - def test_ldp_thru_host_stack_uni_dir_nsock(self): - """ 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.thru_host_stack_test("vcl_test_server", self.server_ipv6_args, - "sock_test_client", - self.client_ipv6_uni_dir_nsock_test_args) - - -class VCLIpv6ThruHostStackGroupDTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Group D Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackGroupDTestCase, self).setUp() - - self.thru_host_stack_ipv6_setup() - if self.vppDebug: - self.client_uni_dir_nsock_timeout = 120 - self.numSockets = "2" - else: - self.client_uni_dir_nsock_timeout = 120 - self.numSockets = "5" - - self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", - "-6", - "-I", self.numSockets, - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackGroupDTestCase, self).tearDown() - - def test_vcl_thru_host_stack_uni_dir_nsock(self): - """ 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", self.server_ipv6_args, "vcl_test_client", - self.client_ipv6_uni_dir_nsock_test_args) - - -class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Iperf Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackIperfTestCase, self).setUp() - - self.thru_host_stack_ipv6_setup() - self.client_iperf3_timeout = 20 - self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c", - self.loop0.local_ip6] - self.server_ipv6_iperf3_args = ["-V6d", "-s"] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackIperfTestCase, self).tearDown() - - 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_ipv6_iperf3_args, - "iperf3", self.client_ipv6_iperf3_args) + self.client_ipv6_echo_test_args) if __name__ == '__main__':