From 9ef1c0adbf9399c55deeede3cf629dd4e8c20304 Mon Sep 17 00:00:00 2001 From: Neale Ranns 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 Signed-off-by: Mohsin Kazmi --- src/vpp-api/vom/l2_binding.hpp | 136 ----------------------------------------- 1 file changed, 136 deletions(-) (limited to 'src/vpp-api/vom/l2_binding.hpp') diff --git a/src/vpp-api/vom/l2_binding.hpp b/src/vpp-api/vom/l2_binding.hpp index 2f65e38b46e..0e6f7fc0d68 100644 --- a/src/vpp-api/vom/l2_binding.hpp +++ b/src/vpp-api/vom/l2_binding.hpp @@ -22,9 +22,7 @@ #include "vom/interface.hpp" #include "vom/object_base.hpp" #include "vom/om.hpp" -#include "vom/rpc_cmd.hpp" #include "vom/singular_db.hpp" -#include "vom/vxlan_tunnel.hpp" namespace VOM { /** @@ -89,140 +87,6 @@ public: */ void set(const l2_vtr_op_t& op, uint16_t tag); - /** - * A functor class that binds L2 configuration to an interface - */ - class bind_cmd - : public rpc_cmd, rc_t, vapi::Sw_interface_set_l2_bridge> - { - public: - /** - * Constructor - */ - bind_cmd(HW::item& item, - const handle_t& itf, - uint32_t bd, - bool is_bvi); - - /** - * 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_cmd& i) const; - - private: - /** - * The interface to bind - */ - const handle_t m_itf; - - /** - * The bridge-domain to bind to - */ - uint32_t m_bd; - - /** - * Is it a BVI interface that is being bound - */ - bool m_is_bvi; - }; - - /** - * A cmd class that Unbinds L2 configuration from an interface - */ - class unbind_cmd - : public rpc_cmd, rc_t, vapi::Sw_interface_set_l2_bridge> - { - public: - /** - * Constructor - */ - unbind_cmd(HW::item& item, - const handle_t& itf, - uint32_t bd, - bool is_bvi); - - /** - * 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_cmd& i) const; - - private: - /** - * The interface to bind - */ - const handle_t m_itf; - - /** - * The bridge-domain to bind to - */ - uint32_t m_bd; - - /** - * Is it a BVI interface that is being bound - */ - bool m_is_bvi; - }; - - /** - * A cmd class sets the VTR operation - */ - class set_vtr_op_cmd : public rpc_cmd, - rc_t, - vapi::L2_interface_vlan_tag_rewrite> - { - public: - /** - * Constructor - */ - set_vtr_op_cmd(HW::item& item, - const handle_t& itf, - uint16_t tag); - - /** - * 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 set_vtr_op_cmd& i) const; - - private: - /** - * The interface to bind - */ - const handle_t m_itf; - - /** - * The tag for the operation - */ - uint16_t m_tag; - }; - private: /** * Class definition for listeners to OM events -- cgit 1.2.3-korg