From: Neale Ranns <nranns@cisco.com>
Date: Mon, 25 Feb 2019 17:23:15 +0000 (-0800)
Subject: VOM: GBP table IDs in GBP route-domain create
X-Git-Tag: v19.04-rc1~410
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=d7d6e97d3cd096a2b017f2316436d86a9fe7660b

VOM: GBP table IDs in GBP route-domain create

Change-Id: I606b28dfb820f8f19e338c7642bfe0e4c116ca58
Signed-off-by: Neale Ranns <nranns@cisco.com>
---

diff --git a/extras/vom/vom/gbp_route_domain.cpp b/extras/vom/vom/gbp_route_domain.cpp
index 1c72dc8e3d7..b2ddaaeaa9c 100644
--- a/extras/vom/vom/gbp_route_domain.cpp
+++ b/extras/vom/vom/gbp_route_domain.cpp
@@ -77,7 +77,7 @@ gbp_route_domain::key() const
   return (m_rd->key());
 }
 
-uint32_t
+route::table_id_t
 gbp_route_domain::id() const
 {
   return (m_rd->table_id());
diff --git a/extras/vom/vom/gbp_route_domain.hpp b/extras/vom/vom/gbp_route_domain.hpp
index 0d133b377a5..432f0b31afe 100644
--- a/extras/vom/vom/gbp_route_domain.hpp
+++ b/extras/vom/vom/gbp_route_domain.hpp
@@ -64,7 +64,7 @@ public:
   /**
    * Return the route domain's VPP ID
    */
-  uint32_t id() const;
+  route::table_id_t id() const;
 
   /**
    * comparison operator
diff --git a/extras/vom/vom/gbp_route_domain_cmds.cpp b/extras/vom/vom/gbp_route_domain_cmds.cpp
index 0862d8a36f1..9b8b4bee3fd 100644
--- a/extras/vom/vom/gbp_route_domain_cmds.cpp
+++ b/extras/vom/vom/gbp_route_domain_cmds.cpp
@@ -43,6 +43,8 @@ create_cmd::issue(connection& con)
   auto& payload = req.get_request().get_payload();
 
   payload.rd.rd_id = m_hw_item.data();
+  payload.rd.ip4_table_id = m_hw_item.data();
+  payload.rd.ip6_table_id = m_hw_item.data();
   payload.rd.ip4_uu_sw_if_index = m_ip4_uu_fwd.value();
   payload.rd.ip6_uu_sw_if_index = m_ip6_uu_fwd.value();