""" 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)
""" VCL Test Class """
def __init__(self, methodName):
- var = "VPP_TEST_BUILD_DIR"
+ var = "VPP_BUILD_DIR"
self.build_dir = os.getenv(var, None)
if self.build_dir is None:
raise Exception("Environment variable `%s' not set" % var)
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",
+ self.client_uni_dir_nsock_timeout = 20
+ self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
+ "-I", "2",
self.server_addr,
self.server_port]
- self.client_bi_dir_nsock_timeout = 120
- self.client_bi_dir_nsock_test_args = ["-I", "2", "-B", "-X",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+ "-I", "2",
self.server_addr,
self.server_port]
try:
subprocess.check_output(['iperf3', '-v'])
- except:
+ except subprocess.CalledProcessError:
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!")
return
self.cut_thru_test("iperf3", self.server_iperf3_args,
"iperf3", self.client_iperf3_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 """
"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.cut_thru_test("vcl_test_server", self.server_args,
"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 """
"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 """
# "vcl_test_client",
# self.client_echo_test_args)
- # TBD: Remove VCLThruHostStackExtended*TestCase classes and move
+ # TBD: Remove VCLThruHostStackGroup*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 """
+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_timeout = 20
+ self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+ "-I", "2",
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",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+ "-I", "2",
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):
""" run VCL thru host stack bi-directional (multiple sockets) test """
self.client_bi_dir_nsock_test_args)
-class VCLThruHostStackExtendedBTestCase(VCLTestCase):
- """ VCL Thru Host Stack Extended Tests """
+class VCLThruHostStackGroupBTestCase(VCLTestCase):
+ """ VCL Thru Host Stack Group B Tests """
def setUp(self):
- super(VCLThruHostStackExtendedBTestCase, self).setUp()
+ super(VCLThruHostStackGroupBTestCase, 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_timeout = 20
+ self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+ # OUCH! Host Stack Bug?
+ # "-I", "2",
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",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+ # OUCH! Host Stack Bug?
+ # "-I", "2",
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStackExtendedBTestCase, self).tearDown()
+ super(VCLThruHostStackGroupBTestCase, 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.client_bi_dir_nsock_test_args)
-class VCLThruHostStackExtendedCTestCase(VCLTestCase):
- """ VCL Thru Host Stack Extended Tests """
+class VCLThruHostStackGroupCTestCase(VCLTestCase):
+ """ VCL Thru Host Stack Group C Tests """
def setUp(self):
- super(VCLThruHostStackExtendedCTestCase, self).setUp()
+ super(VCLThruHostStackGroupCTestCase, self).setUp()
self.thru_host_stack_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
- self.client_uni_dir_nsock_test_args = ["-I", self.numSockets,
- "-U", "-X",
+ self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
+ "-I", self.numSockets,
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStackExtendedCTestCase, self).tearDown()
+ super(VCLThruHostStackGroupCTestCase, 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.client_uni_dir_nsock_test_args)
-class VCLThruHostStackExtendedDTestCase(VCLTestCase):
- """ VCL Thru Host Stack Extended Tests """
+class VCLThruHostStackGroupDTestCase(VCLTestCase):
+ """ VCL Thru Host Stack Group D Tests """
def setUp(self):
- super(VCLThruHostStackExtendedDTestCase, self).setUp()
+ super(VCLThruHostStackGroupDTestCase, self).setUp()
self.thru_host_stack_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
- self.client_uni_dir_nsock_test_args = ["-I", self.numSockets,
- "-U", "-X",
+ self.client_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
+ "-I", self.numSockets,
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStackExtendedDTestCase, self).tearDown()
+ super(VCLThruHostStackGroupDTestCase, 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.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):
try:
subprocess.check_output(['iperf3', '-v'])
- except:
+ except subprocess.CalledProcessError:
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(
" 'test_ldp_thru_host_stack_iperf3' not run!")
self.cut_thru_setup()
self.client_iperf3_timeout = 20
- self.client_uni_dir_nsock_timeout = 60
- self.client_bi_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
+ self.client_bi_dir_nsock_timeout = 20
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",
+ self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
+ "-6",
+ "-I", "2",
self.server_ipv6_addr,
self.server_port]
- self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", "2",
- "-B", "-X",
+ self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000", "-B", "-X",
+ "-6",
+ "-I", "2",
self.server_ipv6_addr,
self.server_port]
self.cut_thru_test("iperf3", self.server_ipv6_iperf3_args,
"iperf3", self.client_ipv6_iperf3_args)
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
def test_ldp_ipv6_cut_thru_uni_dir_nsock(self):
""" run LDP IPv6 cut thru uni-directional (multiple sockets) test """
"sock_test_client",
self.client_ipv6_uni_dir_nsock_test_args)
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
def test_ldp_ipv6_cut_thru_bi_dir_nsock(self):
""" run LDP IPv6 cut thru bi-directional (multiple sockets) test """
"vcl_test_client",
self.client_ipv6_echo_test_args)
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
def test_vcl_ipv6_cut_thru_uni_dir_nsock(self):
""" run VCL IPv6 cut thru uni-directional (multiple sockets) test """
"vcl_test_client",
self.client_ipv6_uni_dir_nsock_test_args)
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
def test_vcl_ipv6_cut_thru_bi_dir_nsock(self):
""" run VCL IPv6 cut thru bi-directional (multiple sockets) test """
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 """
-# 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)
- # TBD: Remove VCLIpv6ThruHostStackExtended*TestCase classes and move
+ # TBD: Remove VCLIpv6ThruHostStackGroup*TestCase classes and move
# tests here when VPP thru host teardown/setup config bug
# is fixed.
-class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase):
- """ VCL IPv6 Thru Host Stack Extended Tests """
+class VCLIpv6ThruHostStackGroupATestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack Group A Tests """
def setUp(self):
- super(VCLIpv6ThruHostStackExtendedATestCase, self).setUp()
+ super(VCLIpv6ThruHostStackGroupATestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
- self.client_bi_dir_nsock_timeout = 120
- self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-B", "-X",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
+ "-B", "-X", "-6",
+ "-I", "2",
self.loop0.local_ip6,
self.server_port]
else:
- self.client_bi_dir_nsock_timeout = 90
- self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I",
- "2", "-B", "-X",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
+ "-B", "-X", "-6",
+ "-I", "2",
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStackExtendedATestCase, self).tearDown()
+ super(VCLIpv6ThruHostStackGroupATestCase, 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.client_ipv6_bi_dir_nsock_test_args)
-class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase):
- """ VCL IPv6 Thru Host Stack Extended Tests """
+class VCLIpv6ThruHostStackGroupBTestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack Group B Tests """
def setUp(self):
- super(VCLIpv6ThruHostStackExtendedBTestCase, self).setUp()
+ super(VCLIpv6ThruHostStackGroupBTestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
- self.client_bi_dir_nsock_timeout = 120
- self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-B", "-X",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
+ "-B", "-X", "-6",
+ # OUCH! Host Stack Bug?
+ # "-I", "2",
self.loop0.local_ip6,
self.server_port]
else:
- self.client_bi_dir_nsock_timeout = 60
- self.client_ipv6_bi_dir_nsock_test_args = ["-6", "-I", "2",
- "-B", "-X",
+ self.client_bi_dir_nsock_timeout = 20
+ self.client_ipv6_bi_dir_nsock_test_args = ["-N", "1000",
+ "-B", "-X", "-6",
+ # OUCH! Host Stack Bug?
+ # "-I", "2",
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStackExtendedBTestCase, self).tearDown()
+ super(VCLIpv6ThruHostStackGroupBTestCase, 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", 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 """
+class VCLIpv6ThruHostStackGroupCTestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack Group C Tests """
def setUp(self):
- super(VCLIpv6ThruHostStackExtendedCTestCase, self).setUp()
+ super(VCLIpv6ThruHostStackGroupCTestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
- self.client_ipv6_uni_dir_nsock_test_args = ["-6",
+ self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
+ "-6",
"-I", self.numSockets,
- "-U", "-X",
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStackExtendedCTestCase, self).tearDown()
+ super(VCLIpv6ThruHostStackGroupCTestCase, 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", 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 """
+class VCLIpv6ThruHostStackGroupDTestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack Group D Tests """
def setUp(self):
- super(VCLIpv6ThruHostStackExtendedDTestCase, self).setUp()
+ super(VCLIpv6ThruHostStackGroupDTestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout = 120
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
- self.client_ipv6_uni_dir_nsock_test_args = ["-6",
+ self.client_ipv6_uni_dir_nsock_test_args = ["-N", "1000", "-U", "-X",
+ "-6",
"-I", self.numSockets,
- "-U", "-X",
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStackExtendedDTestCase, self).tearDown()
+ super(VCLIpv6ThruHostStackGroupDTestCase, 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.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):
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 """
try:
subprocess.check_output(['iperf3', '-v'])
- except:
+ except subprocess.CalledProcessError:
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(
" 'test_ldp_thru_host_stack_iperf3' not run!")
Code Review / vpp.git / blobdiff