import unittest
import os
import signal
-import subprocess
-from threading import Thread
-from log import single_line_delim
-from framework import VppTestCase, running_extended_tests, \
- running_on_centos, VppTestRunner, Worker
+from framework import VppTestCase, VppTestRunner, running_extended_tests, \
+ Worker
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath
-class VCLCUTTHRUTestCase(VppTestCase):
- """ VCL Cut Thru Test """
+class VclAppWorker(Worker):
+ """ VCL Test Application Worker """
- server_addr = "127.0.0.1"
- server_port = "22000"
+ def __init__(self, build_dir, appname, args, logger, env={}):
+ vcl_lib_dir = "%s/vpp/.libs" % build_dir
+ 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})
+ self.args = [app] + args
+ super(VclAppWorker, self).__init__(self.args, logger, env)
- @classmethod
- def setUpClass(cls):
- super(VCLCUTTHRUTestCase, cls).setUpClass()
- def setUp(self):
- super(VCLCUTTHRUTestCase, self).setUp()
+class VclTestCase(VppTestCase):
+ """ VCL Test Class """
+
+ def __init__(self, methodName):
+ var = "VPP_TEST_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.server_addr = "127.0.0.1"
+ self.server_port = "22000"
+ self.timeout = 3
+ self.echo_phrase = "Hello, world! Jenny is a friend of mine."
+
+ super(VclTestCase, self).__init__(methodName)
+ def cut_thru_setup(self):
self.vapi.session_enable_disable(is_enabled=1)
- def tearDown(self):
+ def cut_thru_tear_down(self):
self.vapi.session_enable_disable(is_enabled=0)
- super(VCLCUTTHRUTestCase, self).tearDown()
+ def cut_thru_test(self, server_app, client_app, client_args):
+ self.env = {'VCL_API_PREFIX': self.shm_prefix,
+ 'VCL_APP_SCOPE_LOCAL': "true"}
- def test_vcl_cutthru(self):
- """ run VCL cut-thru test """
- timeout = 5
- var = "VPP_TEST_BUILD_DIR"
- build_dir = os.getenv(var, None)
- self.assertIsNotNone(build_dir,
- "Environment variable `%s' not set" % var)
- vcl_exe_dir = "%s/vpp/.libs" % build_dir
- executable = "%s/vcl_test_server" % vcl_exe_dir
- worker_server = Worker([executable, self.server_port], self.logger)
- worker_server.env["VCL_API_PREFIX"] = self.shm_prefix
- worker_server.env["VCL_APP_SCOPE_LOCAL"] = "true"
+ worker_server = VclAppWorker(self.build_dir, server_app,
+ [self.server_port],
+ self.logger, self.env)
worker_server.start()
- executable = "%s/vcl_test_client" % vcl_exe_dir
- worker_client = Worker(
- [executable, self.server_addr, self.server_port,
- "-E", "Hello, world!", "-X"], self.logger)
- worker_client.env["VCL_API_PREFIX"] = self.shm_prefix
- worker_client.env["VCL_APP_SCOPE_LOCAL"] = "true"
+ self.sleep(0.2)
+ worker_client = VclAppWorker(self.build_dir, client_app, client_args,
+ self.logger, self.env)
worker_client.start()
- worker_client.join(timeout)
- self.logger.info("Client worker result is `%s'" % worker_client.result)
- error = False
- if worker_client.result is None:
- try:
- error = True
- self.logger.error(
- "Timeout! Client worker did not finish in %ss" % timeout)
- os.killpg(os.getpgid(worker_client.process.pid),
- signal.SIGTERM)
- worker_client.join()
- except:
- raise Exception("Couldn't kill client worker-spawned process")
- if error:
- os.killpg(os.getpgid(worker_server.process.pid), signal.SIGTERM)
- worker_server.join()
- raise Exception(
- "Timeout! Client worker did not finish in %ss" % timeout)
- self.assert_equal(worker_client.result, 0, "Binary test return code")
-
-
-class VCLTHRUHSTestcase(VppTestCase):
- """ VCL Thru Hoststack Test """
-
- server_port = "22000"
-
- @classmethod
- def setUpClass(cls):
- super(VCLTHRUHSTestcase, cls).setUpClass()
-
- def setUp(self):
- super(VCLTHRUHSTestcase, self).setUp()
+ worker_client.join(self.timeout)
+ try:
+ self.validateResults(worker_client, worker_server, self.timeout)
+ except Exception, 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))
table_id += 1
# Configure namespaces
- self.vapi.app_namespace_add(namespace_id="0",
+ self.vapi.app_namespace_add(namespace_id="0", secret=1234,
sw_if_index=self.loop0.sw_if_index)
- self.vapi.app_namespace_add(namespace_id="1",
+ self.vapi.app_namespace_add(namespace_id="1", secret=5678,
sw_if_index=self.loop1.sw_if_index)
- def tearDown(self):
- 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(VCLTHRUHSTestcase, self).tearDown()
-
- def test_vcl_thru_hoststack(self):
- """ run VCL thru hoststack test """
# Add inter-table routes
ip_t01 = VppIpRoute(self, self.loop1.local_ip4, 32,
[VppRoutePath("0.0.0.0",
ip_t01.add_vpp_config()
ip_t10.add_vpp_config()
- timeout = 20
- var = "VPP_TEST_BUILD_DIR"
- build_dir = os.getenv(var, None)
- self.assertIsNotNone(build_dir,
- "Environment variable `%s' not set" % var)
- vcl_exe_dir = "%s/vpp/.libs" % build_dir
- executable = "%s/vcl_test_server" % vcl_exe_dir
- worker_server = Worker([executable, self.server_port], self.logger)
- worker_server.env["VCL_API_PREFIX"] = self.shm_prefix
- worker_server.env["VCL_APP_SCOPE_GLOBAL"] = "true"
- worker_server.env["VCL_APP_NAMESPACE_ID"] = "0"
+ def thru_host_stack_tear_down(self):
+ 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)
+
+ def thru_host_stack_test(self, server_app, 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_SECRET': "1234"}
+
+ worker_server = VclAppWorker(self.build_dir, server_app,
+ [self.server_port],
+ self.logger, self.env)
worker_server.start()
- executable = "%s/vcl_test_client" % vcl_exe_dir
- worker_client = Worker(
- [executable, self.loop0.local_ip4, self.server_port,
- "-E", "Hello, world!", "-X"], self.logger)
- worker_client.env["VCL_API_PREFIX"] = self.shm_prefix
- worker_client.env["VCL_APP_SCOPE_GLOBAL"] = "true"
- worker_client.env["VCL_APP_NAMESPACE_ID"] = "1"
+ self.sleep(0.2)
+
+ self.env.update({'VCL_APP_NAMESPACE_ID': "1",
+ 'VCL_APP_NAMESPACE_SECRET': "5678"})
+ worker_client = VclAppWorker(self.build_dir, client_app, client_args,
+ self.logger, self.env)
worker_client.start()
- worker_client.join(timeout)
+ worker_client.join(self.timeout)
+
+ try:
+ self.validateResults(worker_client, worker_server, self.timeout)
+ except Exception, error:
+ self.fail("Failed with %s" % error)
+
+ def validateResults(self, worker_client, worker_server, timeout):
+ if os.path.isdir('/proc/{}'.format(worker_server.process.pid)):
+ self.logger.info("Killing server worker process (pid %d)" %
+ worker_server.process.pid)
+ os.killpg(os.getpgid(worker_server.process.pid), signal.SIGTERM)
+ worker_server.join()
self.logger.info("Client worker result is `%s'" % worker_client.result)
error = False
if worker_client.result is None:
try:
error = True
self.logger.error(
- "Timeout! Client worker did not finish in %ss" % timeout)
+ "Timeout: %ss! Killing client worker process (pid %d)" %
+ (timeout, worker_client.process.pid))
os.killpg(os.getpgid(worker_client.process.pid),
signal.SIGTERM)
worker_client.join()
except:
- raise Exception("Couldn't kill client worker-spawned process")
+ self.logger.debug(
+ "Couldn't kill client worker process")
+ raise
if error:
- os.killpg(os.getpgid(worker_server.process.pid), signal.SIGTERM)
- worker_server.join()
raise Exception(
"Timeout! Client worker did not finish in %ss" % timeout)
self.assert_equal(worker_client.result, 0, "Binary test return code")
+
+class VCLCutThruTestCase(VclTestCase):
+ """ VCL Cut Thru Tests """
+
+ def setUp(self):
+ super(VCLCutThruTestCase, self).setUp()
+
+ self.cut_thru_setup()
+ self.client_echo_test_args = [self.server_addr, self.server_port,
+ "-E", self.echo_phrase, "-X"]
+ self.client_uni_dir_nsock_timeout = 60
+ self.client_uni_dir_nsock_test_args = [self.server_addr,
+ self.server_port,
+ "-I", "5", "-U", "-X"]
+ self.client_bi_dir_nsock_timeout = 120
+ self.client_bi_dir_nsock_test_args = [self.server_addr,
+ self.server_port,
+ "-I", "2", "-B", "-X"]
+
+ def tearDown(self):
+ self.cut_thru_tear_down()
+
+ super(VCLCutThruTestCase, self).tearDown()
+
+ def test_ldp_cut_thru_echo(self):
+ """ run LDP cut thru echo test """
+
+ self.cut_thru_test("sock_test_server", "sock_test_client",
+ self.client_echo_test_args)
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_ldp_cut_thru_uni_dir_nsock(self):
+ """ run LDP cut thru uni-directional (multiple sockets) test """
+
+ self.timeout = self.client_uni_dir_nsock_timeout
+ self.cut_thru_test("sock_test_server", "sock_test_client",
+ self.client_uni_dir_nsock_test_args)
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_ldp_cut_thru_bi_dir_nsock(self):
+ """ run LDP cut thru bi-directional (multiple sockets) test """
+
+ self.timeout = self.client_bi_dir_nsock_timeout
+ self.cut_thru_test("sock_test_server", "sock_test_client",
+ self.client_bi_dir_nsock_test_args)
+
+ def test_vcl_cut_thru_echo(self):
+ """ run VCL cut thru echo test """
+
+ self.cut_thru_test("vcl_test_server", "vcl_test_client",
+ self.client_echo_test_args)
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_vcl_cut_thru_uni_dir_nsock(self):
+ """ run VCL cut thru uni-directional (multiple sockets) test """
+
+ self.timeout = self.client_uni_dir_nsock_timeout
+ self.cut_thru_test("vcl_test_server", "vcl_test_client",
+ self.client_uni_dir_nsock_test_args)
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_vcl_cut_thru_bi_dir_nsock(self):
+ """ run VCL cut thru bi-directional (multiple sockets) test """
+
+ self.timeout = self.client_bi_dir_nsock_timeout
+ self.cut_thru_test("vcl_test_server", "vcl_test_client",
+ self.client_bi_dir_nsock_test_args)
+
+
+class VCLThruHostStackTestCase(VclTestCase):
+ """ VCL Thru Host Stack Tests """
+
+ def setUp(self):
+ super(VCLThruHostStackTestCase, self).setUp()
+
+ self.thru_host_stack_setup()
+ self.client_echo_test_args = [self.loop0.local_ip4,
+ self.server_port,
+ "-E", self.echo_phrase, "-X"]
+
+ def tearDown(self):
+ self.thru_host_stack_tear_down()
+
+ super(VCLThruHostStackTestCase, 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", "sock_test_client",
+ self.client_echo_test_args)
+ # TBD: Remove these when VPP thru host teardown config bug is fixed.
+ self.thru_host_stack_test("vcl_test_server", "vcl_test_client",
+ self.client_echo_test_args)
+
+ def test_vcl_thru_host_stack_echo(self):
+ """ run VCL thru host stack echo test """
+
+ # TBD: Enable this when VPP thru host teardown config bug is fixed.
+ # self.thru_host_stack_test("vcl_test_server", "vcl_test_client",
+ # self.client_echo_test_args)
+
+ # TBD: Remove VCLThruHostStackExtended*TestCase classes and move
+ # tests here when VPP thru host teardown/setup config bug
+ # is fixed.
+
+
+class VCLThruHostStackExtendedATestCase(VclTestCase):
+ """ VCL Thru Host Stack Extended Tests """
+
+ def setUp(self):
+ super(VCLThruHostStackExtendedATestCase, self).setUp()
+
+ self.thru_host_stack_setup()
+ if self.vppDebug:
+ self.client_bi_dir_nsock_timeout = 120
+ else:
+ self.client_bi_dir_nsock_timeout = 60
+ self.client_bi_dir_nsock_test_args = [self.loop0.local_ip4,
+ self.server_port,
+ "-I", "2", "-B", "-X"]
+
+ def tearDown(self):
+ self.thru_host_stack_tear_down()
+
+ super(VCLThruHostStackExtendedATestCase, self).tearDown()
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_vcl_thru_host_stack_bi_dir_nsock(self):
+ """ run VCL thru host stack bi-directional (multiple sockets) test """
+
+ self.timeout = self.client_bi_dir_nsock_timeout
+ self.thru_host_stack_test("vcl_test_server", "vcl_test_client",
+ self.client_bi_dir_nsock_test_args)
+
+
+class VCLThruHostStackExtendedBTestCase(VclTestCase):
+ """ VCL Thru Host Stack Extended Tests """
+
+ def setUp(self):
+ super(VCLThruHostStackExtendedBTestCase, self).setUp()
+
+ self.thru_host_stack_setup()
+ if self.vppDebug:
+ self.client_bi_dir_nsock_timeout = 120
+ else:
+ self.client_bi_dir_nsock_timeout = 60
+ self.client_bi_dir_nsock_test_args = [self.loop0.local_ip4,
+ self.server_port,
+ "-I", "2", "-B", "-X"]
+
+ def tearDown(self):
+ self.thru_host_stack_tear_down()
+
+ super(VCLThruHostStackExtendedBTestCase, self).tearDown()
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_ldp_thru_host_stack_bi_dir_nsock(self):
+ """ 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", "sock_test_client",
+ self.client_bi_dir_nsock_test_args)
+
+
+class VCLThruHostStackExtendedCTestCase(VclTestCase):
+ """ VCL Thru Host Stack Extended Tests """
+
+ def setUp(self):
+ super(VCLThruHostStackExtendedCTestCase, self).setUp()
+
+ self.thru_host_stack_setup()
+ if self.vppDebug:
+ self.client_uni_dir_nsock_timeout = 120
+ self.numSockets = "2"
+ else:
+ self.client_uni_dir_nsock_timeout = 120
+ self.numSockets = "5"
+
+ self.client_uni_dir_nsock_test_args = [self.loop0.local_ip4,
+ self.server_port,
+ "-I", self.numSockets,
+ "-U", "-X"]
+
+ def tearDown(self):
+ self.thru_host_stack_tear_down()
+
+ super(VCLThruHostStackExtendedCTestCase, self).tearDown()
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_ldp_thru_host_stack_uni_dir_nsock(self):
+ """ 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", "sock_test_client",
+ self.client_uni_dir_nsock_test_args)
+
+
+class VCLThruHostStackExtendedDTestCase(VclTestCase):
+ """ VCL Thru Host Stack Extended Tests """
+
+ def setUp(self):
+ super(VCLThruHostStackExtendedDTestCase, self).setUp()
+
+ self.thru_host_stack_setup()
+ if self.vppDebug:
+ self.client_uni_dir_nsock_timeout = 120
+ self.numSockets = "2"
+ else:
+ self.client_uni_dir_nsock_timeout = 120
+ self.numSockets = "5"
+
+ self.client_uni_dir_nsock_test_args = [self.loop0.local_ip4,
+ self.server_port,
+ "-I", self.numSockets,
+ "-U", "-X"]
+
+ def tearDown(self):
+ self.thru_host_stack_tear_down()
+
+ super(VCLThruHostStackExtendedDTestCase, self).tearDown()
+
+ @unittest.skipUnless(running_extended_tests(), "part of extended tests")
+ def test_vcl_thru_host_stack_uni_dir_nsock(self):
+ """ run VCL thru host stack uni-directional (multiple sockets) test """
+
+ self.timeout = self.client_uni_dir_nsock_timeout
+ self.thru_host_stack_test("vcl_test_server", "vcl_test_client",
+ self.client_uni_dir_nsock_test_args)
+
+
if __name__ == '__main__':
unittest.main(testRunner=VppTestRunner)
Code Review / vpp.git / blobdiff