GBP: fixes for l3-out routing

[vpp.git] / extras / vom / vom / vxlan_gbp_tunnel_cmds.cpp

diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp b/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp
index a646eac..db4e7fc 100644 (file)
--- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp
+++ b/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp
@@ -24,9 +24,11 @@ namespace vxlan_gbp_tunnel_cmds {
 create_cmd::create_cmd(HW::item<handle_t>& item,
                        const std::string& name,
                        const vxlan_tunnel::endpoint_t& ep,
+                       bool is_l2,
                        handle_t mcast_itf)
   : interface::create_cmd<vapi::Vxlan_gbp_tunnel_add_del>(item, name)
   , m_ep(ep)
+  , m_is_l2(is_l2)
   , m_mcast_itf(mcast_itf)
 {
 }
@@ -47,10 +49,13 @@ create_cmd::issue(connection& con)
   payload.is_add = 1;
 
   to_api(m_ep.src, payload.tunnel.src);
-  to_api(m_ep.src, payload.tunnel.dst);
+  to_api(m_ep.dst, payload.tunnel.dst);
   payload.tunnel.mcast_sw_if_index = m_mcast_itf.value();
   payload.tunnel.encap_table_id = 0;
   payload.tunnel.vni = m_ep.vni;
+  payload.tunnel.instance = ~0;
+  payload.tunnel.mode =
+    (m_is_l2 ? VXLAN_GBP_API_TUNNEL_MODE_L2 : VXLAN_GBP_API_TUNNEL_MODE_L3);
 
   VAPI_CALL(req.execute());
 
@@ -67,7 +72,8 @@ std::string
 create_cmd::to_string() const
 {
   std::ostringstream s;
-  s << "vxlan-gbp-tunnel-create: " << m_hw_item.to_string() << m_ep.to_string();
+  s << "vxlan-gbp-tunnel-create: " << m_hw_item.to_string() << " "
+    << m_ep.to_string();
 
   return (s.str());
 }
@@ -95,7 +101,7 @@ delete_cmd::issue(connection& con)
   payload.is_add = 0;
 
   to_api(m_ep.src, payload.tunnel.src);
-  to_api(m_ep.src, payload.tunnel.dst);
+  to_api(m_ep.dst, payload.tunnel.dst);
   payload.tunnel.mcast_sw_if_index = ~0;
   payload.tunnel.encap_table_id = 0;
   payload.tunnel.vni = m_ep.vni;