X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=f5a1c9c08557fd5bff3faf169ae8745856158014;hb=22ab6f7cbb0f6139302aa6ca9f0c96dba17a37a7;hp=bd7eb76f07e499b1bb87a9b499767d191dd09ab2;hpb=8d991d923b52a2692370bfa33902d29ff5d2f826;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index bd7eb76f07e..f5a1c9c0855 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, @@ -146,10 +146,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, @@ -259,8 +259,8 @@ 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() @unittest.skipUnless(running_extended_tests, "part of extended tests") @@ -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, @@ -360,66 +371,71 @@ class VCLCutThruTestCase(VCLTestCase): self.client_bi_dir_nsock_test_args) -class LDPThruHostStackEcho(VCLTestCase): - """ LDP Thru Host Stack Echo """ +class VCLThruHostStackEcho(VCLTestCase): + """ VCL Thru Host Stack Echo """ @classmethod def setUpClass(cls): - super(LDPThruHostStackEcho, cls).setUpClass() + super(VCLThruHostStackEcho, cls).setUpClass() @classmethod def tearDownClass(cls): - super(LDPThruHostStackEcho, cls).tearDownClass() + super(VCLThruHostStackEcho, cls).tearDownClass() def setUp(self): - super(LDPThruHostStackEcho, 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.logger.debug(self.vapi.cli("show app server")) + self.logger.debug(self.vapi.cli("show session verbose")) 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) + super(VCLThruHostStackEcho, self).tearDown() -class VCLThruHostStackEcho(VCLTestCase): - """ VCL Thru Host Stack Echo """ +class VCLThruHostStackTLS(VCLTestCase): + """ VCL Thru Host Stack TLS """ @classmethod def setUpClass(cls): - super(VCLThruHostStackEcho, cls).setUpClass() + super(VCLThruHostStackTLS, cls).setUpClass() @classmethod def tearDownClass(cls): - super(VCLThruHostStackEcho, cls).tearDownClass() + super(VCLThruHostStackTLS, cls).tearDownClass() def setUp(self): - super(VCLThruHostStackEcho, self).setUp() + super(VCLThruHostStackTLS, 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] + 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.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_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.logger.debug(self.vapi.cli("show session verbose 2")) self.thru_host_stack_tear_down() - super(VCLThruHostStackEcho, self).tearDown() + super(VCLThruHostStackTLS, self).tearDown() class VCLThruHostStackBidirNsock(VCLTestCase): @@ -447,6 +463,7 @@ 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() @@ -490,6 +507,7 @@ 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() @@ -602,6 +620,7 @@ 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() @@ -615,6 +634,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,