From debb352df9ca40170534f1e3449934a02110db96 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Tue, 18 May 2021 00:35:50 -0700 Subject: [PATCH 1/1] quic: add extended vcl test Only works with release binaries. Type: test Signed-off-by: Florin Coras Change-Id: Iede88713e1dbc4d1c6ae62651ff9150f88953f4d --- src/plugins/quic/quic.c | 2 +- test/test_vcl.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/plugins/quic/quic.c b/src/plugins/quic/quic.c index c4ef4598c10..63ff9847362 100644 --- a/src/plugins/quic/quic.c +++ b/src/plugins/quic/quic.c @@ -1318,7 +1318,7 @@ quic_connect_connection (session_endpoint_cfg_t * sep) return SESSION_E_NOEXTCFG; /* Use pool on thread 1 if we have workers because of UDP */ - thread_index = vlib_num_workers () ? 1 : 0; + thread_index = transport_cl_thread (); ccfg = &sep->ext_cfg->crypto; clib_memset (cargs, 0, sizeof (*cargs)); diff --git a/test/test_vcl.py b/test/test_vcl.py index 7977c1d4e77..63dd3130e7f 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -490,6 +490,48 @@ class VCLThruHostStackDTLS(VCLTestCase): self.logger.debug(self.vapi.cli("show app mq")) +class VCLThruHostStackQUIC(VCLTestCase): + """ VCL Thru Host Stack QUIC """ + + @classmethod + def setUpClass(cls): + cls.extra_vpp_plugin_config.append("plugin quic_plugin.so { enable }") + super(VCLThruHostStackQUIC, cls).setUpClass() + + @classmethod + def tearDownClass(cls): + super(VCLThruHostStackQUIC, cls).tearDownClass() + + def setUp(self): + super(VCLThruHostStackQUIC, self).setUp() + + self.thru_host_stack_setup() + self.client_uni_dir_quic_timeout = 20 + self.server_quic_args = ["-p", "quic", self.server_port] + self.client_uni_dir_quic_test_args = ["-N", "1000", "-U", "-X", + "-p", "quic", + self.loop0.local_ip4, + self.server_port] + + @unittest.skipUnless(running_extended_tests, "part of extended tests") + def test_vcl_thru_host_stack_quic_uni_dir(self): + """ run VCL thru host stack uni-directional QUIC test """ + + self.timeout = self.client_uni_dir_quic_timeout + self.thru_host_stack_test("vcl_test_server", self.server_quic_args, + "vcl_test_client", + self.client_uni_dir_quic_test_args) + + def tearDown(self): + self.thru_host_stack_tear_down() + super(VCLThruHostStackQUIC, 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")) + self.logger.debug(self.vapi.cli("show app mq")) + + class VCLThruHostStackBidirNsock(VCLTestCase): """ VCL Thru Host Stack Bidir Nsock """ -- 2.16.6