X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Fvxlan_tunnel.cpp;h=e37d160e92b312c66790141c41faa54c9d4f1d95;hp=248aadfeadec54f920405dd1160864d2bbe5ff33;hb=7c0eb56f4;hpb=038243064ba0a6b587213ba56fffd9e3fddcf0ee diff --git a/extras/vom/vom/vxlan_tunnel.cpp b/extras/vom/vom/vxlan_tunnel.cpp index 248aadfeade..e37d160e92b 100644 --- a/extras/vom/vom/vxlan_tunnel.cpp +++ b/extras/vom/vom/vxlan_tunnel.cpp @@ -15,6 +15,7 @@ #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" @@ -26,13 +27,13 @@ const std::string VXLAN_TUNNEL_NAME = "vxlan-tunnel-itf"; 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(1, "GBP"); -const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(2, "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(v, s) -{ -} +{} vxlan_tunnel::endpoint_t::endpoint_t(const boost::asio::ip::address& src, const boost::asio::ip::address& dst, @@ -40,15 +41,13 @@ vxlan_tunnel::endpoint_t::endpoint_t(const boost::asio::ip::address& src, : src(src) , dst(dst) , vni(vni) -{ -} +{} vxlan_tunnel::endpoint_t::endpoint_t() : src() , dst() , vni(0) -{ -} +{} bool vxlan_tunnel::endpoint_t::operator==(const endpoint_t& other) const @@ -92,8 +91,9 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src, , 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, @@ -106,16 +106,33 @@ vxlan_tunnel::vxlan_tunnel(const boost::asio::ip::address& src, , 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()) +{} vxlan_tunnel::vxlan_tunnel(const vxlan_tunnel& o) : 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 @@ -142,7 +159,7 @@ vxlan_tunnel::sweep() 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(); @@ -154,13 +171,31 @@ vxlan_tunnel::replay() if (m_hdl) { if (mode_t::STANDARD == m_mode) HW::enqueue(new vxlan_tunnel_cmds::create_cmd( - m_hdl, name(), m_tep, + 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 == m_mode) + else if (mode_t::GBP_L3 == m_mode) HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd( - m_hdl, name(), m_tep, + 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)); + } } vxlan_tunnel::~vxlan_tunnel() @@ -190,12 +225,30 @@ vxlan_tunnel::update(const vxlan_tunnel& desired) 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, + m_hdl, + name(), + m_tep, (m_mcast_itf ? m_mcast_itf->handle() : handle_t::INVALID))); - else if (mode_t::GBP == m_mode) + else if (mode_t::GBP_L2 == m_mode) HW::enqueue(new vxlan_gbp_tunnel_cmds::create_cmd( - m_hdl, name(), m_tep, + 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)); } } @@ -228,9 +281,9 @@ vxlan_tunnel::event_handler::handle_populate(const client_db::key_t& key) auto& payload = record.get_payload(); handle_t hdl(payload.sw_if_index); boost::asio::ip::address src = - from_bytes(payload.is_ipv6, payload.src_address); + from_bytes(payload.src_address.af, (uint8_t*)&payload.src_address.un); boost::asio::ip::address dst = - from_bytes(payload.is_ipv6, payload.dst_address); + from_bytes(payload.dst_address.af, (uint8_t*)&payload.dst_address.un); std::shared_ptr vt = vxlan_tunnel(src, dst, payload.vni).singular(); @@ -255,7 +308,13 @@ vxlan_tunnel::event_handler::handle_populate(const client_db::key_t& key) boost::asio::ip::address dst = from_api(payload.tunnel.dst); std::shared_ptr 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();