From 088f0e221c05b7b1cd59b61442eaf595e22e2fef Mon Sep 17 00:00:00 2001 From: Neale Ranns Date: Fri, 1 Dec 2017 00:19:43 -0800 Subject: VOM: fixes for interface recreate on agent restart and L2 re-binding Change-Id: I14c838ee99f9bc2db66bb2e775039d2cb2e7924f Signed-off-by: Neale Ranns --- src/vpp-api/vom/l2_binding.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/vpp-api/vom/l2_binding.cpp') diff --git a/src/vpp-api/vom/l2_binding.cpp b/src/vpp-api/vom/l2_binding.cpp index cc0e84a5492..749557ce3cd 100644 --- a/src/vpp-api/vom/l2_binding.cpp +++ b/src/vpp-api/vom/l2_binding.cpp @@ -152,17 +152,28 @@ void l2_binding::update(const l2_binding& desired) { /* - * the desired state is always that the interface should be created - */ + * the desired state is always that the interface should be created + */ if (rc_t::OK != m_binding.rc()) { HW::enqueue( new l2_binding_cmds::bind_cmd(m_binding, m_itf->handle(), m_bd->id(), interface::type_t::BVI == m_itf->type())); + } else if (!(*m_bd == *desired.m_bd)) { + /* + * re-binding to a different BD. do unbind, bind. + */ + HW::enqueue( + new l2_binding_cmds::unbind_cmd(m_binding, m_itf->handle(), m_bd->id(), + interface::type_t::BVI == m_itf->type())); + m_bd = desired.m_bd; + HW::enqueue( + new l2_binding_cmds::bind_cmd(m_binding, m_itf->handle(), m_bd->id(), + interface::type_t::BVI == m_itf->type())); } /* - * set the VTR operation is request - */ + * set the VTR operation if request + */ if (m_vtr_op.update(desired.m_vtr_op)) { HW::enqueue(new l2_binding_cmds::set_vtr_op_cmd(m_vtr_op, m_itf->handle(), m_vtr_op_tag)); -- cgit 1.2.3-korg