Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: fib api updates
[vpp.git]
/
test
/
test_vcl.py
diff --git
a/test/test_vcl.py
b/test/test_vcl.py
index
7705fdc
..
18279e9
100644
(file)
--- a/
test/test_vcl.py
+++ b/
test/test_vcl.py
@@
-7,7
+7,7
@@
import subprocess
import signal
from framework import VppTestCase, VppTestRunner, running_extended_tests, \
Worker
import signal
from framework import VppTestCase, VppTestRunner, running_extended_tests, \
Worker
-from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath,
Dpo
Proto
+from vpp_ip_route import VppIpTable, VppIpRoute, VppRoutePath,
FibPath
Proto
class VCLAppWorker(Worker):
class VCLAppWorker(Worker):
@@
-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)
@@
-154,14
+152,12
@@
class VCLTestCase(VppTestCase):
# Add inter-table routes
ip_t01 = VppIpRoute(self, self.loop1.local_ip6, 128,
[VppRoutePath("::0", 0xffffffff,
# Add inter-table routes
ip_t01 = VppIpRoute(self, self.loop1.local_ip6, 128,
[VppRoutePath("::0", 0xffffffff,
- nh_table_id=2,
- proto=DpoProto.DPO_PROTO_IP6)],
- table_id=1, is_ip6=1)
+ nh_table_id=2)],
+ table_id=1)
ip_t10 = VppIpRoute(self, self.loop0.local_ip6, 128,
[VppRoutePath("::0", 0xffffffff,
ip_t10 = VppIpRoute(self, self.loop0.local_ip6, 128,
[VppRoutePath("::0", 0xffffffff,
- nh_table_id=1,
- proto=DpoProto.DPO_PROTO_IP6)],
- table_id=2, is_ip6=1)
+ nh_table_id=1)],
+ table_id=2)
ip_t01.add_vpp_config()
ip_t10.add_vpp_config()
self.logger.debug(self.vapi.cli("show interface addr"))
ip_t01.add_vpp_config()
ip_t10.add_vpp_config()
self.logger.debug(self.vapi.cli("show interface addr"))
@@
-204,7
+200,7
@@
class VCLTestCase(VppTestCase):
if os.path.isdir('/proc/{}'.format(worker_server.process.pid)):
self.logger.info("Killing server worker process (pid %d)" %
worker_server.process.pid)
if os.path.isdir('/proc/{}'.format(worker_server.process.pid)):
self.logger.info("Killing server worker process (pid %d)" %
worker_server.process.pid)
- os.killpg(os.getpgid(worker_server.process.pid), signal.SIG
KILL
)
+ os.killpg(os.getpgid(worker_server.process.pid), signal.SIG
TERM
)
worker_server.join()
self.logger.info("Client worker result is `%s'" % worker_client.result)
error = False
worker_server.join()
self.logger.info("Client worker result is `%s'" % worker_client.result)
error = False
@@
-217,7
+213,7
@@
class VCLTestCase(VppTestCase):
os.killpg(os.getpgid(worker_client.process.pid),
signal.SIGKILL)
worker_client.join()
os.killpg(os.getpgid(worker_client.process.pid),
signal.SIGKILL)
worker_client.join()
- except:
+ except
OSError
:
self.logger.debug(
"Couldn't kill client worker process")
raise
self.logger.debug(
"Couldn't kill client worker process")
raise
@@
-259,8
+255,8
@@
class LDPCutThruTestCase(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.cut_thru_tear_down()
super(LDPCutThruTestCase, self).tearDown()
super(LDPCutThruTestCase, self).tearDown()
+ self.cut_thru_tear_down()
def show_commands_at_teardown(self):
self.logger.debug(self.vapi.cli("show session verbose 2"))
def show_commands_at_teardown(self):
self.logger.debug(self.vapi.cli("show session verbose 2"))
@@
-697,9
+693,8
@@
class LDPIpv6CutThruTestCase(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.cut_thru_tear_down()
-
super(LDPIpv6CutThruTestCase, self).tearDown()
super(LDPIpv6CutThruTestCase, self).tearDown()
+ self.cut_thru_tear_down()
def test_ldp_ipv6_cut_thru_echo(self):
""" run LDP IPv6 cut thru echo test """
def test_ldp_ipv6_cut_thru_echo(self):
""" run LDP IPv6 cut thru echo test """
@@
-776,9
+771,8
@@
class VCLIpv6CutThruTestCase(VCLTestCase):
self.server_port]
def tearDown(self):
self.server_port]
def tearDown(self):
- self.cut_thru_tear_down()
-
super(VCLIpv6CutThruTestCase, self).tearDown()
super(VCLIpv6CutThruTestCase, self).tearDown()
+ self.cut_thru_tear_down()
def test_vcl_ipv6_cut_thru_echo(self):
""" run VCL IPv6 cut thru echo test """
def test_vcl_ipv6_cut_thru_echo(self):
""" run VCL IPv6 cut thru echo test """