GBP: fixes for l3-out routing

[vpp.git] / extras / vom / vom / vxlan_tunnel.hpp

diff --git a/extras/vom/vom/vxlan_tunnel.hpp b/extras/vom/vom/vxlan_tunnel.hpp
index a0b3e9a..4c46e75 100644 (file)
--- a/extras/vom/vom/vxlan_tunnel.hpp
+++ b/extras/vom/vom/vxlan_tunnel.hpp
@@ -49,11 +49,6 @@ public:
                const boost::asio::ip::address& dst,
                uint32_t vni);
 
-    /**
-     * less-than operator for map storage
-     */
-    bool operator<(const endpoint_t& o) const;
-
     /**
      * Comparison operator
      */
@@ -81,20 +76,38 @@ public:
   };
 
   /**
-   * Construct a new object matching the desried state
+   * mode for the tunnel
    */
-  vxlan_tunnel(const boost::asio::ip::address& src,
-               const boost::asio::ip::address& dst,
-               uint32_t vni);
+  struct mode_t : public enum_base<mode_t>
+  {
+    ~mode_t() = default;
+    const static mode_t STANDARD;
+    const static mode_t GBP_L2;
+    const static mode_t GBP_L3;
+    const static mode_t GPE;
+
+  private:
+    mode_t(int v, const std::string s);
+    mode_t() = default;
+  };
 
   /**
-   * Construct a new object matching the desried state with a handle
-   * read from VPP
+   * Construct a new object matching the desried state
    */
-  vxlan_tunnel(const handle_t& hdl,
-               const boost::asio::ip::address& src,
+  vxlan_tunnel(const boost::asio::ip::address& src,
                const boost::asio::ip::address& dst,
-               uint32_t vni);
+               uint32_t vni,
+               const mode_t& mode = mode_t::STANDARD);
+  vxlan_tunnel(const boost::asio::ip::address& src,
+               const boost::asio::ip::address& dst,
+               uint32_t vni,
+               const interface& mcast_itf,
+               const mode_t& mode = mode_t::STANDARD);
+  vxlan_tunnel(const boost::asio::ip::address& src,
+               const boost::asio::ip::address& dst,
+               uint32_t vni,
+               const route_domain& rd,
+               const mode_t& mode = mode_t::STANDARD);
 
   /*
    * Destructor
@@ -106,6 +119,11 @@ public:
    */
   vxlan_tunnel(const vxlan_tunnel& o);
 
+  /**
+   * comparison operator
+   */
+  bool operator==(const vxlan_tunnel& vx) const;
+
   /**
    * Return the matching 'singular instance'
    */
@@ -122,9 +140,9 @@ public:
   const handle_t& handle() const;
 
   /**
-   * Dump all L3Configs into the stream provided
+   * Fond the singular instance of the interface in the DB by key
    */
-  static void dump(std::ostream& os);
+  static std::shared_ptr<vxlan_tunnel> find(const interface::key_t& k);
 
 private:
   /**
@@ -204,15 +222,32 @@ private:
   endpoint_t m_tep;
 
   /**
-   * A map of all VLAN tunnela against thier key
+   * The tunnel mode
+   */
+  mode_t m_mode;
+
+  /**
+   * The interface on which to send the packets if the destination
+   * is multicast
+   */
+  std::shared_ptr<interface> m_mcast_itf;
+
+  /**
+   * The RD an L3 interface is bound to
+   */
+  std::shared_ptr<const route_domain> m_rd;
+
+  /**
+   * HW state of the VPP table mapping
    */
-  static singular_db<endpoint_t, vxlan_tunnel> m_db;
+  HW::item<route::table_id_t> m_table_id;
 
   /**
    * Construct a unique name for the tunnel
    */
   static std::string mk_name(const boost::asio::ip::address& src,
                              const boost::asio::ip::address& dst,
+                             const mode_t& mode,
                              uint32_t vni);
 };