A bit of buffer metadata reshuffling to accommodate flow_id

[vpp.git] / src / vpp-api / vom / bridge_domain_entry_cmds.cpp

diff --git a/src/vpp-api/vom/bridge_domain_entry_cmds.cpp b/src/vpp-api/vom/bridge_domain_entry_cmds.cpp
index 990af06..f2a3ed9 100644 (file)
--- a/src/vpp-api/vom/bridge_domain_entry_cmds.cpp
+++ b/src/vpp-api/vom/bridge_domain_entry_cmds.cpp
@@ -13,29 +13,32 @@
  * limitations under the License.
  */
 
-#include "vom/bridge_domain_entry.hpp"
+#include "vom/bridge_domain_entry_cmds.hpp"
 
 namespace VOM {
-bridge_domain_entry::create_cmd::create_cmd(HW::item<bool>& item,
-                                            const mac_address_t& mac,
-                                            uint32_t bd,
-                                            handle_t tx_itf)
+namespace bridge_domain_entry_cmds {
+create_cmd::create_cmd(HW::item<bool>& item,
+                       const mac_address_t& mac,
+                       uint32_t bd,
+                       handle_t tx_itf,
+                       bool is_bvi)
   : rpc_cmd(item)
   , m_mac(mac)
   , m_bd(bd)
   , m_tx_itf(tx_itf)
+  , m_is_bvi(is_bvi)
 {
 }
 
 bool
-bridge_domain_entry::create_cmd::operator==(const create_cmd& other) const
+create_cmd::operator==(const create_cmd& other) const
 {
   return ((m_mac == other.m_mac) && (m_tx_itf == other.m_tx_itf) &&
-          (m_bd == other.m_bd));
+          (m_bd == other.m_bd) && (m_is_bvi == other.m_is_bvi));
 }
 
 rc_t
-bridge_domain_entry::create_cmd::issue(connection& con)
+create_cmd::issue(connection& con)
 {
   msg_t req(con.ctx(), std::ref(*this));
 
@@ -44,6 +47,7 @@ bridge_domain_entry::create_cmd::issue(connection& con)
   payload.is_add = 1;
   m_mac.to_bytes(payload.mac, 6);
   payload.sw_if_index = m_tx_itf.value();
+  payload.bvi_mac = m_is_bvi;
 
   VAPI_CALL(req.execute());
 
@@ -53,40 +57,45 @@ bridge_domain_entry::create_cmd::issue(connection& con)
 }
 
 std::string
-bridge_domain_entry::create_cmd::to_string() const
+create_cmd::to_string() const
 {
   std::ostringstream s;
   s << "bridge-domain-entry-create: " << m_hw_item.to_string() << " bd:" << m_bd
-    << " mac:" << m_mac.to_string() << " tx:" << m_tx_itf;
+    << " mac:" << m_mac.to_string() << " tx:" << m_tx_itf
+    << " bvi:" << m_is_bvi;
 
   return (s.str());
 }
 
-bridge_domain_entry::delete_cmd::delete_cmd(HW::item<bool>& item,
-                                            const mac_address_t& mac,
-                                            uint32_t bd)
+delete_cmd::delete_cmd(HW::item<bool>& item,
+                       const mac_address_t& mac,
+                       uint32_t bd,
+                       bool is_bvi)
   : rpc_cmd(item)
   , m_mac(mac)
   , m_bd(bd)
+  , m_is_bvi(is_bvi)
 {
 }
 
 bool
-bridge_domain_entry::delete_cmd::operator==(const delete_cmd& other) const
+delete_cmd::operator==(const delete_cmd& other) const
 {
-  return ((m_mac == other.m_mac) && (m_bd == other.m_bd));
+  return ((m_mac == other.m_mac) && (m_bd == other.m_bd) &&
+          (m_is_bvi == other.m_is_bvi));
 }
 
 rc_t
-bridge_domain_entry::delete_cmd::issue(connection& con)
+delete_cmd::issue(connection& con)
 {
   msg_t req(con.ctx(), std::ref(*this));
 
   auto& payload = req.get_request().get_payload();
   payload.bd_id = m_bd;
-  payload.is_add = 1;
+  payload.is_add = 0;
   m_mac.to_bytes(payload.mac, 6);
   payload.sw_if_index = ~0;
+  payload.bvi_mac = m_is_bvi;
 
   VAPI_CALL(req.execute());
 
@@ -97,27 +106,27 @@ bridge_domain_entry::delete_cmd::issue(connection& con)
 }
 
 std::string
-bridge_domain_entry::delete_cmd::to_string() const
+delete_cmd::to_string() const
 {
   std::ostringstream s;
   s << "bridge-domain-entry-delete: " << m_hw_item.to_string() << " bd:" << m_bd
-    << " mac:" << m_mac.to_string();
+    << " mac:" << m_mac.to_string() << " bvi:" << m_is_bvi;
 
   return (s.str());
 }
 
-bridge_domain_entry::dump_cmd::dump_cmd()
+dump_cmd::dump_cmd()
 {
 }
 
 bool
-bridge_domain_entry::dump_cmd::operator==(const dump_cmd& other) const
+dump_cmd::operator==(const dump_cmd& other) const
 {
   return (true);
 }
 
 rc_t
-bridge_domain_entry::dump_cmd::issue(connection& con)
+dump_cmd::issue(connection& con)
 {
   m_dump.reset(new msg_t(con.ctx(), std::ref(*this)));
 
@@ -132,11 +141,12 @@ bridge_domain_entry::dump_cmd::issue(connection& con)
 }
 
 std::string
-bridge_domain_entry::dump_cmd::to_string() const
+dump_cmd::to_string() const
 {
   return ("bridge-domain-entry-dump");
 }
 }
+}
 
 /*
  * fd.io coding-style-patch-verification: ON