API: Cleanup APIs interface.api

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

diff --git a/extras/vom/vom/interface_cmds.cpp b/extras/vom/vom/interface_cmds.cpp
index e78ed46..7805fdb 100644 (file)
--- a/extras/vom/vom/interface_cmds.cpp
+++ b/extras/vom/vom/interface_cmds.cpp
@@ -20,7 +20,6 @@ DEFINE_VAPI_MSG_IDS_VPE_API_JSON;
 DEFINE_VAPI_MSG_IDS_INTERFACE_API_JSON;
 DEFINE_VAPI_MSG_IDS_AF_PACKET_API_JSON;
 DEFINE_VAPI_MSG_IDS_VHOST_USER_API_JSON;
-DEFINE_VAPI_MSG_IDS_STATS_API_JSON;
 
 namespace VOM {
 namespace interface_cmds {
@@ -37,7 +36,7 @@ loopback_create_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  m_hw_item = wait();
+  wait();
 
   if (m_hw_item.rc() == rc_t::OK) {
     insert_interface();
@@ -74,7 +73,7 @@ af_packet_create_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  m_hw_item = wait();
+  wait();
 
   if (m_hw_item.rc() == rc_t::OK) {
     insert_interface();
@@ -120,7 +119,7 @@ vhost_create_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  m_hw_item = wait();
+  wait();
 
   if (m_hw_item.rc() == rc_t::OK) {
     insert_interface();
@@ -253,13 +252,11 @@ state_change_cmd::issue(connection& con)
 
   auto& payload = req.get_request().get_payload();
   payload.sw_if_index = m_hdl.data().value();
-  payload.admin_up_down = m_hw_item.data().value();
+  payload.flags = (vapi_enum_if_status_flags)m_hw_item.data().value();
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return rc_t::OK;
+  return (wait());
 }
 
 std::string
@@ -299,9 +296,7 @@ set_table_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return (rc_t::OK);
+  return (wait());
 }
 
 std::string
@@ -338,9 +333,7 @@ set_mac_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return (rc_t::OK);
+  return (wait());
 }
 
 std::string
@@ -380,9 +373,7 @@ collect_detail_stats_change_cmd::issue(connection& con)
 
   VAPI_CALL(req.execute());
 
-  m_hw_item.set(wait());
-
-  return (rc_t::OK);
+  return (wait());
 }
 
 std::string
@@ -449,144 +440,36 @@ events_cmd::retire(connection& con)
 void
 events_cmd::notify()
 {
-  m_listener.handle_interface_event(this);
-}
+  std::lock_guard<interface_cmds::events_cmd> lg(*this);
+  std::vector<interface::event> events;
 
-std::string
-events_cmd::to_string() const
-{
-  return ("itf-events");
-}
+  for (auto& msg : *this) {
+    auto& payload = msg.get_payload();
 
-/**
- * Interface statistics
- */
-stats_enable_cmd::stats_enable_cmd(interface::stat_listener& el,
-                                   const handle_t& handle)
-  : event_cmd(el.status())
-  , m_listener(el)
-  , m_swifindex(handle)
-{
-}
+    handle_t handle(payload.sw_if_index);
+    std::shared_ptr<interface> sp = interface::find(handle);
 
-bool
-stats_enable_cmd::operator==(const stats_enable_cmd& other) const
-{
-  return (true);
-}
+    if (sp) {
+      interface::oper_state_t oper_state = interface::oper_state_t::from_int(
+        payload.flags & vapi_enum_if_status_flags::IF_STATUS_API_FLAG_LINK_UP);
 
-rc_t
-stats_enable_cmd::issue(connection& con)
-{
-  /*
-   * First set the call back to handle the interface stats
-   */
-  m_reg.reset(new reg_t(con.ctx(), std::ref(*(static_cast<event_cmd*>(this)))));
-
-  /*
-   * then send the request to enable them
-   */
-  msg_t req(con.ctx(), 1, std::ref(*(static_cast<rpc_cmd*>(this))));
-
-  auto& payload = req.get_request().get_payload();
-  payload.enable_disable = 1;
-  payload.pid = getpid();
-  payload.num = 1;
-
-  payload.sw_ifs[0] = m_swifindex.value();
-
-  VAPI_CALL(req.execute());
+      VOM_LOG(log_level_t::DEBUG) << "Interface Event: " << sp->to_string()
+                                  << " state: " << oper_state.to_string();
 
-  wait();
-
-  return (rc_t::OK);
-}
-
-void
-stats_enable_cmd::retire(connection& con)
-{
-  /*
-   * disable interface stats.
-   */
-  msg_t req(con.ctx(), 1, std::ref(*(static_cast<rpc_cmd*>(this))));
-
-  auto& payload = req.get_request().get_payload();
-  payload.enable_disable = 0;
-  payload.pid = getpid();
-  payload.num = 1;
-  payload.sw_ifs[0] = m_swifindex.value();
-
-  VAPI_CALL(req.execute());
-
-  wait();
-}
-
-interface::stat_listener&
-stats_enable_cmd::listener() const
-{
-  return m_listener;
-}
-
-void
-stats_enable_cmd::set(const rc_t& rc)
-{
-  m_listener.status().set(rc);
-}
-
-void
-stats_enable_cmd::notify()
-{
-  m_listener.handle_interface_stat(this);
-}
-
-std::string
-stats_enable_cmd::to_string() const
-{
-  std::ostringstream s;
-  s << "itf-stats-enable itf:" << m_swifindex.to_string();
-  return (s.str());
-}
-
-stats_disable_cmd::stats_disable_cmd(const handle_t& handle)
-  : rpc_cmd(m_res)
-  , m_swifindex(handle)
-{
-}
-
-bool
-stats_disable_cmd::operator==(const stats_disable_cmd& other) const
-{
-  return (true);
-}
-
-rc_t
-stats_disable_cmd::issue(connection& con)
-{
-  /*
-   * then send the request to enable them
-   */
-  msg_t req(con.ctx(), 1, std::ref(*this));
-
-  auto& payload = req.get_request().get_payload();
-  payload.enable_disable = 0;
-  payload.pid = getpid();
-  payload.num = 1;
-
-  payload.sw_ifs[0] = m_swifindex.value();
-
-  VAPI_CALL(req.execute());
+      sp->set(oper_state);
+      events.push_back({ *sp, oper_state });
+    }
+  }
 
-  wait();
+  flush();
 
-  return (rc_t::OK);
+  m_listener.handle_interface_event(events);
 }
 
 std::string
-stats_disable_cmd::to_string() const
+events_cmd::to_string() const
 {
-  std::ostringstream s;
-  s << "itf-stats-disable itf:" << m_swifindex.to_string();
-  return (s.str());
+  return ("itf-events");
 }
 
 dump_cmd::dump_cmd()
@@ -686,14 +569,12 @@ set_tag::issue(connection& con)
   auto& payload = req.get_request().get_payload();
   payload.is_add = 1;
   payload.sw_if_index = m_hw_item.data().value();
-  memset(payload.tag, 0, sizeof(payload.tag));
-  memcpy(payload.tag, m_name.c_str(), m_name.length());
+  memset(payload.tag.buf, 0, payload.tag.length);
+  memcpy(payload.tag.buf, m_name.c_str(), m_name.length());
 
   VAPI_CALL(req.execute());
 
-  wait();
-
-  return rc_t::OK;
+  return (wait());
 }
 std::string
 set_tag::to_string() const