aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/bfd.py10
-rw-r--r--test/framework.py3
-rw-r--r--test/test_bfd.py33
-rw-r--r--test/vpp_object.py21
4 files changed, 47 insertions, 20 deletions
diff --git a/test/bfd.py b/test/bfd.py
index fe63264e731..57a5bd86751 100644
--- a/test/bfd.py
+++ b/test/bfd.py
@@ -145,8 +145,8 @@ class VppBFDUDPSession(VppObject):
session = s
break
if session is None:
- raise Exception(
- "Could not find BFD session in VPP response: %s" % repr(result))
+ raise Exception("Could not find BFD session in VPP response: %s" %
+ repr(result))
return session.state
@property
@@ -185,6 +185,7 @@ class VppBFDUDPSession(VppObject):
self.peer_addr_n,
is_ipv6=is_ipv6)
self._bs_index = result.bs_index
+ self._test.registry.register(self, self.test.logger)
def query_vpp_config(self):
result = self.test.vapi.bfd_udp_session_dump()
@@ -202,7 +203,7 @@ class VppBFDUDPSession(VppObject):
return True
def remove_vpp_config(self):
- if hasattr(self, '_bs_index'):
+ if self._bs_index is not None:
is_ipv6 = 1 if AF_INET6 == self._af else 0
self.test.vapi.bfd_udp_del(
self._interface.sw_if_index,
@@ -213,5 +214,8 @@ class VppBFDUDPSession(VppObject):
def object_id(self):
return "bfd-udp-%d" % self.bs_index
+ def __str__(self):
+ return self.object_id()
+
def admin_up(self):
self.test.vapi.bfd_session_set_flags(self.bs_index, 1)
diff --git a/test/framework.py b/test/framework.py
index e364a8f58be..896a1e0d538 100644
--- a/test/framework.py
+++ b/test/framework.py
@@ -16,6 +16,7 @@ from vpp_papi_provider import VppPapiProvider
from scapy.packet import Raw
from logging import FileHandler, DEBUG
from log import *
+from vpp_object import VppObjectRegistry
"""
Test framework module.
@@ -194,6 +195,7 @@ class VppTestCase(unittest.TestCase):
cls._zombie_captures = []
cls.verbose = 0
cls.vpp_dead = False
+ cls.registry = VppObjectRegistry()
print(double_line_delim)
print(colorize(getdoc(cls).splitlines()[0], YELLOW))
print(double_line_delim)
@@ -290,6 +292,7 @@ class VppTestCase(unittest.TestCase):
self.logger.info(self.vapi.ppcli("show hardware"))
self.logger.info(self.vapi.ppcli("show error"))
self.logger.info(self.vapi.ppcli("show run"))
+ self.registry.remove_vpp_config(self.logger)
def setUp(self):
""" Clear trace before running each test"""
diff --git a/test/test_bfd.py b/test/test_bfd.py
index 4aa99533f41..b6222524a4e 100644
--- a/test/test_bfd.py
+++ b/test/test_bfd.py
@@ -18,14 +18,17 @@ class BFDAPITestCase(VppTestCase):
super(BFDAPITestCase, cls).setUpClass()
try:
- cls.create_pg_interfaces([0])
- cls.pg0.config_ip4()
- cls.pg0.resolve_arp()
+ cls.create_pg_interfaces(range(2))
+ for i in cls.pg_interfaces:
+ i.config_ip4()
+ i.resolve_arp()
except Exception:
super(BFDAPITestCase, cls).tearDownClass()
raise
+
+
def test_add_bfd(self):
""" create a BFD session """
session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
@@ -50,6 +53,16 @@ class BFDAPITestCase(VppTestCase):
raise Exception("Expected failure while adding duplicate "
"configuration")
+ def test_add_two(self):
+ """ create two BFD sessions """
+ session1 = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
+ session1.add_vpp_config()
+ session2 = VppBFDUDPSession(self, self.pg1, self.pg1.remote_ip4)
+ session2.add_vpp_config()
+ self.assertNotEqual(session1.bs_index, session2.bs_index,
+ "Different BFD sessions share bs_index (%s)" %
+ session1.bs_index)
+
def create_packet(interface, ttl=255, src_port=50000, **kwargs):
p = (Ether(src=interface.remote_mac, dst=interface.local_mac) /
@@ -114,6 +127,7 @@ class BFDTestSession(object):
"BFD - your discriminator")
+@unittest.skip("")
class BFDTestCase(VppTestCase):
"""Bidirectional Forwarding Detection (BFD)"""
@@ -135,7 +149,8 @@ class BFDTestCase(VppTestCase):
def setUp(self):
super(BFDTestCase, self).setUp()
self.vapi.want_bfd_events()
- self.vpp_session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4)
+ self.vpp_session = VppBFDUDPSession(
+ self, self.pg0, self.pg0.remote_ip4)
self.vpp_session.add_vpp_config()
self.vpp_session.admin_up()
self.test_session = BFDTestSession(self, self.pg0)
@@ -154,8 +169,10 @@ class BFDTestCase(VppTestCase):
self.logger.debug("BFD: Event: %s" % repr(e))
self.assert_equal(e.bs_index, self.vpp_session.bs_index,
"BFD session index")
- self.assert_equal(e.sw_if_index, self.vpp_session.interface.sw_if_index,
- "BFD interface index")
+ self.assert_equal(
+ e.sw_if_index,
+ self.vpp_session.interface.sw_if_index,
+ "BFD interface index")
is_ipv6 = 0
if self.vpp_session.af == AF_INET6:
is_ipv6 = 1
@@ -286,8 +303,8 @@ class BFDTestCase(VppTestCase):
def test_immediate_remote_min_rx_reduce(self):
""" immediately honor remote min rx reduction """
self.vpp_session.remove_vpp_config()
- self.vpp_session = VppBFDUDPSession(self, self.pg0, self.pg0.remote_ip4,
- desired_min_tx=10000)
+ self.vpp_session = VppBFDUDPSession(
+ self, self.pg0, self.pg0.remote_ip4, desired_min_tx=10000)
self.vpp_session.add_vpp_config()
self.test_session.update(desired_min_tx_interval=1000000,
required_min_rx_interval=1000000)
diff --git a/test/vpp_object.py b/test/vpp_object.py
index 2b71fc1fd39..1997bf55d29 100644
--- a/test/vpp_object.py
+++ b/test/vpp_object.py
@@ -42,13 +42,13 @@ class VppObjectRegistry(object):
if not hasattr(self, "_object_dict"):
self._object_dict = dict()
- def register(self, o):
+ def register(self, o, logger):
""" Register an object in the registry. """
- if not o.unique_id() in self._object_dict:
+ if not o.object_id() in self._object_dict:
self._object_registry.append(o)
- self._object_dict[o.unique_id()] = o
+ self._object_dict[o.object_id()] = o
else:
- print "not adding duplicate %s" % o
+ logger.debug("REG: duplicate add, ignoring (%s)" % o)
def remove_vpp_config(self, logger):
"""
@@ -56,15 +56,18 @@ class VppObjectRegistry(object):
from the registry.
"""
if not self._object_registry:
- logger.info("No objects registered for auto-cleanup.")
+ logger.info("REG: No objects registered for auto-cleanup.")
return
- logger.info("Removing VPP configuration for registered objects")
+ logger.info("REG: Removing VPP configuration for registered objects")
+ # remove the config in reverse order as there might be dependencies
for o in reversed(self._object_registry):
if o.query_vpp_config():
- logger.info("Removing %s", o)
+ logger.info("REG: Removing configuration for %s" % o)
o.remove_vpp_config()
else:
- logger.info("Skipping %s, configuration not present", o)
+ logger.info(
+ "REG: Skipping removal for %s, configuration not present" %
+ o)
failed = []
for o in self._object_registry:
if o.query_vpp_config():
@@ -72,7 +75,7 @@ class VppObjectRegistry(object):
self._object_registry = []
self._object_dict = dict()
if failed:
- logger.error("Couldn't remove configuration for object(s):")
+ logger.error("REG: Couldn't remove configuration for object(s):")
for x in failed:
logger.error(repr(x))
raise Exception("Couldn't remove configuration for object(s): %s" %