Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
session/svm: add want_tx_event flag to fifo
[vpp.git]
/
test
/
test_vcl.py
diff --git
a/test/test_vcl.py
b/test/test_vcl.py
index
c02f13f
..
8e8cc40
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)
@@
-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)
@@
-68,12
+68,12
@@
class VCLTestCase(VppTestCase):
worker_client.join(self.timeout)
try:
self.validateResults(worker_client, worker_server, self.timeout)
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.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 = 1
table_id = 1
@@
-117,7
+117,7
@@
class VCLTestCase(VppTestCase):
def thru_host_stack_ipv6_setup(self):
self.vapi.session_enable_disable(is_enabled=1)
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
table_id = 1
@@
-182,7
+182,7
@@
class VCLTestCase(VppTestCase):
try:
self.validateResults(worker_client, worker_server, 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 validateResults(self, worker_client, worker_server, timeout):
self.fail("Failed with %s" % error)
def validateResults(self, worker_client, worker_server, timeout):
@@
-222,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_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.server_iperf3_args = ["-V4d", "-s"]
self.client_uni_dir_nsock_timeout = 60
self.client_uni_dir_nsock_test_args = ["-I", "5", "-U", "-X",
@@
-317,7
+317,6
@@
class VCLThruHostStackTestCase(VCLTestCase):
super(VCLThruHostStackTestCase, self).tearDown()
super(VCLThruHostStackTestCase, self).tearDown()
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
def test_ldp_thru_host_stack_echo(self):
""" run LDP thru host stack echo test """
def test_ldp_thru_host_stack_echo(self):
""" run LDP thru host stack echo test """
@@
-333,37
+332,38
@@
class VCLThruHostStackTestCase(VCLTestCase):
""" run VCL thru host stack echo test """
# TBD: Enable this when VPP thru host teardown config bug is fixed.
""" 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", self.server_args,
- "vcl_test_client",
- self.client_echo_test_args)
+
#
self.thru_host_stack_test("vcl_test_server", self.server_args,
+
#
"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.
# TBD: Remove VCLThruHostStackExtended*TestCase classes and move
# 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 = ["-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",
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()
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):
@unittest.skipUnless(running_extended_tests(), "part of extended tests")
def test_vcl_thru_host_stack_bi_dir_nsock(self):
@@
-376,7
+376,7
@@
class VCLThruHostStackExtendedATestCase(VCLTestCase):
class VCLThruHostStackExtendedBTestCase(VCLTestCase):
class VCLThruHostStackExtendedBTestCase(VCLTestCase):
- """ VCL Thru Host Stack Extended Tests """
+ """ VCL Thru Host Stack Extended
B
Tests """
def setUp(self):
super(VCLThruHostStackExtendedBTestCase, self).setUp()
def setUp(self):
super(VCLThruHostStackExtendedBTestCase, self).setUp()
@@
-384,12
+384,13
@@
class VCLThruHostStackExtendedBTestCase(VCLTestCase):
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 = ["-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",
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]
self.loop0.local_ip4,
self.server_port]
@@
-409,7
+410,7
@@
class VCLThruHostStackExtendedBTestCase(VCLTestCase):
class VCLThruHostStackExtendedCTestCase(VCLTestCase):
class VCLThruHostStackExtendedCTestCase(VCLTestCase):
- """ VCL Thru Host Stack Extended Tests """
+ """ VCL Thru Host Stack Extended
C
Tests """
def setUp(self):
super(VCLThruHostStackExtendedCTestCase, self).setUp()
def setUp(self):
super(VCLThruHostStackExtendedCTestCase, self).setUp()
@@
-423,7
+424,7
@@
class VCLThruHostStackExtendedCTestCase(VCLTestCase):
self.numSockets = "5"
self.client_uni_dir_nsock_test_args = ["-I", self.numSockets,
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]
self.loop0.local_ip4,
self.server_port]
@@
-443,7
+444,7
@@
class VCLThruHostStackExtendedCTestCase(VCLTestCase):
class VCLThruHostStackExtendedDTestCase(VCLTestCase):
class VCLThruHostStackExtendedDTestCase(VCLTestCase):
- """ VCL Thru Host Stack Extended Tests """
+ """ VCL Thru Host Stack Extended
D
Tests """
def setUp(self):
super(VCLThruHostStackExtendedDTestCase, self).setUp()
def setUp(self):
super(VCLThruHostStackExtendedDTestCase, self).setUp()
@@
-457,7
+458,7
@@
class VCLThruHostStackExtendedDTestCase(VCLTestCase):
self.numSockets = "5"
self.client_uni_dir_nsock_test_args = ["-I", self.numSockets,
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]
self.loop0.local_ip4,
self.server_port]
@@
-484,7
+485,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):
@@
-521,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_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.server_ipv6_iperf3_args = ["-V6d", "-s"]
self.client_ipv6_uni_dir_nsock_test_args = ["-6", "-I", "5",
"-U", "-X",
@@
-621,26
+623,26
@@
class VCLIpv6ThruHostStackTestCase(VCLTestCase):
super(VCLIpv6ThruHostStackTestCase, self).tearDown()
super(VCLIpv6ThruHostStackTestCase, self).tearDown()
- @unittest.skipUnless(running_extended_tests(), "part of extended tests")
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 """
- # 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
# TBD: Remove VCLIpv6ThruHostStackExtended*TestCase classes and move
# tests here when VPP thru host teardown/setup config bug
@@
-648,7
+650,7
@@
class VCLIpv6ThruHostStackTestCase(VCLTestCase):
class VCLIpv6ThruHostStackExtendedATestCase(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()
def setUp(self):
super(VCLIpv6ThruHostStackExtendedATestCase, self).setUp()
@@
-682,7
+684,7
@@
class VCLIpv6ThruHostStackExtendedATestCase(VCLTestCase):
class VCLIpv6ThruHostStackExtendedBTestCase(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()
def setUp(self):
super(VCLIpv6ThruHostStackExtendedBTestCase, self).setUp()
@@
-710,13
+712,14
@@
class VCLIpv6ThruHostStackExtendedBTestCase(VCLTestCase):
""" run LDP thru host stack bi-directional (multiple sockets) test """
self.timeout = self.client_bi_dir_nsock_timeout
""" 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):
"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()
def setUp(self):
super(VCLIpv6ThruHostStackExtendedCTestCase, self).setUp()
@@
-745,13
+748,14
@@
class VCLIpv6ThruHostStackExtendedCTestCase(VCLTestCase):
""" run LDP thru host stack uni-directional (multiple sockets) test """
self.timeout = self.client_uni_dir_nsock_timeout
""" 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):
"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()
def setUp(self):
super(VCLIpv6ThruHostStackExtendedDTestCase, self).setUp()
@@
-793,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):