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>

1 files changed, 7 insertions, 3 deletions

diff --git a/src/vpp-api/vom/nat_binding.cpp b/src/vpp-api/vom/nat_binding.cpp
index beb76bd8494..ce73ae44b54 100644
--- a/src/vpp-api/vom/nat_binding.cpp
+++ b/src/vpp-api/vom/nat_binding.cpp
@@ -15,6 +15,7 @@
 
 #include "vom/nat_binding.hpp"
 #include "vom/cmd.hpp"
+#include "vom/nat_binding_cmds.hpp"
 
 namespace VOM {
 singular_db<const nat_binding::key_t, nat_binding> nat_binding::m_db;
@@ -64,7 +65,8 @@ nat_binding::sweep()
 {
   if (m_binding) {
     if (direction_t::INPUT == m_dir) {
-      HW::enqueue(new unbind_44_input_cmd(m_binding, m_itf->handle(), m_zone));
+      HW::enqueue(new nat_binding_cmds::unbind_44_input_cmd(
+        m_binding, m_itf->handle(), m_zone));
     } else {
       assert(!"Unimplemented");
     }
@@ -77,7 +79,8 @@ nat_binding::replay()
 {
   if (m_binding) {
     if (direction_t::INPUT == m_dir) {
-      HW::enqueue(new bind_44_input_cmd(m_binding, m_itf->handle(), m_zone));
+      HW::enqueue(new nat_binding_cmds::bind_44_input_cmd(
+        m_binding, m_itf->handle(), m_zone));
     } else {
       assert(!"Unimplemented");
     }
@@ -92,7 +95,8 @@ nat_binding::update(const nat_binding& desired)
  */
   if (!m_binding) {
     if (direction_t::INPUT == m_dir) {
-      HW::enqueue(new bind_44_input_cmd(m_binding, m_itf->handle(), m_zone));
+      HW::enqueue(new nat_binding_cmds::bind_44_input_cmd(
+        m_binding, m_itf->handle(), m_zone));
     } else {
       assert(!"Unimplemented");
     }