1 files changed, 2 insertions, 122 deletions
diff --git a/src/vpp-api/vom/nat_binding.hpp b/src/vpp-api/vom/nat_binding.hpp
index 6e871f9aa91..2f6d67f907f 100644
--- a/src/vpp-api/vom/nat_binding.hpp
+++ b/src/vpp-api/vom/nat_binding.hpp
@@ -20,14 +20,11 @@
 #include "vom/interface.hpp"
 #include "vom/object_base.hpp"
 #include "vom/om.hpp"
-#include "vom/rpc_cmd.hpp"
 #include "vom/singular_db.hpp"
 
-#include <vapi/nat.api.vapi.hpp>
-
 namespace VOM {
 /**
- * A Clas representing the binding of an L2 interface to a bridge-domain
+ * A Class representing the binding of an L2 interface to a bridge-domain
  * and the properties of that binding.
  */
 class nat_binding : public object_base
@@ -104,123 +101,6 @@ public:
    */
   static void dump(std::ostream& os);
 
-  /**
-   * A functor class that binds L2 configuration to an interface
-   */
-  class bind_44_input_cmd
-    : public rpc_cmd<HW::item<bool>,
-                     rc_t,
-                     vapi::Nat44_interface_add_del_feature>
-  {
-  public:
-    /**
-     * Constructor
-     */
-    bind_44_input_cmd(HW::item<bool>& item,
-                      const handle_t& itf,
-                      const zone_t& zone);
-
-    /**
-     * Issue the command to VPP/HW
-     */
-    rc_t issue(connection& con);
-    /**
-     * convert to string format for debug purposes
-     */
-    std::string to_string() const;
-
-    /**
-     * Comparison operator - only used for UT
-     */
-    bool operator==(const bind_44_input_cmd& i) const;
-
-  private:
-    /**
-     * The interface to bind
-     */
-    const handle_t m_itf;
-
-    /**
-     * The zone the interface is in
-     */
-    const zone_t m_zone;
-  };
-
-  /**
-   * A cmd class that Unbinds L2 configuration from an interface
-   */
-  class unbind_44_input_cmd
-    : public rpc_cmd<HW::item<bool>,
-                     rc_t,
-                     vapi::Nat44_interface_add_del_feature>
-  {
-  public:
-    /**
-     * Constructor
-     */
-    unbind_44_input_cmd(HW::item<bool>& item,
-                        const handle_t& itf,
-                        const zone_t& zone);
-
-    /**
-     * Issue the command to VPP/HW
-     */
-    rc_t issue(connection& con);
-    /**
-     * convert to string format for debug purposes
-     */
-    std::string to_string() const;
-
-    /**
-     * Comparison operator - only used for UT
-     */
-    bool operator==(const unbind_44_input_cmd& i) const;
-
-  private:
-    /**
-     * The interface to bind
-     */
-    const handle_t m_itf;
-
-    /**
-     * The zone the interface is in
-     */
-    const zone_t m_zone;
-  };
-
-  /**
-   * A cmd class that Dumps all the nat_statics
-   */
-  class dump_44_cmd : public dump_cmd<vapi::Nat44_interface_dump>
-  {
-  public:
-    /**
-     * Constructor
-     */
-    dump_44_cmd();
-    dump_44_cmd(const dump_44_cmd& d);
-
-    /**
-     * Issue the command to VPP/HW
-     */
-    rc_t issue(connection& con);
-    /**
-     * convert to string format for debug purposes
-     */
-    std::string to_string() const;
-
-    /**
-     * Comparison operator - only used for UT
-     */
-    bool operator==(const dump_44_cmd& i) const;
-
-  private:
-    /**
-     * HW reutrn code
-     */
-    HW::item<bool> item;
-  };
-
 private:
   /**
    * Class definition for listeners to OM events
@@ -290,7 +170,7 @@ private:
   /**
    * HW configuration for the binding. The bool representing the
    * do/don't bind.
- */
+   */
   HW::item<bool> m_binding;
 
   /**