X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=feb4e39120c1525f7b0dce9f2b96744954d088dd;hb=e8915fc707a03260c05624425f9548d796c089fb;hp=9a8662d22750c63c56c6adebbb3f79a3b5bfdca3;hpb=653e43f06a974121343b2c1f0e4533926020877b;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index 9a8662d2275..feb4e39120c 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -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,9 +144,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 @@ -259,10 +257,12 @@ 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() + 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 """ @@ -344,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 """ @@ -371,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 """ @@ -427,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 """ @@ -449,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] @@ -463,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 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 """ @@ -497,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 """ @@ -540,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 """ @@ -649,10 +629,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 """