import os
import subprocess
import signal
+import glob
from framework import VppTestCase, VppTestRunner, running_extended_tests, \
Worker
from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath, FibPathProto
class VCLAppWorker(Worker):
""" VCL Test Application Worker """
+ libname = "libvcl_ldpreload.so"
+
+ class LibraryNotFound(Exception):
+ pass
+
def __init__(self, build_dir, appname, executable_args, logger, env=None,
role=None, *args, **kwargs):
self.role = role
+ vpp_install_path = os.getenv('VPP_INSTALL_PATH')
+
+ vcl_ldpreload_glob = "{}/**/{}".format(vpp_install_path, self.libname)
+ vcl_ldpreload_so = glob.glob(vcl_ldpreload_glob, recursive=True)
+
+ if len(vcl_ldpreload_so) < 1:
+ raise LibraryNotFound("cannot locate library: {}".format(
+ self.libname))
+
+ vcl_ldpreload_so = vcl_ldpreload_so[0]
+
if env is None:
env = {}
- vcl_lib_dir = "%s/vpp/lib" % build_dir
if "iperf" in appname:
app = appname
- env.update({'LD_PRELOAD':
- "%s/libvcl_ldpreload.so" % vcl_lib_dir})
+ env.update({'LD_PRELOAD': vcl_ldpreload_so})
elif "sock" in appname:
- app = "%s/vpp/bin/%s" % (build_dir, appname)
- env.update({'LD_PRELOAD':
- "%s/libvcl_ldpreload.so" % vcl_lib_dir})
+ app = "%s/bin/%s" % (build_dir, appname)
+ env.update({'LD_PRELOAD': vcl_ldpreload_so})
else:
- app = "%s/vpp/bin/%s" % (build_dir, appname)
+ app = "%s/bin/%s" % (build_dir, appname)
self.args = [app] + executable_args
super(VCLAppWorker, self).__init__(self.args, logger, env,
*args, **kwargs)
class VCLTestCase(VppTestCase):
""" VCL Test Class """
- extra_vpp_punt_config = ["session", "{", "poll-main", "}"]
+ session_startup = ["poll-main"]
@classmethod
def setUpClass(cls):
+ if cls.session_startup:
+ conf = "session {" + " ".join(cls.session_startup) + "}"
+ cls.extra_vpp_punt_config = [conf]
super(VCLTestCase, cls).setUpClass()
@classmethod
self.echo_phrase = "Hello, world! Jenny is a friend of mine."
self.pre_test_sleep = 0.3
self.post_test_sleep = 0.2
+ self.sapi_client_sock = ""
+ self.sapi_server_sock = ""
if os.path.isfile("/tmp/ldp_server_af_unix_socket"):
os.remove("/tmp/ldp_server_af_unix_socket")
super(VCLTestCase, self).setUp()
+ def update_vcl_app_env(self, ns_id, ns_secret, attach_sock):
+ if not ns_id:
+ if 'VCL_APP_NAMESPACE_ID' in self.vcl_app_env:
+ del self.vcl_app_env['VCL_APP_NAMESPACE_ID']
+ else:
+ self.vcl_app_env['VCL_APP_NAMESPACE_ID'] = ns_id
+
+ if not ns_secret:
+ if 'VCL_APP_NAMESPACE_SECRET' in self.vcl_app_env:
+ del self.vcl_app_env['VCL_APP_NAMESPACE_SECRET']
+ else:
+ self.vcl_app_env['VCL_APP_NAMESPACE_SECRET'] = ns_secret
+
+ if not attach_sock:
+ self.vcl_app_env['VCL_VPP_API_SOCKET'] = self.get_api_sock_path()
+ if 'VCL_VPP_SAPI_SOCKET' in self.vcl_app_env:
+ del self.vcl_app_env['VCL_VPP_SAPI_SOCKET']
+ else:
+ sapi_sock = "%s/app_ns_sockets/%s" % (self.tempdir, attach_sock)
+ self.vcl_app_env['VCL_VPP_SAPI_SOCKET'] = sapi_sock
+ if 'VCL_VPP_API_SOCKET' in self.vcl_app_env:
+ del self.vcl_app_env['VCL_VPP_API_SOCKET']
+
def cut_thru_setup(self):
self.vapi.session_enable_disable(is_enable=1)
self.vapi.session_enable_disable(is_enable=0)
def cut_thru_test(self, server_app, server_args, client_app, client_args):
- self.env = {'VCL_VPP_API_SOCKET': self.get_api_sock_path(),
- 'VCL_APP_SCOPE_LOCAL': "true"}
+ self.vcl_app_env = {'VCL_APP_SCOPE_LOCAL': "true"}
+
+ self.update_vcl_app_env("", "", self.sapi_server_sock)
worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
- self.logger, self.env, "server")
+ self.logger, self.vcl_app_env, "server")
worker_server.start()
self.sleep(self.pre_test_sleep)
+
+ self.update_vcl_app_env("", "", self.sapi_client_sock)
worker_client = VCLAppWorker(self.build_dir, client_app, client_args,
- self.logger, self.env, "client")
+ self.logger, self.vcl_app_env, "client")
worker_client.start()
worker_client.join(self.timeout)
try:
@unittest.skipUnless(_have_iperf3, "'%s' not found, Skipping.")
def thru_host_stack_test(self, server_app, server_args,
client_app, client_args):
- self.env = {'VCL_VPP_API_SOCKET': self.get_api_sock_path(),
- 'VCL_APP_SCOPE_GLOBAL': "true",
- 'VCL_APP_NAMESPACE_ID': "1",
- 'VCL_APP_NAMESPACE_SECRET': "1234"}
+ self.vcl_app_env = {'VCL_APP_SCOPE_GLOBAL': "true"}
+ self.update_vcl_app_env("1", "1234", self.sapi_server_sock)
worker_server = VCLAppWorker(self.build_dir, server_app, server_args,
- self.logger, self.env, "server")
+ self.logger, self.vcl_app_env, "server")
worker_server.start()
self.sleep(self.pre_test_sleep)
- self.env.update({'VCL_APP_NAMESPACE_ID': "2",
- 'VCL_APP_NAMESPACE_SECRET': "5678"})
+ self.update_vcl_app_env("2", "5678", self.sapi_client_sock)
worker_client = VCLAppWorker(self.build_dir, client_app, client_args,
- self.logger, self.env, "client")
+ self.logger, self.vcl_app_env, "client")
worker_client.start()
worker_client.join(self.timeout)
@classmethod
def setUpClass(cls):
+ cls.session_startup = ["poll-main", "use-app-socket-api"]
super(LDPCutThruTestCase, cls).setUpClass()
@classmethod
"-I", "2",
self.server_addr,
self.server_port]
+ self.sapi_client_sock = "default"
+ self.sapi_server_sock = "default"
def tearDown(self):
super(LDPCutThruTestCase, self).tearDown()
@classmethod
def setUpClass(cls):
+ cls.session_startup = ["poll-main", "use-app-socket-api"]
super(VCLThruHostStackTLS, cls).setUpClass()
@classmethod
self.client_uni_dir_tls_test_args = ["-N", "1000", "-U", "-X", "-L",
self.loop0.local_ip4,
self.server_port]
+ self.sapi_server_sock = "1"
+ self.sapi_client_sock = "2"
def test_vcl_thru_host_stack_tls_uni_dir(self):
""" run VCL thru host stack uni-directional TLS test """
Code Review / vpp.git / blobdiff