X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=18279e9f226e3a5dca6215b23bfed87554ce3b3b;hb=097fa66b986f06281f603767d321ab13ab6c88c3;hp=b60e015205110edf362d581c4bdf6f3f04a90fcc;hpb=c0737e962ca913763e4cc3aa516a2dfffe46659e;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index b60e0152051..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): @@ -103,9 +103,9 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add_del(namespace_id="1", secret=1234, + 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="2", secret=5678, + self.vapi.app_namespace_add_del(namespace_id=b"2", secret=5678, sw_if_index=self.loop1.sw_if_index) # Add inter-table routes @@ -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,22 +144,20 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add_del(namespace_id="1", secret=1234, + 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="2", secret=5678, + 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")) @@ -204,7 +200,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 +213,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 +255,11 @@ class LDPCutThruTestCase(VCLTestCase): self.server_port] def tearDown(self): - self.logger.debug(self.vapi.cli("show session verbose 2")) - self.cut_thru_tear_down() super(LDPCutThruTestCase, self).tearDown() + self.cut_thru_tear_down() + + 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): @@ -344,10 +342,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 """ @@ -396,11 +395,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 """ @@ -418,8 +419,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] @@ -432,11 +433,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 2")) 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 """ @@ -463,10 +466,12 @@ class VCLThruHostStackBidirNsock(VCLTestCase): self.server_port] def tearDown(self): - self.logger.debug(self.vapi.cli("show session verbose 2")) 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 """ @@ -507,10 +512,12 @@ class LDPThruHostStackBidirNsock(VCLTestCase): self.server_port] def tearDown(self): - self.logger.debug(self.vapi.cli("show session verbose 2")) 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 """ @@ -620,10 +627,12 @@ class LDPThruHostStackIperf(VCLTestCase): self.server_iperf3_args = ["-V4d", "-s"] def tearDown(self): - self.logger.debug(self.vapi.cli("show session verbose 2")) 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 """ @@ -684,9 +693,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 """ @@ -763,9 +771,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 """