diff options
| author |   Neale Ranns <nranns@cisco.com> | 2018-12-19 04:25:52 -0800 |
|---|---|---|
| committer | Neale Ranns <nranns@cisco.com> | 2018-12-19 15:27:10 +0000 |
| commit | 4079161fd9182a356b7b845d66bc5314ee880715 (patch) | |
| tree | 7a76d2a35247cc399de8ce1a7b47416be59c9116 | |
| parent | 0f144378fb636e371fbe42fa6939396d145c0def (diff) | |
VOM: VXLAN-GBP command fixes
Change-Id: Ie1c672a83bca15ce7b6b9354ede1f36f8fef8e74
Signed-off-by: Neale Ranns <nranns@cisco.com>
| -rw-r--r-- | extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp | 8 | ||||
| -rw-r--r-- | extras/vom/vom/vxlan_tunnel.cpp | 4 | ||||
| -rw-r--r-- | extras/vom/vom/vxlan_tunnel_cmds.cpp | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp b/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp index a646eac34a0..24d1883ed75 100644 --- a/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp +++ b/extras/vom/vom/vxlan_gbp_tunnel_cmds.cpp @@ -47,10 +47,11 @@ 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; VAPI_CALL(req.execute()); @@ -67,7 +68,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 +97,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; diff --git a/extras/vom/vom/vxlan_tunnel.cpp b/extras/vom/vom/vxlan_tunnel.cpp index 2bc386c1ba7..ca0790103ff 100644 --- a/extras/vom/vom/vxlan_tunnel.cpp +++ b/extras/vom/vom/vxlan_tunnel.cpp @@ -26,8 +26,8 @@ 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(0, "GBP"); -const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(0, "GPE"); +const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GBP(1, "GBP"); +const vxlan_tunnel::mode_t vxlan_tunnel::mode_t::GPE(2, "GPE"); vxlan_tunnel::mode_t::mode_t(int v, const std::string s) : enum_base<vxlan_tunnel::mode_t>(v, s) diff --git a/extras/vom/vom/vxlan_tunnel_cmds.cpp b/extras/vom/vom/vxlan_tunnel_cmds.cpp index e45b6046355..24879ce4d45 100644 --- a/extras/vom/vom/vxlan_tunnel_cmds.cpp +++ b/extras/vom/vom/vxlan_tunnel_cmds.cpp @@ -66,7 +66,8 @@ std::string create_cmd::to_string() const { std::ostringstream s; - s << "vxlan-tunnel-create: " << m_hw_item.to_string() << m_ep.to_string(); + s << "vxlan-tunnel-create: " << m_hw_item.to_string() << " " + << m_ep.to_string(); return (s.str()); } |