From 211b28a1c267b9d02a920c8a65d202b585a9d437 Mon Sep 17 00:00:00 2001 From: Dave Wallace Date: Wed, 8 May 2019 20:46:33 -0400 Subject: make test: add quic multistream test case - Also refactor test_quic.py to prepare for external echo tests & ipv6 tests Change-Id: I7dff60b375ed67d920e73294e0bf491cd3206d56 Signed-off-by: Dave Wallace --- test/test_quic.py | 158 ++++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 118 insertions(+), 40 deletions(-) (limited to 'test') diff --git a/test/test_quic.py b/test/test_quic.py index e1ccc572968..ee6143d3e83 100644 --- a/test/test_quic.py +++ b/test/test_quic.py @@ -1,29 +1,48 @@ #!/usr/bin/env python import unittest - +import os from framework import VppTestCase, VppTestRunner, running_extended_tests from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath -class TestQUIC(VppTestCase): +class QUICTestCase(VppTestCase): """ QUIC Test Case """ @classmethod def setUpClass(cls): - super(TestQUIC, cls).setUpClass() + super(QUICTestCase, cls).setUpClass() @classmethod def tearDownClass(cls): - super(TestQUIC, cls).tearDownClass() + super(QUICTestCase, cls).tearDownClass() def setUp(self): - super(TestQUIC, self).setUp() + 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) + self.vppDebug = 'vpp_debug' in self.build_dir + self.timeout = 20 + self.pre_test_sleep = 0.3 + self.post_test_sleep = 0.3 self.vapi.session_enable_disable(is_enabled=1) - self.create_loopback_interfaces(2) - table_id = 1 + def tearDown(self): + self.vapi.session_enable_disable(is_enabled=0) + + def thru_host_stack_ipv4_setup(self): + super(QUICTestCase, self).setUp() + self.create_loopback_interfaces(2) + self.uri = "quic://%s/1234" % self.loop0.local_ip4 + common_args = ["uri", self.uri, "fifo-size", "4"] + self.server_echo_test_args = common_args + ["appns", "server"] + self.client_echo_test_args = common_args + ["appns", "client", + "bytes", "1024", + "test-bytes", + "no-output"] + table_id = 1 for i in self.lo_interfaces: i.admin_up() @@ -36,54 +55,113 @@ class TestQUIC(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add_del(namespace_id=b"1", + self.vapi.app_namespace_add_del(namespace_id=b"server", sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add_del(namespace_id=b"2", + self.vapi.app_namespace_add_del(namespace_id=b"client", sw_if_index=self.loop1.sw_if_index) - def tearDown(self): + # Add inter-table routes + self.ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32, + [VppRoutePath("0.0.0.0", + 0xffffffff, + nh_table_id=2)], table_id=1) + self.ip_t10 = VppIpRoute(self, self.loop0.local_ip4, 32, + [VppRoutePath("0.0.0.0", + 0xffffffff, + nh_table_id=1)], table_id=2) + self.ip_t01.add_vpp_config() + self.ip_t10.add_vpp_config() + self.logger.debug(self.vapi.cli("show ip fib")) + + def thru_host_stack_ipv4_tear_down(self): + # Delete inter-table routes + self.ip_t01.remove_vpp_config() + self.ip_t10.remove_vpp_config() + for i in self.lo_interfaces: i.unconfig_ip4() i.set_table_ip4(0) i.admin_down() - self.vapi.session_enable_disable(is_enabled=0) - super(TestQUIC, self).tearDown() - - @unittest.skipUnless(running_extended_tests, "part of extended tests") - def test_quic_transfer(self): - """ QUIC echo client/server transfer """ - # Add inter-table routes - ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32, - [VppRoutePath("0.0.0.0", - 0xffffffff, - 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=1)], table_id=2) - ip_t01.add_vpp_config() - ip_t10.add_vpp_config() - self.logger.debug(self.vapi.cli("show ip fib")) - - # Start builtin server and client - uri = "quic://%s/1234" % self.loop0.local_ip4 - error = self.vapi.cli("test echo server appns 1 fifo-size 4 uri %s" % - uri) + def start_internal_echo_server(self, args): + error = self.vapi.cli("test echo server %s" % ' '.join(args)) if error: self.logger.critical(error) self.assertNotIn("failed", error) - error = self.vapi.cli("test echo client bytes 1024 appns 2 " + - "fifo-size 4 test-bytes no-output " + - "uri %s" % uri) - self.logger.critical(error) + + def start_internal_echo_client(self, args): + error = self.vapi.cli("test echo client %s" % ' '.join(args)) if error: self.logger.critical(error) self.assertNotIn("failed", error) - # Delete inter-table routes - ip_t01.remove_vpp_config() - ip_t10.remove_vpp_config() + def internal_ipv4_transfer_test(self, server_args, client_args): + self.start_internal_echo_server(server_args) + self.sleep(self.pre_test_sleep) + self.start_internal_echo_client(client_args) + self.sleep(self.post_test_sleep) + + +class QUICInternalEchoIPv4TestCase(QUICTestCase): + """ QUIC Internal Echo IPv4 Transfer Test Cases """ + + @classmethod + def setUpClass(cls): + super(QUICInternalEchoIPv4TestCase, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(QUICInternalEchoIPv4TestCase, cls).tearDownClass() + + def setUp(self): + super(QUICInternalEchoIPv4TestCase, self).setUp() + self.thru_host_stack_ipv4_setup() + + def tearDown(self): + self.thru_host_stack_ipv4_tear_down() + super(QUICInternalEchoIPv4TestCase, 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_quic_internal_transfer(self): + """ QUIC internal echo client/server transfer """ + + self.internal_ipv4_transfer_test(self.server_echo_test_args, + self.client_echo_test_args) + + +class QUICInternalEchoIPv4MultiStreamTestCase(QUICTestCase): + """ QUIC Internal Echo IPv4 Transfer Test Cases """ + + @classmethod + def setUpClass(cls): + super(QUICInternalEchoIPv4MultiStreamTestCase, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(QUICInternalEchoIPv4MultiStreamTestCase, cls).tearDownClass() + + def setUp(self): + super(QUICInternalEchoIPv4MultiStreamTestCase, self).setUp() + self.thru_host_stack_ipv4_setup() + + def tearDown(self): + self.thru_host_stack_ipv4_tear_down() + super(QUICInternalEchoIPv4MultiStreamTestCase, 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_quic_internal_multistream_transfer(self): + """ QUIC internal echo client/server multi-stream transfer """ + + self.internal_ipv4_transfer_test(self.server_echo_test_args, + self.client_echo_test_args + + ["quic-streams", "10"]) + if __name__ == '__main__': unittest.main(testRunner=VppTestRunner) -- cgit 1.2.3-korg