#include "vom/vxlan_tunnel.hpp"
#include "vom/api_types.hpp"
+#include "vom/interface_cmds.hpp"
#include "vom/logger.hpp"
#include "vom/singular_db_funcs.hpp"
#include "vom/vxlan_gbp_tunnel_cmds.hpp"
vxlan_tunnel::event_handler vxlan_tunnel::m_evh;
const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::STANDARD(0, "standard");
-const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP(0, "GBP");
-const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(0, "GPE");
+const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP_L2(1, "GBP-L2");
+const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP_L3(2, "GBP-L3");
+const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(3, "GPE");
vxlan_tunnel::mode_t::mode_t(int v, const std::string s)
: enum_base<vxlan_tunnel::mode_t>(v, s)
interface::admin_state_t::UP)
, m_tep(src, dst, vni)
, m_mode(mode)
+ , m_mcast_itf()
+ , m_rd()
+ , m_table_id(route::DEFAULT_TABLE)
+{
+}
+
+vxlan_tunnel::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)
+ : interface(mk_name(src, dst, mode, vni),
+ interface::type_t::VXLAN,
+ interface::admin_state_t::UP)
+ , m_tep(src, dst, vni)
+ , m_mode(mode)
+ , m_mcast_itf(mcast_itf.singular())
+ , m_rd()
+ , m_table_id(route::DEFAULT_TABLE)
+{
+}
+
+vxlan_tunnel::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)
+ : interface(mk_name(src, dst, mode, vni),
+ interface::type_t::VXLAN,
+ interface::admin_state_t::UP)
+ , m_tep(src, dst, vni)
+ , m_mode(mode)
+ , m_mcast_itf()
+ , m_rd(rd.singular())
+ , m_table_id(m_rd->table_id())
{
}
: interface(o)
, m_tep(o.m_tep)
, m_mode(o.m_mode)
+ , m_mcast_itf(o.m_mcast_itf)
+ , m_rd(o.m_rd)
+ , m_table_id(o.m_table_id)
{
}
+bool
+vxlan_tunnel::operator==(const vxlan_tunnel& other) const
+{
+ return ((m_tep == other.m_tep) && (m_mode == other.m_mode) &&
+ (m_mcast_itf == other.m_mcast_itf));
+}
+
const handle_t&
vxlan_tunnel::handle() const
{
if (m_hdl) {
if (mode_t::STANDARD == m_mode)
HW::enqueue(new vxlan_tunnel_cmds::delete_cmd(m_hdl, m_tep));
- else if (mode_t::GBP == m_mode)
+ else if (mode_t::GBP_L2 == m_mode || mode_t::GBP_L3 == m_mode)
HW::enqueue(new vxlan_gbp_tunnel_cmds::delete_cmd(m_hdl, m_tep));
}
HW::write();
{
if (m_hdl) {
if (mode_t::STANDARD == m_mode)
- HW::enqueue(new vxlan_tunnel_cmds::create_cmd(m_hdl, name(), m_tep));
- else if (mode_t::GBP == m_mode)
- HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(m_hdl, name(), m_tep));
+ HW::enqueue(new vxlan_tunnel_cmds::create_cmd(
+ m_hdl, name(), m_tep,
+ (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
+ else if (mode_t::GBP_L2 == m_mode)
+ HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
+ m_hdl, name(), m_tep, true,
+ (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
+ else if (mode_t::GBP_L3 == m_mode)
+ HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
+ m_hdl, name(), m_tep, false,
+ (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
+ }
+ if (m_rd && (m_rd->table_id() != route::DEFAULT_TABLE)) {
+ HW::enqueue(
+ new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV4, m_hdl));
+ HW::enqueue(
+ new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV6, m_hdl));
}
}
std::ostringstream s;
s << "vxlan-tunnel: " << m_hdl.to_string() << " " << m_mode.to_string() << " "
<< m_tep.to_string();
+ if (m_mcast_itf)
+ s << " " << m_mcast_itf->to_string();
return (s.str());
}
/*
* the desired state is always that the interface should be created
*/
- if (!m_hdl) {
+ if (rc_t::OK != m_hdl.rc()) {
if (mode_t::STANDARD == m_mode)
- HW::enqueue(new vxlan_tunnel_cmds::create_cmd(m_hdl, name(), m_tep));
- else if (mode_t::GBP == m_mode)
- HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(m_hdl, name(), m_tep));
+ HW::enqueue(new vxlan_tunnel_cmds::create_cmd(
+ m_hdl, name(), m_tep,
+ (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
+ else if (mode_t::GBP_L2 == m_mode)
+ HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
+ m_hdl, name(), m_tep, true,
+ (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
+ else if (mode_t::GBP_L3 == m_mode)
+ HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd(
+ m_hdl, name(), m_tep, false,
+ (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID)));
+ }
+ if (!m_table_id && m_rd) {
+ HW::enqueue(
+ new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV4, m_hdl));
+ HW::enqueue(
+ new interface_cmds::set_table_cmd(m_table_id, l3_proto_t::IPV6, m_hdl));
}
}
boost::asio::ip::address dst = from_api(payload.tunnel.dst);
std::shared_ptr<vxlan_tunnel> vt =
- vxlan_tunnel(src, dst, payload.tunnel.vni, mode_t::GBP).singular();
+ vxlan_tunnel(src, dst, payload.tunnel.vni,
+ (payload.tunnel.mode == VXLAN_GBP_API_TUNNEL_MODE_L2
+ ? mode_t::GBP_L2
+ : mode_t::GBP_L3))
+ .singular();
vt->set(hdl);
VOM_LOG(log_level_t::DEBUG) << "dump: " << vt->to_string();