X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=34cf0e2a391dea809d828dcd1539abcd4baebd17;hb=defde0f87067eb473660794cbd4a2da69fdd191d;hp=b427c94538324b17a3588042ae62c42746493464;hpb=de91006803f823a149b04738dd2bbfe18bfe9791;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index b427c945383..34cf0e2a391 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -7,24 +7,24 @@ import subprocess import signal from framework import VppTestCase, VppTestRunner, running_extended_tests, \ Worker -from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath +from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, DpoProto 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) @@ -33,7 +33,7 @@ class VCLTestCase(VppTestCase): """ VCL Test Class """ def __init__(self, methodName): - var = "VPP_TEST_BUILD_DIR" + 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) @@ -43,8 +43,13 @@ 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 = 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) @@ -61,21 +66,22 @@ 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() 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) + self.sleep(self.post_test_sleep) 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 = 0 + table_id = 1 for i in self.lo_interfaces: i.admin_up() @@ -89,22 +95,23 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="0", secret=1234, + 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="1", secret=5678, + self.vapi.app_namespace_add(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, [VppRoutePath("0.0.0.0", 0xffffffff, - nh_table_id=1)]) + nh_table_id=2)], table_id=1) ip_t10 = VppIpRoute(self, self.loop0.local_ip4, 32, [VppRoutePath("0.0.0.0", 0xffffffff, - nh_table_id=0)], table_id=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 ip fib")) def thru_host_stack_tear_down(self): for i in self.lo_interfaces: @@ -116,7 +123,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 @@ -131,19 +138,21 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="0", secret=1234, + 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="1", secret=5678, + self.vapi.app_namespace_add(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.0.0.0", 0xffffffff, - nh_table_id=2)], + [VppRoutePath("::0", 0xffffffff, + nh_table_id=2, + proto=DpoProto.DPO_PROTO_IP6)], table_id=1, is_ip6=1) ip_t10 = VppIpRoute(self, self.loop0.local_ip6, 128, - [VppRoutePath("0.0.0.0", 0xffffffff, - nh_table_id=1)], + [VppRoutePath("::0", 0xffffffff, + nh_table_id=1, + proto=DpoProto.DPO_PROTO_IP6)], table_id=2, is_ip6=1) ip_t01.add_vpp_config() ip_t10.add_vpp_config() @@ -162,15 +171,15 @@ class VCLTestCase(VppTestCase): 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_ID': "1", 'VCL_APP_NAMESPACE_SECRET': "1234"} 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': "1", + self.env.update({'VCL_APP_NAMESPACE_ID': "2", 'VCL_APP_NAMESPACE_SECRET': "5678"}) worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) @@ -179,14 +188,15 @@ 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) + self.sleep(self.post_test_sleep) def validateResults(self, worker_client, worker_server, timeout): 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.SIGTERM) + os.killpg(os.getpgid(worker_server.process.pid), signal.SIGKILL) worker_server.join() self.logger.info("Client worker result is `%s'" % worker_client.result) error = False @@ -197,7 +207,7 @@ 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: self.logger.debug( @@ -209,32 +219,35 @@ 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 """ 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", "-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_test_args = ["-I", "5", "-U", "-X", + 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_test_args = ["-I", "2", "-B", "-X", + 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): self.cut_thru_tear_down() - super(VCLCutThruTestCase, self).tearDown() + super(LDPCutThruTestCase, self).tearDown() + @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_echo(self): """ run LDP cut thru echo test """ @@ -246,7 +259,7 @@ class VCLCutThruTestCase(VCLTestCase): try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!") return @@ -255,7 +268,7 @@ class VCLCutThruTestCase(VCLTestCase): 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 """ @@ -264,7 +277,7 @@ class VCLCutThruTestCase(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") def test_ldp_cut_thru_bi_dir_nsock(self): """ run LDP cut thru bi-directional (multiple sockets) test """ @@ -273,13 +286,39 @@ class VCLCutThruTestCase(VCLTestCase): "sock_test_client", self.client_bi_dir_nsock_test_args) + +class VCLCutThruTestCase(VCLTestCase): + """ VCL Cut Thru Tests """ + + 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): + self.cut_thru_tear_down() + + super(VCLCutThruTestCase, self).tearDown() + def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ 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 """ @@ -288,7 +327,6 @@ class VCLCutThruTestCase(VCLTestCase): "vcl_test_client", self.client_uni_dir_nsock_test_args) - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_cut_thru_bi_dir_nsock(self): """ run VCL cut thru bi-directional (multiple sockets) test """ @@ -298,11 +336,11 @@ class VCLCutThruTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackTestCase(VCLTestCase): - """ VCL Thru Host Stack Tests """ +class LDPThruHostStackEcho(VCLTestCase): + """ LDP Thru Host Stack Echo """ def setUp(self): - super(VCLThruHostStackTestCase, self).setUp() + super(LDPThruHostStackEcho, self).setUp() self.thru_host_stack_setup() self.client_echo_test_args = ["-E", self.echo_phrase, "-X", @@ -311,8 +349,7 @@ class VCLThruHostStackTestCase(VCLTestCase): def tearDown(self): self.thru_host_stack_tear_down() - - super(VCLThruHostStackTestCase, self).tearDown() + super(LDPThruHostStackEcho, self).tearDown() def test_ldp_thru_host_stack_echo(self): """ run LDP thru host stack echo test """ @@ -320,48 +357,51 @@ class VCLThruHostStackTestCase(VCLTestCase): 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, - "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", self.server_args, - # "vcl_test_client", - # self.client_echo_test_args) +class VCLThruHostStackEcho(VCLTestCase): + """ VCL Thru Host Stack Echo """ - # TBD: Remove VCLThruHostStackExtended*TestCase classes and move - # tests here when VPP thru host teardown/setup config bug - # is fixed. + def setUp(self): + 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.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() -class VCLThruHostStackExtendedATestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackBidirNsock(VCLTestCase): + """ VCL Thru Host Stack Bidir Nsock """ def setUp(self): - super(VCLThruHostStackExtendedATestCase, 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 = ["-B", "-X", - self.loop0.local_ip4, - self.server_port] - else: - self.client_bi_dir_nsock_timeout = 90 - self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X", - 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(VCLThruHostStackExtendedATestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -371,30 +411,32 @@ class VCLThruHostStackExtendedATestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackExtendedBTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class LDPThruHostStackBidirNsock(VCLTestCase): + """ LDP Thru Host Stack Bidir Nsock """ def setUp(self): - super(VCLThruHostStackExtendedBTestCase, 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_test_args = ["-B", "-X", + 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_test_args = ["-I", "2", "-B", "-X", + 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] def tearDown(self): self.thru_host_stack_tear_down() + super(LDPThruHostStackBidirNsock, self).tearDown() - super(VCLThruHostStackExtendedBTestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -404,31 +446,29 @@ class VCLThruHostStackExtendedBTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class VCLThruHostStackExtendedCTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class LDPThruHostStackNsock(VCLTestCase): + """ LDP Thru Host Stack Nsock """ def setUp(self): - super(VCLThruHostStackExtendedCTestCase, 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 = ["-I", self.numSockets, - "-U", "-X", + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", self.numSockets, self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() + super(LDPThruHostStackNsock, self).tearDown() - super(VCLThruHostStackExtendedCTestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_uni_dir_nsock(self): """ run LDP thru host stack uni-directional (multiple sockets) test """ @@ -438,31 +478,29 @@ class VCLThruHostStackExtendedCTestCase(VCLTestCase): self.client_uni_dir_nsock_test_args) -class VCLThruHostStackExtendedDTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackNsock(VCLTestCase): + """ VCL Thru Host Stack Nsock """ def setUp(self): - super(VCLThruHostStackExtendedDTestCase, 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 = ["-I", self.numSockets, - "-U", "-X", + self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X", + "-I", self.numSockets, self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() + super(VCLThruHostStackNsock, self).tearDown() - super(VCLThruHostStackExtendedDTestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_uni_dir_nsock(self): """ run VCL thru host stack uni-directional (multiple sockets) test """ @@ -472,28 +510,27 @@ class VCLThruHostStackExtendedDTestCase(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 """ 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", "-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(VCLThruHostStackIperfTestCase, self).tearDown() + super(LDPThruHostStackIperf, self).tearDown() def test_ldp_thru_host_stack_iperf3(self): """ run LDP thru host stack iperf3 test """ try: subprocess.check_output(['iperf3', '-v']) - except: + except subprocess.CalledProcessError: self.logger.error("WARNING: 'iperf3' is not installed,") self.logger.error( " 'test_ldp_thru_host_stack_iperf3' not run!") @@ -504,34 +541,37 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): "iperf3", self.client_iperf3_args) -class VCLIpv6CutThruTestCase(VCLTestCase): - """ VCL IPv6 Cut Thru Tests """ +class LDPIpv6CutThruTestCase(VCLTestCase): + """ LDP IPv6 Cut Thru Tests """ 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", "-c", self.server_ipv6_addr] + 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 = ["-6", "-I", "5", - "-U", "-X", + 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 = ["-6", "-I", "2", - "-B", "-X", + 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): self.cut_thru_tear_down() - super(VCLIpv6CutThruTestCase, self).tearDown() + super(LDPIpv6CutThruTestCase, self).tearDown() def test_ldp_ipv6_cut_thru_echo(self): """ run LDP IPv6 cut thru echo test """ @@ -541,6 +581,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 """ @@ -556,7 +597,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") + @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 """ @@ -565,7 +606,7 @@ class VCLIpv6CutThruTestCase(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") def test_ldp_ipv6_cut_thru_bi_dir_nsock(self): """ run LDP IPv6 cut thru bi-directional (multiple sockets) test """ @@ -574,6 +615,35 @@ class VCLIpv6CutThruTestCase(VCLTestCase): "sock_test_client", self.client_ipv6_bi_dir_nsock_test_args) + +class VCLIpv6CutThruTestCase(VCLTestCase): + """ VCL IPv6 Cut Thru Tests """ + + 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): + self.cut_thru_tear_down() + + super(VCLIpv6CutThruTestCase, self).tearDown() + def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """ @@ -582,7 +652,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 """ @@ -591,7 +661,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 """ @@ -601,11 +671,11 @@ 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 """ 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", @@ -614,202 +684,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 """ - # TBD: Enable this when VPP IPv6 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) - - # TBD: Remove VCLIpv6ThruHostStackExtended*TestCase classes and move - # tests here when VPP thru host teardown/setup config bug - # is fixed. - - -class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackExtendedATestCase, 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 = ["-6", "-B", "-X", - self.loop0.local_ip6, - self.server_port] - else: - self.client_bi_dir_nsock_timeout = 90 - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", - "2", "-B", "-X", - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackExtendedATestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") - 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 VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackExtendedBTestCase, 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 = ["-6", "-B", "-X", - self.loop0.local_ip6, - self.server_port] - else: - self.client_bi_dir_nsock_timeout = 60 - self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", "2", - "-B", "-X", - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackExtendedBTestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") - 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 VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackExtendedCTestCase, 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 = ["-6", - "-I", self.numSockets, - "-U", "-X", - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackExtendedCTestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") - 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.server_ipv6_args, - "sock_test_client", - self.client_ipv6_uni_dir_nsock_test_args) - - -class VCLIpv6ThruHostStackExtendedDTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ - - def setUp(self): - super(VCLIpv6ThruHostStackExtendedDTestCase, 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 = ["-6", - "-I", self.numSockets, - "-U", "-X", - self.loop0.local_ip6, - self.server_port] - - def tearDown(self): - self.thru_host_stack_ipv6_tear_down() - - super(VCLIpv6ThruHostStackExtendedDTestCase, self).tearDown() - - @unittest.skipUnless(running_extended_tests(), "part of extended tests") - 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, + 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", "-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: - 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__':