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: use teps in accept/connect notifications
[vpp.git]
/
test
/
test_vcl.py
diff --git
a/test/test_vcl.py
b/test/test_vcl.py
index
f5a1c9c
..
feb4e39
100644
(file)
--- a/
test/test_vcl.py
+++ b/
test/test_vcl.py
@@
-127,8
+127,6
@@
class VCLTestCase(VppTestCase):
i.set_table_ip4(0)
i.admin_down()
i.set_table_ip4(0)
i.admin_down()
- self.vapi.session_enable_disable(is_enabled=0)
-
def thru_host_stack_ipv6_setup(self):
self.vapi.session_enable_disable(is_enabled=1)
self.create_loopback_interfaces(2)
def thru_host_stack_ipv6_setup(self):
self.vapi.session_enable_disable(is_enabled=1)
self.create_loopback_interfaces(2)
@@
-259,10
+257,12
@@
class LDPCutThruTestCase(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.cut_thru_tear_down()
super(LDPCutThruTestCase, self).tearDown()
self.cut_thru_tear_down()
super(LDPCutThruTestCase, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
@unittest.skipUnless(running_extended_tests, "part of extended tests")
def test_ldp_cut_thru_echo(self):
""" run LDP cut thru echo test """
@unittest.skipUnless(running_extended_tests, "part of extended tests")
def test_ldp_cut_thru_echo(self):
""" run LDP cut thru echo test """
@@
-344,10
+344,11
@@
class VCLCutThruTestCase(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.cut_thru_tear_down()
-
super(VCLCutThruTestCase, self).tearDown()
super(VCLCutThruTestCase, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
def test_vcl_cut_thru_echo(self):
""" run VCL cut thru echo test """
def test_vcl_cut_thru_echo(self):
""" run VCL cut thru echo test """
@@
-396,11
+397,13
@@
class VCLThruHostStackEcho(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show app server"))
- self.logger.debug(self.vapi.cli("show session verbose"))
self.thru_host_stack_tear_down()
super(VCLThruHostStackEcho, self).tearDown()
self.thru_host_stack_tear_down()
super(VCLThruHostStackEcho, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show app server"))
+ self.logger.debug(self.vapi.cli("show session verbose"))
+
class VCLThruHostStackTLS(VCLTestCase):
""" VCL Thru Host Stack TLS """
class VCLThruHostStackTLS(VCLTestCase):
""" VCL Thru Host Stack TLS """
@@
-418,8
+421,8
@@
class VCLThruHostStackTLS(VCLTestCase):
self.thru_host_stack_setup()
self.client_uni_dir_tls_timeout = 20
self.thru_host_stack_setup()
self.client_uni_dir_tls_timeout = 20
- self.server_tls_args = ["-
S
", self.server_port]
- self.client_uni_dir_tls_test_args = ["-N", "1000", "-U", "-X", "-
S
",
+ self.server_tls_args = ["-
L
", self.server_port]
+ self.client_uni_dir_tls_test_args = ["-N", "1000", "-U", "-X", "-
L
",
self.loop0.local_ip4,
self.server_port]
self.loop0.local_ip4,
self.server_port]
@@
-432,11
+435,13
@@
class VCLThruHostStackTLS(VCLTestCase):
self.client_uni_dir_tls_test_args)
def tearDown(self):
self.client_uni_dir_tls_test_args)
def tearDown(self):
- self.logger.debug(self.vapi.cli("show app server"))
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(VCLThruHostStackTLS, self).tearDown()
self.thru_host_stack_tear_down()
super(VCLThruHostStackTLS, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show app server"))
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
class VCLThruHostStackBidirNsock(VCLTestCase):
""" VCL Thru Host Stack Bidir Nsock """
class VCLThruHostStackBidirNsock(VCLTestCase):
""" VCL Thru Host Stack Bidir Nsock """
@@
-463,10
+468,12
@@
class VCLThruHostStackBidirNsock(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(VCLThruHostStackBidirNsock, self).tearDown()
self.thru_host_stack_tear_down()
super(VCLThruHostStackBidirNsock, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
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 """
@@
-507,10
+514,12
@@
class LDPThruHostStackBidirNsock(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(LDPThruHostStackBidirNsock, self).tearDown()
self.thru_host_stack_tear_down()
super(LDPThruHostStackBidirNsock, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
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 """
@@
-620,10
+629,12
@@
class LDPThruHostStackIperf(VCLTestCase):
self.server_iperf3_args = ["-V4d", "-s"]
def tearDown(self):
self.server_iperf3_args = ["-V4d", "-s"]
def tearDown(self):
- self.logger.debug(self.vapi.cli("show session verbose 2"))
self.thru_host_stack_tear_down()
super(LDPThruHostStackIperf, self).tearDown()
self.thru_host_stack_tear_down()
super(LDPThruHostStackIperf, self).tearDown()
+ def show_commands_at_teardown(self):
+ self.logger.debug(self.vapi.cli("show session verbose 2"))
+
def test_ldp_thru_host_stack_iperf3(self):
""" run LDP thru host stack iperf3 test """
def test_ldp_thru_host_stack_iperf3(self):
""" run LDP thru host stack iperf3 test """