Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
test: use smaller timeouts for vcl/ldp tests
[vpp.git]
/
test
/
test_vcl.py
diff --git
a/test/test_vcl.py
b/test/test_vcl.py
index
79eb75f
..
0eacf57
100644
(file)
--- a/
test/test_vcl.py
+++ b/
test/test_vcl.py
@@
-14,17
+14,17
@@
class VCLAppWorker(Worker):
""" VCL Test Application Worker """
def __init__(self, build_dir, appname, args, logger, env={}):
""" 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':
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:
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)
self.args = [app] + args
super(VCLAppWorker, self).__init__(self.args, logger, env)
@@
-33,7
+33,7
@@
class VCLTestCase(VppTestCase):
""" VCL Test Class """
def __init__(self, methodName):
""" 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.build_dir = os.getenv(var, None)
if self.build_dir is None:
raise Exception("Environment variable `%s' not set" % var)
@@
-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.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)
self.echo_phrase = "Hello, world! Jenny is a friend of mine."
super(VCLTestCase, self).__init__(methodName)
@@
-222,14
+222,16
@@
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_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.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.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]
self.server_addr,
self.server_port]
@@
-249,7
+251,7
@@
class VCLCutThruTestCase(VCLTestCase):
try:
subprocess.check_output(['iperf3', '-v'])
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.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(" 'test_ldp_cut_thru_iperf3' not run!")
return
@@
-258,7
+260,6
@@
class VCLCutThruTestCase(VCLTestCase):
self.cut_thru_test("iperf3", self.server_iperf3_args,
"iperf3", self.client_iperf3_args)
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 """
def test_ldp_cut_thru_uni_dir_nsock(self):
""" run LDP cut thru uni-directional (multiple sockets) test """
@@
-267,7
+268,6
@@
class VCLCutThruTestCase(VCLTestCase):
"sock_test_client",
self.client_uni_dir_nsock_test_args)
"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 """
def test_ldp_cut_thru_bi_dir_nsock(self):
""" run LDP cut thru bi-directional (multiple sockets) test """
@@
-282,7
+282,6
@@
class VCLCutThruTestCase(VCLTestCase):
self.cut_thru_test("vcl_test_server", self.server_args,
"vcl_test_client", self.client_echo_test_args)
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 """
def test_vcl_cut_thru_uni_dir_nsock(self):
""" run VCL cut thru uni-directional (multiple sockets) test """
@@
-291,7
+290,6
@@
class VCLCutThruTestCase(VCLTestCase):
"vcl_test_client",
self.client_uni_dir_nsock_test_args)
"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 """
def test_vcl_cut_thru_bi_dir_nsock(self):
""" run VCL cut thru bi-directional (multiple sockets) test """
@@
-336,35
+334,36
@@
class VCLThruHostStackTestCase(VCLTestCase):
# "vcl_test_client",
# self.client_echo_test_args)
# "vcl_test_client",
# self.client_echo_test_args)
- # TBD: Remove VCLThruHostStack
Extended
*TestCase classes and move
+ # TBD: Remove VCLThruHostStack
Group
*TestCase classes and move
# tests here when VPP thru host teardown/setup config bug
# is fixed.
# tests here when VPP thru host teardown/setup config bug
# is fixed.
-class VCLThruHostStack
ExtendedA
TestCase(VCLTestCase):
- """ VCL Thru Host Stack
Extended
Tests """
+class VCLThruHostStack
NSessionBidir
TestCase(VCLTestCase):
+ """ VCL Thru Host Stack
NSession Bidir
Tests """
def setUp(self):
def setUp(self):
- super(VCLThruHostStack
ExtendedA
TestCase, self).setUp()
+ super(VCLThruHostStack
NSessionBidir
TestCase, self).setUp()
self.thru_host_stack_setup()
if self.vppDebug:
self.client_bi_dir_nsock_timeout = 120
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 = ["-N", "1000", "-B", "-X",
+ "-I", "2",
self.loop0.local_ip4,
self.server_port]
else:
self.client_bi_dir_nsock_timeout = 90
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_test_args = ["-N", "1000", "-B", "-X",
+ "-I", "2",
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStack
ExtendedA
TestCase, self).tearDown()
+ super(VCLThruHostStack
NSessionBidir
TestCase, 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 """
def test_vcl_thru_host_stack_bi_dir_nsock(self):
""" run VCL thru host stack bi-directional (multiple sockets) test """
@@
-374,30
+373,33
@@
class VCLThruHostStackExtendedATestCase(VCLTestCase):
self.client_bi_dir_nsock_test_args)
self.client_bi_dir_nsock_test_args)
-class VCLThruHostStack
Extended
BTestCase(VCLTestCase):
- """ VCL Thru Host Stack
Extended
Tests """
+class VCLThruHostStack
Group
BTestCase(VCLTestCase):
+ """ VCL Thru Host Stack
Group B
Tests """
def setUp(self):
def setUp(self):
- super(VCLThruHostStack
Extended
BTestCase, self).setUp()
+ super(VCLThruHostStack
Group
BTestCase, self).setUp()
self.thru_host_stack_setup()
if self.vppDebug:
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.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()
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStack
Extended
BTestCase, self).tearDown()
+ super(VCLThruHostStack
Group
BTestCase, 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 """
def test_ldp_thru_host_stack_bi_dir_nsock(self):
""" run LDP thru host stack bi-directional (multiple sockets) test """
@@
-407,31
+409,30
@@
class VCLThruHostStackExtendedBTestCase(VCLTestCase):
self.client_bi_dir_nsock_test_args)
self.client_bi_dir_nsock_test_args)
-class VCLThruHostStack
Extended
CTestCase(VCLTestCase):
- """ VCL Thru Host Stack
Extended
Tests """
+class VCLThruHostStack
Group
CTestCase(VCLTestCase):
+ """ VCL Thru Host Stack
Group C
Tests """
def setUp(self):
def setUp(self):
- super(VCLThruHostStack
Extended
CTestCase, self).setUp()
+ super(VCLThruHostStack
Group
CTestCase, self).setUp()
self.thru_host_stack_setup()
if self.vppDebug:
self.thru_host_stack_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
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()
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStack
Extended
CTestCase, self).tearDown()
+ super(VCLThruHostStack
Group
CTestCase, 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 """
def test_ldp_thru_host_stack_uni_dir_nsock(self):
""" run LDP thru host stack uni-directional (multiple sockets) test """
@@
-441,31
+442,30
@@
class VCLThruHostStackExtendedCTestCase(VCLTestCase):
self.client_uni_dir_nsock_test_args)
self.client_uni_dir_nsock_test_args)
-class VCLThruHostStack
Extended
DTestCase(VCLTestCase):
- """ VCL Thru Host Stack
Extended
Tests """
+class VCLThruHostStack
Group
DTestCase(VCLTestCase):
+ """ VCL Thru Host Stack
Group D
Tests """
def setUp(self):
def setUp(self):
- super(VCLThruHostStack
Extended
DTestCase, self).setUp()
+ super(VCLThruHostStack
Group
DTestCase, self).setUp()
self.thru_host_stack_setup()
if self.vppDebug:
self.thru_host_stack_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
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()
self.loop0.local_ip4,
self.server_port]
def tearDown(self):
self.thru_host_stack_tear_down()
- super(VCLThruHostStack
Extended
DTestCase, self).tearDown()
+ super(VCLThruHostStack
Group
DTestCase, 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 """
def test_vcl_thru_host_stack_uni_dir_nsock(self):
""" run VCL thru host stack uni-directional (multiple sockets) test """
@@
-483,7
+483,7
@@
class VCLThruHostStackIperfTestCase(VCLTestCase):
self.thru_host_stack_setup()
self.client_iperf3_timeout = 20
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):
self.server_iperf3_args = ["-V4d", "-s"]
def tearDown(self):
@@
-496,7
+496,7
@@
class VCLThruHostStackIperfTestCase(VCLTestCase):
try:
subprocess.check_output(['iperf3', '-v'])
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.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(
" 'test_ldp_thru_host_stack_iperf3' not run!")
@@
-515,19
+515,22
@@
class VCLIpv6CutThruTestCase(VCLTestCase):
self.cut_thru_setup()
self.client_iperf3_timeout = 20
self.cut_thru_setup()
self.client_iperf3_timeout = 20
- self.client_uni_dir_nsock_timeout =
6
0
- self.client_bi_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout =
2
0
+ 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_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.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.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.server_ipv6_addr,
self.server_port]
@@
-559,7
+562,6
@@
class VCLIpv6CutThruTestCase(VCLTestCase):
self.cut_thru_test("iperf3", self.server_ipv6_iperf3_args,
"iperf3", self.client_ipv6_iperf3_args)
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 """
def test_ldp_ipv6_cut_thru_uni_dir_nsock(self):
""" run LDP IPv6 cut thru uni-directional (multiple sockets) test """
@@
-568,7
+570,6
@@
class VCLIpv6CutThruTestCase(VCLTestCase):
"sock_test_client",
self.client_ipv6_uni_dir_nsock_test_args)
"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 """
def test_ldp_ipv6_cut_thru_bi_dir_nsock(self):
""" run LDP IPv6 cut thru bi-directional (multiple sockets) test """
@@
-585,7
+586,6
@@
class VCLIpv6CutThruTestCase(VCLTestCase):
"vcl_test_client",
self.client_ipv6_echo_test_args)
"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 """
def test_vcl_ipv6_cut_thru_uni_dir_nsock(self):
""" run VCL IPv6 cut thru uni-directional (multiple sockets) test """
@@
-594,7
+594,6
@@
class VCLIpv6CutThruTestCase(VCLTestCase):
"vcl_test_client",
self.client_ipv6_uni_dir_nsock_test_args)
"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_vcl_ipv6_cut_thru_bi_dir_nsock(self):
""" run VCL IPv6 cut thru bi-directional (multiple sockets) test """
@@
-623,51
+622,56
@@
class VCLIpv6ThruHostStackTestCase(VCLTestCase):
def test_ldp_ipv6_thru_host_stack_echo(self):
""" run LDP IPv6 thru host stack echo 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.
"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 """
"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)
# "vcl_test_client",
# self.client_ipv6_echo_test_args)
- # TBD: Remove VCLIpv6ThruHostStack
Extended
*TestCase classes and move
+ # TBD: Remove VCLIpv6ThruHostStack
Group
*TestCase classes and move
# tests here when VPP thru host teardown/setup config bug
# is fixed.
# tests here when VPP thru host teardown/setup config bug
# is fixed.
-class VCLIpv6ThruHostStack
Extended
ATestCase(VCLTestCase):
- """ VCL IPv6 Thru Host Stack
Extended
Tests """
+class VCLIpv6ThruHostStack
Group
ATestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack
Group A
Tests """
def setUp(self):
def setUp(self):
- super(VCLIpv6ThruHostStack
Extended
ATestCase, self).setUp()
+ super(VCLIpv6ThruHostStack
Group
ATestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
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.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()
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStack
Extended
ATestCase, self).tearDown()
+ super(VCLIpv6ThruHostStack
Group
ATestCase, 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 """
def test_vcl_thru_host_stack_bi_dir_nsock(self):
""" run VCL thru host stack bi-directional (multiple sockets) test """
@@
-677,101
+681,105
@@
class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase):
self.client_ipv6_bi_dir_nsock_test_args)
self.client_ipv6_bi_dir_nsock_test_args)
-class VCLIpv6ThruHostStack
Extended
BTestCase(VCLTestCase):
- """ VCL IPv6 Thru Host Stack
Extended
Tests """
+class VCLIpv6ThruHostStack
Group
BTestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack
Group B
Tests """
def setUp(self):
def setUp(self):
- super(VCLIpv6ThruHostStack
Extended
BTestCase, self).setUp()
+ super(VCLIpv6ThruHostStack
Group
BTestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
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.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()
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStack
Extended
BTestCase, self).tearDown()
+ super(VCLIpv6ThruHostStack
Group
BTestCase, 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
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)
"sock_test_client",
self.client_ipv6_bi_dir_nsock_test_args)
-class VCLIpv6ThruHostStack
Extended
CTestCase(VCLTestCase):
- """ VCL IPv6 Thru Host Stack
Extended
Tests """
+class VCLIpv6ThruHostStack
Group
CTestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack
Group C
Tests """
def setUp(self):
def setUp(self):
- super(VCLIpv6ThruHostStack
Extended
CTestCase, self).setUp()
+ super(VCLIpv6ThruHostStack
Group
CTestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
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,
"-I", self.numSockets,
- "-U", "-X",
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStack
Extended
CTestCase, self).tearDown()
+ super(VCLIpv6ThruHostStack
Group
CTestCase, 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
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)
"sock_test_client",
self.client_ipv6_uni_dir_nsock_test_args)
-class VCLIpv6ThruHostStack
Extended
DTestCase(VCLTestCase):
- """ VCL IPv6 Thru Host Stack
Extended
Tests """
+class VCLIpv6ThruHostStack
Group
DTestCase(VCLTestCase):
+ """ VCL IPv6 Thru Host Stack
Group D
Tests """
def setUp(self):
def setUp(self):
- super(VCLIpv6ThruHostStack
Extended
DTestCase, self).setUp()
+ super(VCLIpv6ThruHostStack
Group
DTestCase, self).setUp()
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
self.thru_host_stack_ipv6_setup()
if self.vppDebug:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "2"
else:
self.numSockets = "2"
else:
- self.client_uni_dir_nsock_timeout =
1
20
+ self.client_uni_dir_nsock_timeout = 20
self.numSockets = "5"
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,
"-I", self.numSockets,
- "-U", "-X",
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
self.loop0.local_ip6,
self.server_port]
def tearDown(self):
self.thru_host_stack_ipv6_tear_down()
- super(VCLIpv6ThruHostStack
Extended
DTestCase, self).tearDown()
+ super(VCLIpv6ThruHostStack
Group
DTestCase, 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 """
def test_vcl_thru_host_stack_uni_dir_nsock(self):
""" run VCL thru host stack uni-directional (multiple sockets) test """
@@
-789,7
+797,8
@@
class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase):
self.thru_host_stack_ipv6_setup()
self.client_iperf3_timeout = 20
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):
self.server_ipv6_iperf3_args = ["-V6d", "-s"]
def tearDown(self):
@@
-797,13
+806,12
@@
class VCLIpv6ThruHostStackIperfTestCase(VCLTestCase):
super(VCLIpv6ThruHostStackIperfTestCase, self).tearDown()
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'])
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!")
self.logger.error("WARNING: 'iperf3' is not installed,")
self.logger.error(
" 'test_ldp_thru_host_stack_iperf3' not run!")