aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/vnet/bfd/bfd_api.c43
-rw-r--r--src/vnet/bfd/bfd_api.h3
-rw-r--r--src/vnet/bfd/bfd_udp.c12
-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
7 files changed, 76 insertions, 49 deletions
diff --git a/src/vnet/bfd/bfd_api.c b/src/vnet/bfd/bfd_api.c
index 126cf29a801..2e63fe90d78 100644
--- a/src/vnet/bfd/bfd_api.c
+++ b/src/vnet/bfd/bfd_api.c
@@ -43,12 +43,12 @@
#include <vlibapi/api_helper_macros.h>
-#define foreach_vpe_api_msg \
-_(BFD_UDP_ADD, bfd_udp_add) \
-_(BFD_UDP_DEL, bfd_udp_del) \
-_(BFD_UDP_SESSION_DUMP, bfd_udp_session_dump) \
-_(BFD_SESSION_SET_FLAGS, bfd_session_set_flags) \
-_(WANT_BFD_EVENTS, want_bfd_events)
+#define foreach_vpe_api_msg \
+ _ (BFD_UDP_ADD, bfd_udp_add) \
+ _ (BFD_UDP_DEL, bfd_udp_del) \
+ _ (BFD_UDP_SESSION_DUMP, bfd_udp_session_dump) \
+ _ (BFD_SESSION_SET_FLAGS, bfd_session_set_flags) \
+ _ (WANT_BFD_EVENTS, want_bfd_events)
pub_sub_handler (bfd_events, BFD_EVENTS);
@@ -75,13 +75,16 @@ vl_api_bfd_udp_add_t_handler (vl_api_bfd_udp_add_t * mp)
clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
}
+ u32 bs_index = 0;
rv = bfd_udp_add_session (clib_net_to_host_u32 (mp->sw_if_index),
clib_net_to_host_u32 (mp->desired_min_tx),
clib_net_to_host_u32 (mp->required_min_rx),
- mp->detect_mult, &local_addr, &peer_addr);
+ mp->detect_mult, &local_addr, &peer_addr,
+ &bs_index);
BAD_SW_IF_INDEX_LABEL;
- REPLY_MACRO (VL_API_BFD_UDP_ADD_REPLY);
+ REPLY_MACRO2 (VL_API_BFD_UDP_ADD_REPLY,
+ rmp->bs_index = clib_host_to_net_u32 (bs_index));
}
static void
@@ -107,9 +110,8 @@ vl_api_bfd_udp_del_t_handler (vl_api_bfd_udp_del_t * mp)
clib_memcpy (&peer_addr.ip4, mp->peer_addr, sizeof (peer_addr.ip4));
}
- rv =
- bfd_udp_del_session (clib_net_to_host_u32 (mp->sw_if_index), &local_addr,
- &peer_addr);
+ rv = bfd_udp_del_session (clib_net_to_host_u32 (mp->sw_if_index),
+ &local_addr, &peer_addr);
BAD_SW_IF_INDEX_LABEL;
REPLY_MACRO (VL_API_BFD_UDP_DEL_REPLY);
@@ -201,14 +203,12 @@ vl_api_bfd_session_set_flags_t_handler (vl_api_bfd_session_set_flags_t * mp)
vl_api_bfd_session_set_flags_reply_t *rmp;
int rv;
- rv =
- bfd_session_set_flags (clib_net_to_host_u32 (mp->bs_index),
- mp->admin_up_down);
+ rv = bfd_session_set_flags (clib_net_to_host_u32 (mp->bs_index),
+ mp->admin_up_down);
REPLY_MACRO (VL_API_BFD_SESSION_SET_FLAGS_REPLY);
}
-
/*
* bfd_api_hookup
* Add vpe's API message handlers to the table.
@@ -223,7 +223,7 @@ vl_api_bfd_session_set_flags_t_handler (vl_api_bfd_session_set_flags_t * mp)
static void
setup_message_id_table (api_main_t * am)
{
-#define _(id,n,crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
+#define _(id, n, crc) vl_msg_api_add_msg_name_crc (am, #n "_" #crc, id);
foreach_vl_msg_name_crc_bfd;
#undef _
}
@@ -233,13 +233,10 @@ bfd_api_hookup (vlib_main_t * vm)
{
api_main_t *am = &api_main;
-#define _(N,n) \
- vl_msg_api_set_handlers(VL_API_##N, #n, \
- vl_api_##n##_t_handler, \
- vl_noop_handler, \
- vl_api_##n##_t_endian, \
- vl_api_##n##_t_print, \
- sizeof(vl_api_##n##_t), 1);
+#define _(N, n) \
+ vl_msg_api_set_handlers (VL_API_##N, #n, vl_api_##n##_t_handler, \
+ vl_noop_handler, vl_api_##n##_t_endian, \
+ vl_api_##n##_t_print, sizeof (vl_api_##n##_t), 1);
foreach_vpe_api_msg;
#undef _
diff --git a/src/vnet/bfd/bfd_api.h b/src/vnet/bfd/bfd_api.h
index cfcd04f3f50..a9bc5a1f40c 100644
--- a/src/vnet/bfd/bfd_api.h
+++ b/src/vnet/bfd/bfd_api.h
@@ -27,7 +27,8 @@
vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
u32 required_min_rx_us, u8 detect_mult,
const ip46_address_t * local_addr,
- const ip46_address_t * peer_addr);
+ const ip46_address_t * peer_addr,
+ u32 * bs_index);
vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
const ip46_address_t * local_addr,
diff --git a/src/vnet/bfd/bfd_udp.c b/src/vnet/bfd/bfd_udp.c
index 677f1e22ef7..c1596bf6012 100644
--- a/src/vnet/bfd/bfd_udp.c
+++ b/src/vnet/bfd/bfd_udp.c
@@ -95,7 +95,7 @@ static vnet_api_error_t
bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index,
u32 desired_min_tx_us, u32 required_min_rx_us,
u8 detect_mult, const ip46_address_t *local_addr,
- const ip46_address_t *peer_addr)
+ const ip46_address_t *peer_addr, u32 *bs_index)
{
vnet_sw_interface_t *sw_if =
vnet_get_sw_interface (vnet_get_main (), sw_if_index);
@@ -149,6 +149,7 @@ bfd_udp_add_session_internal (bfd_udp_main_t *bum, u32 sw_if_index,
bs->required_min_echo_rx_us = required_min_rx_us; /* FIXME */
bs->local_detect_mult = detect_mult;
bfd_session_start (bum->bfd_main, bs);
+ *bs_index = bs->bs_idx;
return 0;
}
@@ -224,7 +225,8 @@ bfd_udp_validate_api_input (u32 sw_if_index, const ip46_address_t *local_addr,
vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
u32 required_min_rx_us, u8 detect_mult,
const ip46_address_t *local_addr,
- const ip46_address_t *peer_addr)
+ const ip46_address_t *peer_addr,
+ u32 *bs_index)
{
vnet_api_error_t rv =
bfd_udp_validate_api_input (sw_if_index, local_addr, peer_addr);
@@ -242,9 +244,9 @@ vnet_api_error_t bfd_udp_add_session (u32 sw_if_index, u32 desired_min_tx_us,
BFD_ERR ("desired_min_tx_us < 1");
return VNET_API_ERROR_INVALID_ARGUMENT;
}
- return bfd_udp_add_session_internal (&bfd_udp_main, sw_if_index,
- desired_min_tx_us, required_min_rx_us,
- detect_mult, local_addr, peer_addr);
+ return bfd_udp_add_session_internal (
+ &bfd_udp_main, sw_if_index, desired_min_tx_us, required_min_rx_us,
+ detect_mult, local_addr, peer_addr, bs_index);
}
vnet_api_error_t bfd_udp_del_session (u32 sw_if_index,
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" %