X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fplugins%2Fquic%2Ftest%2Ftest_quic.py;h=21987c2a349ded97528eda7f47e88be4f6f7e51e;hb=b4e5e50fe;hp=0516dc7ceb65e259fcaa9741ad38446c8013584b;hpb=83c1e9a35b41c3bc871a2508f847e64528efccac;p=vpp.git diff --git a/src/plugins/quic/test/test_quic.py b/src/plugins/quic/test/test_quic.py index 0516dc7ceb6..21987c2a349 100644 --- a/src/plugins/quic/test/test_quic.py +++ b/src/plugins/quic/test/test_quic.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 """ Vpp QUIC tests """ import unittest @@ -14,10 +14,17 @@ class QUICAppWorker(Worker): """ QUIC Test Application Worker """ process = None - def __init__(self, build_dir, appname, args, logger, env={}): + def __init__(self, build_dir, appname, executable_args, logger, role, + testcase, env=None, *args, **kwargs): + if env is None: + env = {} app = "%s/vpp/bin/%s" % (build_dir, appname) - self.args = [app] + args - super(QUICAppWorker, self).__init__(self.args, logger, env) + self.args = [app] + executable_args + self.role = role + self.wait_for_gdb = 'wait-for-gdb' + self.testcase = testcase + super(QUICAppWorker, self).__init__(self.args, logger, env, + *args, **kwargs) def run(self): super(QUICAppWorker, self).run() @@ -37,6 +44,11 @@ class QUICAppWorker(Worker): class QUICTestCase(VppTestCase): """ QUIC Test Case """ + + timeout = 20 + pre_test_sleep = 0.3 + post_test_sleep = 0.3 + @classmethod def setUpClass(cls): cls.extra_vpp_plugin_config.append("plugin quic_plugin.so { enable }") @@ -49,10 +61,6 @@ class QUICTestCase(VppTestCase): 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.vapi.session_enable_disable(is_enabled=1) - self.pre_test_sleep = 0.3 - self.post_test_sleep = 0.2 self.create_loopback_interfaces(2) self.uri = "quic://%s/1234" % self.loop0.local_ip4 @@ -69,9 +77,9 @@ class QUICTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add_del(namespace_id=b"server", + self.vapi.app_namespace_add_del(namespace_id="server", sw_if_index=self.loop0.sw_if_index) - self.vapi.app_namespace_add_del(namespace_id=b"client", + self.vapi.app_namespace_add_del(namespace_id="client", sw_if_index=self.loop1.sw_if_index) # Add inter-table routes @@ -88,7 +96,6 @@ class QUICTestCase(VppTestCase): self.logger.debug(self.vapi.cli("show ip fib")) def tearDown(self): - self.vapi.session_enable_disable(is_enabled=0) # Delete inter-table routes self.ip_t01.remove_vpp_config() self.ip_t10.remove_vpp_config() @@ -102,13 +109,18 @@ class QUICTestCase(VppTestCase): class QUICEchoIntTestCase(QUICTestCase): """QUIC Echo Internal Test Case""" + test_bytes = ' test-bytes' + extra_vpp_punt_config = ["session", "{", "enable", "}"] def setUp(self): super(QUICEchoIntTestCase, self).setUp() - self.client_args = "uri %s fifo-size 64 test-bytes appns client" \ - % self.uri + self.client_args = 'uri {uri} fifo-size 64{testbytes} appns client' \ + .format(uri=self.uri, testbytes=self.test_bytes) self.server_args = "uri %s fifo-size 64 appns server" % self.uri + def tearDown(self): + super(QUICEchoIntTestCase, self).tearDown() + def server(self, *args): error = self.vapi.cli( "test echo server %s %s" % @@ -152,46 +164,82 @@ class QUICEchoIntMStreamTestCase(QUICEchoIntTestCase): class QUICEchoExtTestCase(QUICTestCase): - extra_vpp_punt_config = ["session", "{", "evt_qs_memfd_seg", "}"] quic_setup = "default" + test_bytes = "test-bytes:assert" + pre_test_sleep = 1 + post_test_sleep = 1 + app = "vpp_echo" + evt_q_len = 16384 + worker_config = "workers 1" + server_fifo_size = "1M" + client_fifo_size = "4M" + extra_vpp_punt_config = ["session", "{", + "enable", "evt_qs_memfd_seg", + "evt_qs_seg_size", "64M", + "event-queue-length", f"{evt_q_len}", + "preallocated-sessions", "1024", + "v4-session-table-buckets", "20000", + "v4-session-table-memory", "64M", + "v4-halfopen-table-buckets", "20000", + "v4-halfopen-table-memory", "64M", + "local-endpoints-table-buckets", "250000", + "local-endpoints-table-memory", "512M", + "}"] def setUp(self): super(QUICEchoExtTestCase, self).setUp() common_args = [ - "uri", - self.uri, + "uri", self.uri, "json", - "fifo-size", - "64", - "test-bytes:assert", - "socket-name", - self.api_sock] + self.test_bytes, + "socket-name", self.api_sock, + "quic-setup", self.quic_setup, + "nthreads", "1", + "mq-size", f"{self.evt_q_len}" + ] self.server_echo_test_args = common_args + \ - ["server", "appns", "server", "quic-setup", self.quic_setup] + ["server", "appns", "server", "fifo-size", + f"{self.server_fifo_size}"] self.client_echo_test_args = common_args + \ - ["client", "appns", "client", "quic-setup", self.quic_setup] + ["client", "appns", "client", "fifo-size", + f"{self.client_fifo_size}"] + error = self.vapi.cli("quic set fifo-size 2M") + if error: + self.logger.critical(error) + self.assertNotIn("failed", error) def server(self, *args): _args = self.server_echo_test_args + list(args) self.worker_server = QUICAppWorker( self.build_dir, - "vpp_echo", + self.app, _args, - self.logger) + self.logger, + 'server', + self) self.worker_server.start() self.sleep(self.pre_test_sleep) def client(self, *args): _args = self.client_echo_test_args + list(args) - # self.client_echo_test_args += "use-svm-api" self.worker_client = QUICAppWorker( self.build_dir, - "vpp_echo", + self.app, _args, - self.logger) + self.logger, + 'client', + self) self.worker_client.start() - self.worker_client.join(self.timeout) - self.worker_server.join(self.timeout) + timeout = None if self.debug_all else self.timeout + self.worker_client.join(timeout) + if self.worker_client.is_alive(): + error = f"Client failed to complete in {timeout} seconds!" + self.logger.critical(error) + return + self.worker_server.join(timeout) + if self.worker_server.is_alive(): + error = f"Server failed to complete in {timeout} seconds!" + self.logger.critical(error) self.sleep(self.post_test_sleep) def validate_ext_test_results(self): @@ -220,19 +268,36 @@ class QUICEchoExtTestCase(QUICTestCase): class QUICEchoExtTransferTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Test Case""" + timeout = 60 + def test_quic_ext_transfer(self): self.server() self.client() self.validate_ext_test_results() +class QUICEchoExtTransferBigTestCase(QUICEchoExtTestCase): + """QUIC Echo External Transfer Big Test Case""" + server_fifo_size = '4M' + client_fifo_size = '4M' + test_bytes = '' + timeout = 60 + + @unittest.skipUnless(running_extended_tests, "part of extended tests") + def test_quic_ext_transfer_big(self): + self.server("TX=0", "RX=2G") + self.client("TX=2G", "RX=0") + self.validate_ext_test_results() + + class QUICEchoExtQcloseRxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Qclose Rx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_qclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") - self.client("TX=1Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10M", "qclose=Y", "sclose=N") + self.client("TX=10M", "RX=0", "qclose=W", "sclose=W") self.validate_ext_test_results() @@ -240,9 +305,11 @@ class QUICEchoExtQcloseTxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Qclose Tx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_qclose_tx(self): - self.server("TX=0", "RX=1Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") + self.server("TX=0", "RX=10M", "qclose=W", "sclose=W", + "rx-results-diff") + self.client("TX=10M", "RX=0", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -250,9 +317,11 @@ class QUICEchoExtEarlyQcloseRxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Early Qclose Rx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_early_qclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") - self.client("TX=2Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10M", "qclose=Y", "sclose=N") + self.client("TX=20M", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") self.validate_ext_test_results() @@ -260,9 +329,11 @@ class QUICEchoExtEarlyQcloseTxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Early Qclose Tx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_early_qclose_tx(self): - self.server("TX=0", "RX=2Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") + self.server("TX=0", "RX=20M", "qclose=W", "sclose=W", + "rx-results-diff") + self.client("TX=10M", "RX=0", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -270,9 +341,10 @@ class QUICEchoExtScloseRxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Sclose Rx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_sclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") - self.client("TX=1Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10M", "qclose=N", "sclose=Y") + self.client("TX=10M", "RX=0", "qclose=W", "sclose=W") self.validate_ext_test_results() @@ -280,9 +352,10 @@ class QUICEchoExtScloseTxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Sclose Tx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_sclose_tx(self): - self.server("TX=0", "RX=1Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") + self.server("TX=0", "RX=10M", "qclose=W", "sclose=W") + self.client("TX=10M", "RX=0", "qclose=Y", "sclose=Y") self.validate_ext_test_results() @@ -290,29 +363,49 @@ class QUICEchoExtEarlyScloseRxTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Early Sclose Rx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_early_sclose_rx(self): - self.server("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") - self.client("TX=2Kb", "RX=0", "qclose=W", "sclose=W") + self.server("TX=0", "RX=10M", "qclose=N", "sclose=Y") + self.client("TX=20M", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") self.validate_ext_test_results() class QUICEchoExtEarlyScloseTxTestCase(QUICEchoExtTestCase): - """QUIC Echo External Transfer Early Sclose RTx Test Case""" + """QUIC Echo External Transfer Early Sclose Tx Test Case""" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_early_sclose_tx(self): - self.server("TX=0", "RX=2Kb", "qclose=W", "sclose=W") - self.client("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") + self.server("TX=0", "RX=20M", "qclose=W", "sclose=W", + "rx-results-diff") + self.client("TX=10M", "RX=0", "qclose=Y", "sclose=Y") self.validate_ext_test_results() class QUICEchoExtServerStreamTestCase(QUICEchoExtTestCase): """QUIC Echo External Transfer Server Stream Test Case""" quic_setup = "serverstream" + timeout = 60 def test_quic_ext_transfer_server_stream(self): - self.server("TX=1Kb", "RX=0") - self.client("TX=0", "RX=1Kb") + self.server("TX=10M", "RX=0") + self.client("TX=0", "RX=10M") + self.validate_ext_test_results() + + +class QUICEchoExtServerStreamBigTestCase(QUICEchoExtTestCase): + """QUIC Echo External Transfer Server Stream Big Test Case""" + quic_setup = "serverstream" + server_fifo_size = '4M' + client_fifo_size = '4M' + test_bytes = '' + timeout = 60 + + @unittest.skipUnless(running_extended_tests, "part of extended tests") + def test_quic_ext_transfer_server_stream_big(self): + self.server("TX=2G", "RX=0") + self.client("TX=0", "RX=2G") self.validate_ext_test_results() @@ -321,9 +414,10 @@ class QUICEchoExtServerStreamQcloseRxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_qclose_rx(self): - self.server("TX=1Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") + self.server("TX=10M", "RX=0", "qclose=W", "sclose=W") + self.client("TX=0", "RX=10M", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -332,9 +426,11 @@ class QUICEchoExtServerStreamQcloseTxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_qclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") - self.client("TX=0", "RX=1Kb", "qclose=W", "sclose=W") + self.server("TX=10M", "RX=0", "qclose=Y", "sclose=N") + self.client("TX=0", "RX=10M", "qclose=W", "sclose=W", + "rx-results-diff") self.validate_ext_test_results() @@ -343,9 +439,11 @@ class QUICEchoExtServerStreamEarlyQcloseRxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_early_qclose_rx(self): - self.server("TX=2Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=Y", "sclose=N") + self.server("TX=20M", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") + self.client("TX=0", "RX=10M", "qclose=Y", "sclose=N") self.validate_ext_test_results() @@ -354,9 +452,11 @@ class QUICEchoExtServerStreamEarlyQcloseTxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_early_qclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=Y", "sclose=N") - self.client("TX=0", "RX=2Kb", "qclose=W", "sclose=W") + self.server("TX=10M", "RX=0", "qclose=Y", "sclose=N") + self.client("TX=0", "RX=20M", "qclose=W", "sclose=W", + "rx-results-diff") self.validate_ext_test_results() @@ -365,9 +465,10 @@ class QUICEchoExtServerStreamScloseRxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_sclose_rx(self): - self.server("TX=1Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") + self.server("TX=10M", "RX=0", "qclose=W", "sclose=W") + self.client("TX=0", "RX=10M", "qclose=N", "sclose=Y") self.validate_ext_test_results() @@ -376,9 +477,10 @@ class QUICEchoExtServerStreamScloseTxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_sclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") - self.client("TX=0", "RX=1Kb", "qclose=W", "sclose=W") + self.server("TX=10M", "RX=0", "qclose=Y", "sclose=Y") + self.client("TX=0", "RX=10M", "qclose=W", "sclose=W") self.validate_ext_test_results() @@ -387,9 +489,11 @@ class QUICEchoExtServerStreamEarlyScloseRxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_early_sclose_rx(self): - self.server("TX=2Kb", "RX=0", "qclose=W", "sclose=W") - self.client("TX=0", "RX=1Kb", "qclose=N", "sclose=Y") + self.server("TX=20M", "RX=0", "qclose=W", "sclose=W", + "tx-results-diff") + self.client("TX=0", "RX=10M", "qclose=N", "sclose=Y") self.validate_ext_test_results() @@ -398,9 +502,11 @@ class QUICEchoExtServerStreamEarlyScloseTxTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_server_stream_early_sclose_tx(self): - self.server("TX=1Kb", "RX=0", "qclose=N", "sclose=Y") - self.client("TX=0", "RX=2Kb", "qclose=W", "sclose=W") + self.server("TX=10M", "RX=0", "qclose=Y", "sclose=Y") + self.client("TX=0", "RX=20M", "qclose=W", "sclose=W", + "rx-results-diff") self.validate_ext_test_results() @@ -409,9 +515,10 @@ class QUICEchoExtServerStreamWorkersTestCase(QUICEchoExtTestCase): quic_setup = "serverstream" @unittest.skipUnless(running_extended_tests, "part of extended tests") + @unittest.skip("testcase under development") def test_quic_ext_transfer_server_stream_multi_workers(self): - self.server("nclients", "4/4", "TX=1Kb", "RX=0") - self.client("nclients", "4/4", "TX=0", "RX=1Kb") + self.server("nclients", "4", "quic-streams", "4", "TX=10M", "RX=0") + self.client("nclients", "4", "quic-streams", "4", "TX=0", "RX=10M") self.validate_ext_test_results()