X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Finterface_cmds.cpp;h=7805fdb1a1da7ca39d4f104b1f1c57eedf10c6e0;hb=e63325e3ca03c847963863446345e6c80a2c0cfd;hp=fc1d71fa2d9aaac23d18213011e5cc075f451080;hpb=0af529c4c50bfa52e83cd4190e7d8baa5b20022f;p=vpp.git diff --git a/extras/vom/vom/interface_cmds.cpp b/extras/vom/vom/interface_cmds.cpp index fc1d71fa2d9..7805fdb1a1d 100644 --- a/extras/vom/vom/interface_cmds.cpp +++ b/extras/vom/vom/interface_cmds.cpp @@ -19,9 +19,7 @@ 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_TAP_API_JSON; DEFINE_VAPI_MSG_IDS_VHOST_USER_API_JSON; -DEFINE_VAPI_MSG_IDS_STATS_API_JSON; namespace VOM { namespace interface_cmds { @@ -38,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(); @@ -75,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(); @@ -92,44 +90,6 @@ af_packet_create_cmd::to_string() const return (s.str()); } -tap_create_cmd::tap_create_cmd(HW::item& item, - const std::string& name) - : create_cmd(item, name) -{ -} - -rc_t -tap_create_cmd::issue(connection& con) -{ - msg_t req(con.ctx(), std::ref(*this)); - - auto& payload = req.get_request().get_payload(); - - memset(payload.tap_name, 0, sizeof(payload.tap_name)); - memcpy(payload.tap_name, m_name.c_str(), - std::min(m_name.length(), sizeof(payload.tap_name))); - payload.use_random_mac = 1; - - VAPI_CALL(req.execute()); - - m_hw_item = wait(); - - if (m_hw_item.rc() == rc_t::OK) { - insert_interface(); - } - - return rc_t::OK; -} - -std::string -tap_create_cmd::to_string() const -{ - std::ostringstream s; - s << "tap-intf-create: " << m_hw_item.to_string() << " name:" << m_name; - - return (s.str()); -} - vhost_create_cmd::vhost_create_cmd(HW::item& item, const std::string& name, const std::string& tag) @@ -159,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(); @@ -242,28 +202,6 @@ af_packet_delete_cmd::to_string() const return (s.str()); } -tap_delete_cmd::tap_delete_cmd(HW::item& item) - : delete_cmd(item) -{ -} - -rc_t -tap_delete_cmd::issue(connection& con) -{ - // finally... call VPP - - remove_interface(); - return rc_t::OK; -} -std::string -tap_delete_cmd::to_string() const -{ - std::ostringstream s; - s << "tap-itf-delete: " << m_hw_item.to_string(); - - return (s.str()); -} - vhost_delete_cmd::vhost_delete_cmd(HW::item& item, const std::string& name) : delete_cmd(item, name) @@ -314,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 @@ -360,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 @@ -399,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 @@ -441,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 @@ -470,91 +400,18 @@ rc_t events_cmd::issue(connection& con) { /* - * First set the call back to handle the interface events - */ - m_reg.reset(new reg_t(con.ctx(), std::ref(*(static_cast(this))))); - - /* - * then send the request to enable them - */ - msg_t req(con.ctx(), std::ref(*(static_cast(this)))); - - auto& payload = req.get_request().get_payload(); - payload.enable_disable = 1; - payload.pid = getpid(); - - VAPI_CALL(req.execute()); - - wait(); - - return (rc_t::OK); -} - -void -events_cmd::retire(connection& con) -{ - /* - * disable interface events. - */ - msg_t req(con.ctx(), std::ref(*(static_cast(this)))); - - auto& payload = req.get_request().get_payload(); - payload.enable_disable = 0; - payload.pid = getpid(); - - VAPI_CALL(req.execute()); - - wait(); -} - -void -events_cmd::notify() -{ - m_listener.handle_interface_event(this); -} - -std::string -events_cmd::to_string() const -{ - return ("itf-events"); -} - -/** - * 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) -{ -} - -bool -stats_enable_cmd::operator==(const stats_enable_cmd& other) const -{ - return (true); -} - -rc_t -stats_enable_cmd::issue(connection& con) -{ - /* - * First set the call back to handle the interface stats + * First set the call back to handle the interface events */ m_reg.reset(new reg_t(con.ctx(), std::ref(*(static_cast(this))))); /* * then send the request to enable them */ - msg_t req(con.ctx(), 1, std::ref(*(static_cast(this)))); + msg_t req(con.ctx(), std::ref(*(static_cast(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()); @@ -564,90 +421,55 @@ stats_enable_cmd::issue(connection& con) } void -stats_enable_cmd::retire(connection& con) +events_cmd::retire(connection& con) { /* - * disable interface stats. + * disable interface events. */ - msg_t req(con.ctx(), 1, std::ref(*(static_cast(this)))); + msg_t req(con.ctx(), std::ref(*(static_cast(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) +events_cmd::notify() { -} + std::lock_guard lg(*this); + std::vector events; -bool -stats_disable_cmd::operator==(const stats_disable_cmd& other) const -{ - return (true); -} + for (auto& msg : *this) { + auto& payload = msg.get_payload(); -rc_t -stats_disable_cmd::issue(connection& con) -{ - /* - * then send the request to enable them - */ - msg_t req(con.ctx(), 1, std::ref(*this)); + handle_t handle(payload.sw_if_index); + std::shared_ptr sp = interface::find(handle); - auto& payload = req.get_request().get_payload(); - payload.enable_disable = 0; - payload.pid = getpid(); - payload.num = 1; + 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); - payload.sw_ifs[0] = m_swifindex.value(); + VOM_LOG(log_level_t::DEBUG) << "Interface Event: " << sp->to_string() + << " state: " << oper_state.to_string(); - 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() @@ -747,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