X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fl2_binding_cmds.cpp;h=8769444032c305ccee8b77cb22e4d7b32171cff7;hb=762d83c198c6c24cce4eb94a6d027f520d0b8383;hp=0f91e4b3b7a750d5e945223237d67e017b3d67eb;hpb=164e5f8c63652028ecb9c3570e1ea8618b163071;p=vpp.git

diff --git a/extras/vom/vom/l2_binding_cmds.cpp b/extras/vom/vom/l2_binding_cmds.cpp
index 0f91e4b3b7a..8769444032c 100644
--- a/extras/vom/vom/l2_binding_cmds.cpp
+++ b/extras/vom/vom/l2_binding_cmds.cpp
@@ -20,11 +20,11 @@ namespace l2_binding_cmds {
 bind_cmd::bind_cmd(HW::item<bool>& item,
                    const handle_t& itf,
                    uint32_t bd,
-                   bool is_bvi)
+                   const l2_binding::l2_port_type_t& port_type)
   : rpc_cmd(item)
   , m_itf(itf)
   , m_bd(bd)
-  , m_is_bvi(is_bvi)
+  , m_port_type(port_type)
 {
 }
 
@@ -32,7 +32,7 @@ bool
 bind_cmd::operator==(const bind_cmd& other) const
 {
   return ((m_itf == other.m_itf) && (m_bd == other.m_bd) &&
-          (m_is_bvi == other.m_is_bvi));
+          (m_port_type == other.m_port_type));
 }
 
 rc_t
@@ -44,14 +44,18 @@ bind_cmd::issue(connection& con)
   payload.rx_sw_if_index = m_itf.value();
   payload.bd_id = m_bd;
   payload.shg = 0;
-  payload.bvi = m_is_bvi;
+  if (m_port_type == l2_binding::l2_port_type_t::L2_PORT_TYPE_BVI)
+    payload.port_type = L2_API_PORT_TYPE_BVI;
+  else if (m_port_type == l2_binding::l2_port_type_t::L2_PORT_TYPE_UU_FWD)
+    payload.port_type = L2_API_PORT_TYPE_UU_FWD;
+  else
+    payload.port_type = L2_API_PORT_TYPE_NORMAL;
+
   payload.enable = 1;
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return (rc_t::OK);
+  return (wait());
 }
 
 std::string
@@ -59,7 +63,7 @@ bind_cmd::to_string() const
 {
   std::ostringstream s;
   s << "L2-bind: " << m_hw_item.to_string() << " itf:" << m_itf.to_string()
-    << " bd:" << m_bd;
+    << " bd:" << m_bd << " port-type:" << m_port_type.to_string();
 
   return (s.str());
 }
@@ -67,11 +71,11 @@ bind_cmd::to_string() const
 unbind_cmd::unbind_cmd(HW::item<bool>& item,
                        const handle_t& itf,
                        uint32_t bd,
-                       bool is_bvi)
+                       const l2_binding::l2_port_type_t& port_type)
   : rpc_cmd(item)
   , m_itf(itf)
   , m_bd(bd)
-  , m_is_bvi(is_bvi)
+  , m_port_type(port_type)
 {
 }
 
@@ -79,7 +83,7 @@ bool
 unbind_cmd::operator==(const unbind_cmd& other) const
 {
   return ((m_itf == other.m_itf) && (m_bd == other.m_bd) &&
-          (m_is_bvi == other.m_is_bvi));
+          (m_port_type == other.m_port_type));
 }
 
 rc_t
@@ -91,7 +95,13 @@ unbind_cmd::issue(connection& con)
   payload.rx_sw_if_index = m_itf.value();
   payload.bd_id = m_bd;
   payload.shg = 0;
-  payload.bvi = m_is_bvi;
+  if (m_port_type == l2_binding::l2_port_type_t::L2_PORT_TYPE_BVI)
+    payload.port_type = L2_API_PORT_TYPE_BVI;
+  else if (m_port_type == l2_binding::l2_port_type_t::L2_PORT_TYPE_UU_FWD)
+    payload.port_type = L2_API_PORT_TYPE_UU_FWD;
+  else
+    payload.port_type = L2_API_PORT_TYPE_NORMAL;
+
   payload.enable = 0;
 
   VAPI_CALL(req.execute());
@@ -107,7 +117,7 @@ unbind_cmd::to_string() const
 {
   std::ostringstream s;
   s << "L2-unbind: " << m_hw_item.to_string() << " itf:" << m_itf.to_string()
-    << " bd:" << m_bd;
+    << " bd:" << m_bd << " port-type:" << m_port_type;
 
   return (s.str());
 }
@@ -142,9 +152,7 @@ set_vtr_op_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  wait();
-
-  return (rc_t::OK);
+  return (wait());
 }
 
 std::string