NAT: VPP-1531 api cleanup & update

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

diff --git a/extras/vom/vom/nat_binding_cmds.cpp b/extras/vom/vom/nat_binding_cmds.cpp
index 4d98268..4e69a67 100644 (file)
--- a/extras/vom/vom/nat_binding_cmds.cpp
+++ b/extras/vom/vom/nat_binding_cmds.cpp
@@ -39,14 +39,13 @@ bind_44_input_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 1;
-  payload.is_inside = (nat_binding::zone_t::INSIDE == m_zone ? 1 : 0);
+  payload.flags = (vapi_enum_nat_config_flags)(
+    nat_binding::zone_t::INSIDE == m_zone ? NAT_IS_INSIDE : 0);
   payload.sw_if_index = m_itf.value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return rc_t::OK;
+  return (wait());
 }
 
 std::string
@@ -81,14 +80,13 @@ unbind_44_input_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 0;
-  payload.is_inside = (nat_binding::zone_t::INSIDE == m_zone ? 1 : 0);
+  payload.flags = (vapi_enum_nat_config_flags)(
+    nat_binding::zone_t::INSIDE == m_zone ? NAT_IS_INSIDE : 0);
   payload.sw_if_index = m_itf.value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return rc_t::OK;
+  return (wait());
 }
 
 std::string
@@ -123,14 +121,13 @@ bind_44_output_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 1;
-  payload.is_inside = (nat_binding::zone_t::INSIDE == m_zone ? 1 : 0);
+  payload.flags = (vapi_enum_nat_config_flags)(
+    nat_binding::zone_t::INSIDE == m_zone ? NAT_IS_INSIDE : 0);
   payload.sw_if_index = m_itf.value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return rc_t::OK;
+  return (wait());
 }
 
 std::string
@@ -165,14 +162,13 @@ unbind_44_output_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 0;
-  payload.is_inside = (nat_binding::zone_t::INSIDE == m_zone ? 1 : 0);
+  payload.flags = (vapi_enum_nat_config_flags)(
+    nat_binding::zone_t::INSIDE == m_zone ? NAT_IS_INSIDE : 0);
   payload.sw_if_index = m_itf.value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return rc_t::OK;
+  return (wait());
 }
 
 std::string
@@ -271,12 +267,13 @@ bind_66_input_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 1;
-  payload.is_inside = (nat_binding::zone_t::INSIDE == m_zone ? 1 : 0);
+  payload.flags = (vapi_enum_nat_config_flags)(
+    nat_binding::zone_t::INSIDE == m_zone ? NAT_IS_INSIDE : 0);
   payload.sw_if_index = m_itf.value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
+  wait();
 
   return rc_t::OK;
 }
@@ -313,12 +310,13 @@ unbind_66_input_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.is_add = 0;
-  payload.is_inside = (nat_binding::zone_t::INSIDE == m_zone ? 1 : 0);
+  payload.flags = (vapi_enum_nat_config_flags)(
+    nat_binding::zone_t::INSIDE == m_zone ? NAT_IS_INSIDE : 0);
   payload.sw_if_index = m_itf.value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
+  wait();
 
   return rc_t::OK;
 }