Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
ip: Protocol Independent IP Neighbors
[vpp.git]
/
test
/
test_container.py
diff --git
a/test/test_container.py
b/test/test_container.py
index
99a527b
..
4748053
100644
(file)
--- a/
test/test_container.py
+++ b/
test/test_container.py
@@
-1,4
+1,4
@@
-#!/usr/bin/env python
+#!/usr/bin/env python
3
""" Container integration tests """
import unittest
""" Container integration tests """
import unittest
@@
-21,29
+21,33
@@
class Conn(L4_Conn):
pass
pass
-@unittest.skipUnless(running_extended_tests
()
, "part of extended tests")
+@unittest.skipUnless(running_extended_tests, "part of extended tests")
class ContainerIntegrationTestCase(VppTestCase):
""" Container integration extended testcases """
@classmethod
class ContainerIntegrationTestCase(VppTestCase):
""" Container integration extended testcases """
@classmethod
- def setUpClass(
self
):
- super(ContainerIntegrationTestCase,
self
).setUpClass()
+ def setUpClass(
cls
):
+ super(ContainerIntegrationTestCase,
cls
).setUpClass()
# create pg0 and pg1
# create pg0 and pg1
-
self
.create_pg_interfaces(range(2))
- for i in
self
.pg_interfaces:
+
cls
.create_pg_interfaces(range(2))
+ for i in
cls
.pg_interfaces:
i.admin_up()
i.config_ip4()
i.config_ip6()
i.resolve_arp()
i.resolve_ndp()
i.admin_up()
i.config_ip4()
i.config_ip6()
i.resolve_arp()
i.resolve_ndp()
+ @classmethod
+ def tearDownClass(cls):
+ super(ContainerIntegrationTestCase, cls).tearDownClass()
+
def tearDown(self):
"""Run standard test teardown and log various show commands
"""
super(ContainerIntegrationTestCase, self).tearDown()
def tearDown(self):
"""Run standard test teardown and log various show commands
"""
super(ContainerIntegrationTestCase, self).tearDown()
- if not self.vpp_dead:
- self.logger.info(self.vapi.cli("show ip arp"))
-
self.logger.info(self.vapi.cli("show ip6
neighbors"))
+
+ def show_commands_at_teardown(self):
+
self.logger.info(self.vapi.cli("show ip
neighbors"))
def run_basic_conn_test(self, af, acl_side):
""" Basic connectivity test """
def run_basic_conn_test(self, af, acl_side):
""" Basic connectivity test """
@@
-73,15
+77,15
@@
class ContainerIntegrationTestCase(VppTestCase):
def test_0050_loopback_prepare_test(self):
""" Create loopbacks overlapping with remote addresses """
def test_0050_loopback_prepare_test(self):
""" Create loopbacks overlapping with remote addresses """
- self.create_loopback_interfaces(
range(2)
)
+ self.create_loopback_interfaces(
2
)
for i in range(2):
intf = self.lo_interfaces[i]
intf.admin_up()
for i in range(2):
intf = self.lo_interfaces[i]
intf.admin_up()
- intf.
_
local_ip4 = self.pg_interfaces[i].remote_ip4
- intf.
_
local_ip4_prefix_len = 32
+ intf.local_ip4 = self.pg_interfaces[i].remote_ip4
+ intf.local_ip4_prefix_len = 32
intf.config_ip4()
intf.config_ip4()
- intf.
_
local_ip6 = self.pg_interfaces[i].remote_ip6
- intf.
_
local_ip6_prefix_len = 128
+ intf.local_ip6 = self.pg_interfaces[i].remote_ip6
+ intf.local_ip6_prefix_len = 128
intf.config_ip6()
def test_0110_basic_conn_test(self):
intf.config_ip6()
def test_0110_basic_conn_test(self):