X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=3e10764c1e378851533697496abd971a4046655b;hb=59fa121f8;hp=d88d94454dde992ba73659114d8b6bbd00f3efcb;hpb=8a140616a5bab477817e7ed59afe6b01bd3d2f3a;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index d88d94454dd..3e10764c1e3 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -103,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, @@ -127,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) @@ -146,10 +144,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_ip6, 128, @@ -204,7 +202,7 @@ class VCLTestCase(VppTestCase): 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 @@ -217,7 +215,7 @@ 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 @@ -259,9 +257,11 @@ 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")) @unittest.skipUnless(running_extended_tests, "part of extended tests") def test_ldp_cut_thru_echo(self): @@ -276,9 +276,20 @@ class LDPCutThruTestCase(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, @@ -333,10 +344,11 @@ 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")) + def test_vcl_cut_thru_echo(self): """ run VCL cut thru echo test """ @@ -360,37 +372,6 @@ class VCLCutThruTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class LDPThruHostStackEcho(VCLTestCase): - """ LDP Thru Host Stack Echo """ - - @classmethod - def setUpClass(cls): - super(LDPThruHostStackEcho, cls).setUpClass() - - @classmethod - def tearDownClass(cls): - super(LDPThruHostStackEcho, cls).tearDownClass() - - def setUp(self): - super(LDPThruHostStackEcho, self).setUp() - - self.thru_host_stack_setup() - 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() - - 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) - - class VCLThruHostStackEcho(VCLTestCase): """ VCL Thru Host Stack Echo """ @@ -416,11 +397,13 @@ class VCLThruHostStackEcho(VCLTestCase): 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() + def show_commands_at_teardown(self): + self.logger.debug(self.vapi.cli("show app server")) + self.logger.debug(self.vapi.cli("show session verbose")) + class VCLThruHostStackTLS(VCLTestCase): """ VCL Thru Host Stack TLS """ @@ -438,8 +421,8 @@ class VCLThruHostStackTLS(VCLTestCase): self.thru_host_stack_setup() self.client_uni_dir_tls_timeout = 20 - self.server_tls_args = ["-S", self.server_port] - self.client_uni_dir_tls_test_args = ["-N", "1000", "-U", "-X", "-S", + 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] @@ -452,11 +435,13 @@ class VCLThruHostStackTLS(VCLTestCase): self.client_uni_dir_tls_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(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")) + class VCLThruHostStackBidirNsock(VCLTestCase): """ VCL Thru Host Stack Bidir Nsock """ @@ -486,6 +471,9 @@ 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")) + def test_vcl_thru_host_stack_bi_dir_nsock(self): """ run VCL thru host stack bi-directional (multiple sockets) test """ @@ -529,6 +517,9 @@ class LDPThruHostStackBidirNsock(VCLTestCase): 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")) + def test_ldp_thru_host_stack_bi_dir_nsock(self): """ run LDP thru host stack bi-directional (multiple sockets) test """ @@ -641,6 +632,9 @@ class LDPThruHostStackIperf(VCLTestCase): 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")) + def test_ldp_thru_host_stack_iperf3(self): """ run LDP thru host stack iperf3 test """ @@ -651,6 +645,14 @@ class LDPThruHostStackIperf(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, @@ -693,9 +695,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 """ @@ -772,9 +773,8 @@ class VCLIpv6CutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): - self.cut_thru_tear_down() - super(VCLIpv6CutThruTestCase, self).tearDown() + self.cut_thru_tear_down() def test_vcl_ipv6_cut_thru_echo(self): """ run VCL IPv6 cut thru echo test """