From 9ef1c0adbf9399c55deeede3cf629dd4e8c20304 Mon Sep 17 00:00:00 2001
From: Neale Ranns <neale.ranns@cisco.com>
Date: Fri, 3 Nov 2017 04:39:05 -0700
Subject: VOM reshuffle

split the VOM into two halves; a top/front-end and a bottom/backend.
Only the backend includes the auto-generated VAPI.
This serves two purposes:
1 - improves ompile times for VOM, since the VAPI is included
    only in the backend.
2 - does not expose VAPI to users of VOM

Change-Id: I17b93aeaef10c0eba8612016d9034aca5628d9f7
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>
Signed-off-by: Mohsin Kazmi <sykazmi@cisco.com>
---
 src/vpp-api/vom/vxlan_tunnel_cmds.cpp | 41 +++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 19 deletions(-)

(limited to 'src/vpp-api/vom/vxlan_tunnel_cmds.cpp')

diff --git a/src/vpp-api/vom/vxlan_tunnel_cmds.cpp b/src/vpp-api/vom/vxlan_tunnel_cmds.cpp
index 9a4a1312c4a..ca4ccf3c38a 100644
--- a/src/vpp-api/vom/vxlan_tunnel_cmds.cpp
+++ b/src/vpp-api/vom/vxlan_tunnel_cmds.cpp
@@ -13,27 +13,29 @@
  * limitations under the License.
  */
 
-#include "vom/vxlan_tunnel.hpp"
+#include "vom/vxlan_tunnel_cmds.hpp"
 
 DEFINE_VAPI_MSG_IDS_VXLAN_API_JSON;
 
 namespace VOM {
-vxlan_tunnel::create_cmd::create_cmd(HW::item<handle_t>& item,
-                                     const std::string& name,
-                                     const endpoint_t& ep)
+namespace vxlan_tunnel_cmds {
+
+create_cmd::create_cmd(HW::item<handle_t>& item,
+                       const std::string& name,
+                       const vxlan_tunnel::endpoint_t& ep)
   : interface::create_cmd<vapi::Vxlan_add_del_tunnel>(item, name)
   , m_ep(ep)
 {
 }
 
 bool
-vxlan_tunnel::create_cmd::operator==(const create_cmd& other) const
+create_cmd::operator==(const create_cmd& other) const
 {
   return (m_ep == other.m_ep);
 }
 
 rc_t
-vxlan_tunnel::create_cmd::issue(connection& con)
+create_cmd::issue(connection& con)
 {
   msg_t req(con.ctx(), std::ref(*this));
 
@@ -52,14 +54,14 @@ vxlan_tunnel::create_cmd::issue(connection& con)
   m_hw_item = wait();
 
   if (m_hw_item) {
-    interface::add(m_name, m_hw_item);
+    insert_interface();
   }
 
   return rc_t::OK;
 }
 
 std::string
-vxlan_tunnel::create_cmd::to_string() const
+create_cmd::to_string() const
 {
   std::ostringstream s;
   s << "vxlan-tunnel-create: " << m_hw_item.to_string() << m_ep.to_string();
@@ -67,21 +69,21 @@ vxlan_tunnel::create_cmd::to_string() const
   return (s.str());
 }
 
-vxlan_tunnel::delete_cmd::delete_cmd(HW::item<handle_t>& item,
-                                     const endpoint_t& ep)
+delete_cmd::delete_cmd(HW::item<handle_t>& item,
+                       const vxlan_tunnel::endpoint_t& ep)
   : interface::delete_cmd<vapi::Vxlan_add_del_tunnel>(item)
   , m_ep(ep)
 {
 }
 
 bool
-vxlan_tunnel::delete_cmd::operator==(const delete_cmd& other) const
+delete_cmd::operator==(const delete_cmd& other) const
 {
   return (m_ep == other.m_ep);
 }
 
 rc_t
-vxlan_tunnel::delete_cmd::issue(connection& con)
+delete_cmd::issue(connection& con)
 {
   msg_t req(con.ctx(), std::ref(*this));
 
@@ -100,12 +102,12 @@ vxlan_tunnel::delete_cmd::issue(connection& con)
   wait();
   m_hw_item.set(rc_t::NOOP);
 
-  interface::remove(m_hw_item);
+  remove_interface();
   return (rc_t::OK);
 }
 
 std::string
-vxlan_tunnel::delete_cmd::to_string() const
+delete_cmd::to_string() const
 {
   std::ostringstream s;
   s << "vxlan-tunnel-delete: " << m_hw_item.to_string() << m_ep.to_string();
@@ -113,18 +115,18 @@ vxlan_tunnel::delete_cmd::to_string() const
   return (s.str());
 }
 
-vxlan_tunnel::dump_cmd::dump_cmd()
+dump_cmd::dump_cmd()
 {
 }
 
 bool
-vxlan_tunnel::dump_cmd::operator==(const dump_cmd& other) const
+dump_cmd::operator==(const dump_cmd& other) const
 {
   return (true);
 }
 
 rc_t
-vxlan_tunnel::dump_cmd::issue(connection& con)
+dump_cmd::issue(connection& con)
 {
   m_dump.reset(new msg_t(con.ctx(), std::ref(*this)));
 
@@ -139,11 +141,12 @@ vxlan_tunnel::dump_cmd::issue(connection& con)
 }
 
 std::string
-vxlan_tunnel::dump_cmd::to_string() const
+dump_cmd::to_string() const
 {
   return ("Vpp-vxlan_tunnels-Dump");
 }
-}
+} // namespace vxlan_tunnel_cmds
+} // namespace VOM
 
 /*
  * fd.io coding-style-patch-verification: ON
-- 
cgit 1.2.3-korg