X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Ftest_vcl.py;h=8e8cc401888fc6d56b64fea14928ab62a21412da;hb=34ca075636cc9a7974cd4483f28303137a7d42df;hp=b427c94538324b17a3588042ae62c42746493464;hpb=de91006803f823a149b04738dd2bbfe18bfe9791;p=vpp.git diff --git a/test/test_vcl.py b/test/test_vcl.py index b427c945383..8e8cc401888 100644 --- a/test/test_vcl.py +++ b/test/test_vcl.py @@ -7,24 +7,24 @@ import subprocess import signal from framework import VppTestCase, VppTestRunner, running_extended_tests, \ Worker -from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath +from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, DpoProto class VCLAppWorker(Worker): """ VCL Test Application Worker """ def __init__(self, build_dir, appname, args, logger, env={}): - vcl_lib_dir = "%s/vpp/.libs" % build_dir + vcl_lib_dir = "%s/vpp/lib" % build_dir if "iperf" in appname: app = appname env.update({'LD_PRELOAD': - "%s/libvcl_ldpreload.so.0.0.0" % vcl_lib_dir}) + "%s/libvcl_ldpreload.so" % vcl_lib_dir}) + elif "sock" in appname: + app = "%s/vpp/bin/%s" % (build_dir, appname) + env.update({'LD_PRELOAD': + "%s/libvcl_ldpreload.so" % vcl_lib_dir}) else: - app = "%s/%s" % (vcl_lib_dir, appname) - if not os.path.isfile(app): - app = "%s/vpp/%s" % (build_dir, appname) - env.update({'LD_PRELOAD': - "%s/libvcl_ldpreload.so.0.0.0" % vcl_lib_dir}) + app = "%s/vpp/bin/%s" % (build_dir, appname) self.args = [app] + args super(VCLAppWorker, self).__init__(self.args, logger, env) @@ -43,7 +43,7 @@ class VCLTestCase(VppTestCase): self.server_args = [self.server_port] self.server_ipv6_addr = "::1" self.server_ipv6_args = ["-6", self.server_port] - self.timeout = 3 + self.timeout = 10 self.echo_phrase = "Hello, world! Jenny is a friend of mine." super(VCLTestCase, self).__init__(methodName) @@ -68,14 +68,14 @@ class VCLTestCase(VppTestCase): worker_client.join(self.timeout) try: self.validateResults(worker_client, worker_server, self.timeout) - except Exception, error: + except Exception as error: self.fail("Failed with %s" % error) def thru_host_stack_setup(self): self.vapi.session_enable_disable(is_enabled=1) - self.create_loopback_interfaces(range(2)) + self.create_loopback_interfaces(2) - table_id = 0 + table_id = 1 for i in self.lo_interfaces: i.admin_up() @@ -89,22 +89,23 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="0", secret=1234, + 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="1", secret=5678, + self.vapi.app_namespace_add(namespace_id="2", secret=5678, sw_if_index=self.loop1.sw_if_index) # Add inter-table routes ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32, [VppRoutePath("0.0.0.0", 0xffffffff, - nh_table_id=1)]) + 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=0)], table_id=1) + 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")) def thru_host_stack_tear_down(self): for i in self.lo_interfaces: @@ -116,7 +117,7 @@ class VCLTestCase(VppTestCase): def thru_host_stack_ipv6_setup(self): self.vapi.session_enable_disable(is_enabled=1) - self.create_loopback_interfaces(range(2)) + self.create_loopback_interfaces(2) table_id = 1 @@ -131,19 +132,21 @@ class VCLTestCase(VppTestCase): table_id += 1 # Configure namespaces - self.vapi.app_namespace_add(namespace_id="0", secret=1234, + 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="1", secret=5678, + self.vapi.app_namespace_add(namespace_id="2", secret=5678, sw_if_index=self.loop1.sw_if_index) # Add inter-table routes ip_t01 = VppIpRoute(self, self.loop1.local_ip6, 128, - [VppRoutePath("0.0.0.0", 0xffffffff, - nh_table_id=2)], + [VppRoutePath("::0", 0xffffffff, + nh_table_id=2, + proto=DpoProto.DPO_PROTO_IP6)], table_id=1, is_ip6=1) ip_t10 = VppIpRoute(self, self.loop0.local_ip6, 128, - [VppRoutePath("0.0.0.0", 0xffffffff, - nh_table_id=1)], + [VppRoutePath("::0", 0xffffffff, + nh_table_id=1, + proto=DpoProto.DPO_PROTO_IP6)], table_id=2, is_ip6=1) ip_t01.add_vpp_config() ip_t10.add_vpp_config() @@ -162,7 +165,7 @@ class VCLTestCase(VppTestCase): client_app, client_args): self.env = {'VCL_API_PREFIX': self.shm_prefix, 'VCL_APP_SCOPE_GLOBAL': "true", - 'VCL_APP_NAMESPACE_ID': "0", + 'VCL_APP_NAMESPACE_ID': "1", 'VCL_APP_NAMESPACE_SECRET': "1234"} worker_server = VCLAppWorker(self.build_dir, server_app, server_args, @@ -170,7 +173,7 @@ class VCLTestCase(VppTestCase): worker_server.start() self.sleep(0.2) - self.env.update({'VCL_APP_NAMESPACE_ID': "1", + self.env.update({'VCL_APP_NAMESPACE_ID': "2", 'VCL_APP_NAMESPACE_SECRET': "5678"}) worker_client = VCLAppWorker(self.build_dir, client_app, client_args, self.logger, self.env) @@ -179,7 +182,7 @@ class VCLTestCase(VppTestCase): try: self.validateResults(worker_client, worker_server, self.timeout) - except Exception, error: + except Exception as error: self.fail("Failed with %s" % error) def validateResults(self, worker_client, worker_server, timeout): @@ -219,7 +222,7 @@ class VCLCutThruTestCase(VCLTestCase): self.client_echo_test_args = ["-E", self.echo_phrase, "-X", self.server_addr, self.server_port] self.client_iperf3_timeout = 20 - self.client_iperf3_args = ["-V4d", "-c", self.server_addr] + self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.server_addr] self.server_iperf3_args = ["-V4d", "-s"] self.client_uni_dir_nsock_timeout = 60 self.client_uni_dir_nsock_test_args = ["-I", "5", "-U", "-X", @@ -338,28 +341,29 @@ class VCLThruHostStackTestCase(VCLTestCase): # is fixed. -class VCLThruHostStackExtendedATestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ +class VCLThruHostStackNSessionBidirTestCase(VCLTestCase): + """ VCL Thru Host Stack NSession Bidir Tests """ def setUp(self): - super(VCLThruHostStackExtendedATestCase, self).setUp() + super(VCLThruHostStackNSessionBidirTestCase, self).setUp() self.thru_host_stack_setup() if self.vppDebug: self.client_bi_dir_nsock_timeout = 120 - self.client_bi_dir_nsock_test_args = ["-B", "-X", + self.client_bi_dir_nsock_test_args = ["-B", "-X", "-N 10000", self.loop0.local_ip4, self.server_port] else: self.client_bi_dir_nsock_timeout = 90 self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X", + "-N 1000", self.loop0.local_ip4, self.server_port] def tearDown(self): self.thru_host_stack_tear_down() - super(VCLThruHostStackExtendedATestCase, self).tearDown() + super(VCLThruHostStackNSessionBidirTestCase, self).tearDown() @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_vcl_thru_host_stack_bi_dir_nsock(self): @@ -372,7 +376,7 @@ class VCLThruHostStackExtendedATestCase(VCLTestCase): class VCLThruHostStackExtendedBTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ + """ VCL Thru Host Stack Extended B Tests """ def setUp(self): super(VCLThruHostStackExtendedBTestCase, self).setUp() @@ -380,12 +384,13 @@ class VCLThruHostStackExtendedBTestCase(VCLTestCase): self.thru_host_stack_setup() if self.vppDebug: self.client_bi_dir_nsock_timeout = 120 - self.client_bi_dir_nsock_test_args = ["-B", "-X", + self.client_bi_dir_nsock_test_args = ["-B", "-X", "-N 1000", self.loop0.local_ip4, self.server_port] else: self.client_bi_dir_nsock_timeout = 60 self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X", + "-N 1000", self.loop0.local_ip4, self.server_port] @@ -405,7 +410,7 @@ class VCLThruHostStackExtendedBTestCase(VCLTestCase): class VCLThruHostStackExtendedCTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ + """ VCL Thru Host Stack Extended C Tests """ def setUp(self): super(VCLThruHostStackExtendedCTestCase, self).setUp() @@ -419,7 +424,7 @@ class VCLThruHostStackExtendedCTestCase(VCLTestCase): self.numSockets = "5" self.client_uni_dir_nsock_test_args = ["-I", self.numSockets, - "-U", "-X", + "-U", "-X", "-N 1000", self.loop0.local_ip4, self.server_port] @@ -439,7 +444,7 @@ class VCLThruHostStackExtendedCTestCase(VCLTestCase): class VCLThruHostStackExtendedDTestCase(VCLTestCase): - """ VCL Thru Host Stack Extended Tests """ + """ VCL Thru Host Stack Extended D Tests """ def setUp(self): super(VCLThruHostStackExtendedDTestCase, self).setUp() @@ -453,7 +458,7 @@ class VCLThruHostStackExtendedDTestCase(VCLTestCase): self.numSockets = "5" self.client_uni_dir_nsock_test_args = ["-I", self.numSockets, - "-U", "-X", + "-U", "-X", "-N 1000", self.loop0.local_ip4, self.server_port] @@ -480,7 +485,7 @@ class VCLThruHostStackIperfTestCase(VCLTestCase): self.thru_host_stack_setup() self.client_iperf3_timeout = 20 - self.client_iperf3_args = ["-V4d", "-c", self.loop0.local_ip4] + self.client_iperf3_args = ["-V4d", "-t 5", "-c", self.loop0.local_ip4] self.server_iperf3_args = ["-V4d", "-s"] def tearDown(self): @@ -517,7 +522,8 @@ class VCLIpv6CutThruTestCase(VCLTestCase): self.client_ipv6_echo_test_args = ["-6", "-E", self.echo_phrase, "-X", self.server_ipv6_addr, self.server_port] - self.client_ipv6_iperf3_args = ["-V6d", "-c", self.server_ipv6_addr] + self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c", + self.server_ipv6_addr] self.server_ipv6_iperf3_args = ["-V6d", "-s"] self.client_ipv6_uni_dir_nsock_test_args = ["-6", "-I", "5", "-U", "-X", @@ -620,22 +626,23 @@ class VCLIpv6ThruHostStackTestCase(VCLTestCase): def test_ldp_ipv6_thru_host_stack_echo(self): """ run LDP IPv6 thru host stack echo test """ - self.thru_host_stack_test("sock_test_server", self.server_ipv6_args, + self.thru_host_stack_test("sock_test_server", + self.server_ipv6_args, "sock_test_client", self.client_ipv6_echo_test_args) # TBD: Remove these when VPP thru host teardown config bug is fixed. - self.thru_host_stack_test("vcl_test_server", self.server_ipv6_args, + self.thru_host_stack_test("vcl_test_server", + self.server_ipv6_args, "vcl_test_client", self.client_ipv6_echo_test_args) def test_vcl_ipv6_thru_host_stack_echo(self): """ run VCL IPv6 thru host stack echo test """ - # TBD: Enable this when VPP IPv6 thru host teardown - # config bug is fixed. - # self.thru_host_stack_test("vcl_test_server", self.server_ipv6_args, - # "vcl_test_client", - # self.client_ipv6_echo_test_args) +# self.thru_host_stack_test("vcl_test_server", +# self.server_ipv6_args, +# "vcl_test_client", +# self.client_ipv6_echo_test_args) # TBD: Remove VCLIpv6ThruHostStackExtended*TestCase classes and move # tests here when VPP thru host teardown/setup config bug @@ -643,7 +650,7 @@ class VCLIpv6ThruHostStackTestCase(VCLTestCase): class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ + """ VCL IPv6 Thru Host Stack Extended A Tests """ def setUp(self): super(VCLIpv6ThruHostStackExtendedATestCase, self).setUp() @@ -677,7 +684,7 @@ class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase): class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ + """ VCL IPv6 Thru Host Stack Extended B Tests """ def setUp(self): super(VCLIpv6ThruHostStackExtendedBTestCase, self).setUp() @@ -705,13 +712,14 @@ class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase): """ run LDP thru host stack bi-directional (multiple sockets) test """ self.timeout = self.client_bi_dir_nsock_timeout - self.thru_host_stack_test("sock_test_server", self.server_ipv6_args, + self.thru_host_stack_test("sock_test_server", + self.server_ipv6_args, "sock_test_client", self.client_ipv6_bi_dir_nsock_test_args) class VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ + """ VCL IPv6 Thru Host Stack Extended C Tests """ def setUp(self): super(VCLIpv6ThruHostStackExtendedCTestCase, self).setUp() @@ -740,13 +748,14 @@ class VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase): """ run LDP thru host stack uni-directional (multiple sockets) test """ self.timeout = self.client_uni_dir_nsock_timeout - self.thru_host_stack_test("sock_test_server", self.server_ipv6_args, + self.thru_host_stack_test("sock_test_server", + self.server_ipv6_args, "sock_test_client", self.client_ipv6_uni_dir_nsock_test_args) class VCLIpv6ThruHostStackExtendedDTestCase(VCLTestCase): - """ VCL IPv6 Thru Host Stack Extended Tests """ + """ VCL IPv6 Thru Host Stack Extended D Tests """ def setUp(self): super(VCLIpv6ThruHostStackExtendedDTestCase, self).setUp() @@ -788,7 +797,8 @@ class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase): self.thru_host_stack_ipv6_setup() self.client_iperf3_timeout = 20 - self.client_ipv6_iperf3_args = ["-V6d", "-c", self.loop0.local_ip6] + self.client_ipv6_iperf3_args = ["-V6d", "-t 5", "-c", + self.loop0.local_ip6] self.server_ipv6_iperf3_args = ["-V6d", "-s"] def tearDown(self): @@ -796,6 +806,7 @@ class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase): super(VCLIpv6ThruHostStackIperfTestCase, self).tearDown() + @unittest.skipUnless(running_extended_tests(), "part of extended tests") def test_ldp_thru_host_stack_iperf3(self): """ run LDP thru host stack iperf3 test """