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 {
-loopback_create_cmd::loopback_create_cmd(HW::item<handle_t>& item,
- const std::string& name)
+
+bvi_create_cmd::bvi_create_cmd(HW::item<handle_t>& item,
+ const std::string& name)
: create_cmd(item, name)
{
}
rc_t
-loopback_create_cmd::issue(connection& con)
+bvi_create_cmd::issue(connection& con)
{
msg_t req(con.ctx(), std::ref(*this));
+ auto& payload = req.get_request().get_payload();
+
+ payload.user_instance = ~0;
+
VAPI_CALL(req.execute());
- m_hw_item = wait();
+ wait();
if (m_hw_item.rc() == rc_t::OK) {
insert_interface();
return rc_t::OK;
}
std::string
-loopback_create_cmd::to_string() const
+bvi_create_cmd::to_string() const
{
std::ostringstream s;
- s << "loopback-itf-create: " << m_hw_item.to_string() << " name:" << m_name;
+ s << "bvi-itf-create: " << m_hw_item.to_string() << " name:" << m_name;
return (s.str());
}
-af_packet_create_cmd::af_packet_create_cmd(HW::item<handle_t>& item,
- const std::string& name)
+loopback_create_cmd::loopback_create_cmd(HW::item<handle_t>& item,
+ const std::string& name)
: create_cmd(item, name)
{
}
rc_t
-af_packet_create_cmd::issue(connection& con)
+loopback_create_cmd::issue(connection& con)
{
msg_t req(con.ctx(), std::ref(*this));
- auto& payload = req.get_request().get_payload();
-
- payload.use_random_hw_addr = 1;
- memset(payload.host_if_name, 0, sizeof(payload.host_if_name));
- memcpy(payload.host_if_name, m_name.c_str(),
- std::min(m_name.length(), sizeof(payload.host_if_name)));
-
VAPI_CALL(req.execute());
- m_hw_item = wait();
+ wait();
if (m_hw_item.rc() == rc_t::OK) {
insert_interface();
return rc_t::OK;
}
std::string
-af_packet_create_cmd::to_string() const
+loopback_create_cmd::to_string() const
{
std::ostringstream s;
- s << "af-packet-itf-create: " << m_hw_item.to_string() << " name:" << m_name;
+ s << "loopback-itf-create: " << m_hw_item.to_string() << " name:" << m_name;
return (s.str());
}
-tap_create_cmd::tap_create_cmd(HW::item<handle_t>& item,
- const std::string& name)
+af_packet_create_cmd::af_packet_create_cmd(HW::item<handle_t>& item,
+ const std::string& name)
: create_cmd(item, name)
{
}
rc_t
-tap_create_cmd::issue(connection& con)
+af_packet_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;
+ payload.use_random_hw_addr = 1;
+ memset(payload.host_if_name, 0, sizeof(payload.host_if_name));
+ memcpy(payload.host_if_name, m_name.c_str(),
+ std::min(m_name.length(), sizeof(payload.host_if_name)));
VAPI_CALL(req.execute());
- m_hw_item = wait();
+ wait();
if (m_hw_item.rc() == rc_t::OK) {
insert_interface();
return rc_t::OK;
}
-
std::string
-tap_create_cmd::to_string() const
+af_packet_create_cmd::to_string() const
{
std::ostringstream s;
- s << "tap-intf-create: " << m_hw_item.to_string() << " name:" << m_name;
+ s << "af-packet-itf-create: " << m_hw_item.to_string() << " name:" << m_name;
return (s.str());
}
VAPI_CALL(req.execute());
- m_hw_item = wait();
+ wait();
if (m_hw_item.rc() == rc_t::OK) {
insert_interface();
return (s.str());
}
-loopback_delete_cmd::loopback_delete_cmd(HW::item<handle_t>& item)
+bvi_delete_cmd::bvi_delete_cmd(HW::item<handle_t>& item)
: delete_cmd(item)
{
}
rc_t
-loopback_delete_cmd::issue(connection& con)
+bvi_delete_cmd::issue(connection& con)
{
msg_t req(con.ctx(), std::ref(*this));
}
std::string
-loopback_delete_cmd::to_string() const
+bvi_delete_cmd::to_string() const
{
std::ostringstream s;
- s << "loopback-itf-delete: " << m_hw_item.to_string();
+ s << "bvi-itf-delete: " << m_hw_item.to_string();
return (s.str());
}
-af_packet_delete_cmd::af_packet_delete_cmd(HW::item<handle_t>& item,
- const std::string& name)
- : delete_cmd(item, name)
+loopback_delete_cmd::loopback_delete_cmd(HW::item<handle_t>& item)
+ : delete_cmd(item)
{
}
rc_t
-af_packet_delete_cmd::issue(connection& con)
+loopback_delete_cmd::issue(connection& con)
{
msg_t req(con.ctx(), std::ref(*this));
auto& payload = req.get_request().get_payload();
- memset(payload.host_if_name, 0, sizeof(payload.host_if_name));
- memcpy(payload.host_if_name, m_name.c_str(),
- std::min(m_name.length(), sizeof(payload.host_if_name)));
+ payload.sw_if_index = m_hw_item.data().value();
VAPI_CALL(req.execute());
remove_interface();
return rc_t::OK;
}
+
std::string
-af_packet_delete_cmd::to_string() const
+loopback_delete_cmd::to_string() const
{
std::ostringstream s;
- s << "af_packet-itf-delete: " << m_hw_item.to_string();
+ s << "loopback-itf-delete: " << m_hw_item.to_string();
return (s.str());
}
-tap_delete_cmd::tap_delete_cmd(HW::item<handle_t>& item)
- : delete_cmd(item)
+af_packet_delete_cmd::af_packet_delete_cmd(HW::item<handle_t>& item,
+ const std::string& name)
+ : delete_cmd(item, name)
{
}
rc_t
-tap_delete_cmd::issue(connection& con)
+af_packet_delete_cmd::issue(connection& con)
{
- // finally... call VPP
+ msg_t req(con.ctx(), std::ref(*this));
+
+ auto& payload = req.get_request().get_payload();
+ memset(payload.host_if_name, 0, sizeof(payload.host_if_name));
+ memcpy(payload.host_if_name, m_name.c_str(),
+ std::min(m_name.length(), sizeof(payload.host_if_name)));
+
+ VAPI_CALL(req.execute());
+
+ wait();
+ m_hw_item.set(rc_t::NOOP);
remove_interface();
return rc_t::OK;
}
std::string
-tap_delete_cmd::to_string() const
+af_packet_delete_cmd::to_string() const
{
std::ostringstream s;
- s << "tap-itf-delete: " << m_hw_item.to_string();
+ s << "af_packet-itf-delete: " << m_hw_item.to_string();
return (s.str());
}
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
VAPI_CALL(req.execute());
- m_hw_item.set(wait());
-
- return (rc_t::OK);
+ return (wait());
}
std::string
VAPI_CALL(req.execute());
- m_hw_item.set(wait());
-
- return (rc_t::OK);
+ return (wait());
}
std::string
VAPI_CALL(req.execute());
- m_hw_item.set(wait());
-
- return (rc_t::OK);
+ return (wait());
}
std::string
events_cmd::issue(connection& con)
{
/*
- * First set the call back to handle the interface events
- */
+ * First set the call back to handle the interface events
+ */
m_reg.reset(new reg_t(con.ctx(), std::ref(*(static_cast<event_cmd*>(this)))));
/*
- * then send the request to enable them
- */
+ * then send the request to enable them
+ */
msg_t req(con.ctx(), std::ref(*(static_cast<rpc_cmd*>(this))));
auto& payload = req.get_request().get_payload();
events_cmd::retire(connection& con)
{
/*
- * disable interface events.
- */
+ * disable interface events.
+ */
msg_t req(con.ctx(), std::ref(*(static_cast<rpc_cmd*>(this))));
auto& payload = req.get_request().get_payload();
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
- */
- m_reg.reset(new reg_t(con.ctx(), std::ref(*(static_cast<event_cmd*>(this)))));
+ std::lock_guard<interface_cmds::events_cmd> lg(*this);
+ std::vector<interface::event> events;
- /*
- * then send the request to enable them
- */
- msg_t req(con.ctx(), 1, std::ref(*(static_cast<rpc_cmd*>(this))));
+ for (auto& msg : *this) {
+ auto& payload = msg.get_payload();
- auto& payload = req.get_request().get_payload();
- payload.enable_disable = 1;
- payload.pid = getpid();
- payload.num = 1;
+ handle_t handle(payload.sw_if_index);
+ std::shared_ptr<interface> sp = interface::find(handle);
- payload.sw_ifs[0] = m_swifindex.value();
+ 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);
- 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();
-}
+ sp->set(oper_state);
+ events.push_back({ *sp, oper_state });
+ }
+ }
-interface::stat_listener&
-stats_enable_cmd::listener() const
-{
- return m_listener;
-}
+ flush();
-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);
+ m_listener.handle_interface_event(events);
}
std::string
-stats_enable_cmd::to_string() const
+events_cmd::to_string() const
{
- std::ostringstream s;
- s << "itf-stats-enable itf:" << m_swifindex.to_string();
- return (s.str());
+ return ("itf-events");
}
-stats_disable_cmd::stats_disable_cmd(const handle_t& handle)
- : rpc_cmd(m_res)
- , m_swifindex(handle)
+dump_cmd::dump_cmd()
{
}
bool
-stats_disable_cmd::operator==(const stats_disable_cmd& other) const
+dump_cmd::operator==(const dump_cmd& other) const
{
return (true);
}
rc_t
-stats_disable_cmd::issue(connection& con)
+dump_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;
+ m_dump.reset(new msg_t(con.ctx(), std::ref(*this)));
- payload.sw_ifs[0] = m_swifindex.value();
+ auto& payload = m_dump->get_request().get_payload();
+ payload.name_filter_valid = 0;
- VAPI_CALL(req.execute());
+ VAPI_CALL(m_dump->execute());
wait();
- return (rc_t::OK);
+ return rc_t::OK;
}
std::string
-stats_disable_cmd::to_string() const
+dump_cmd::to_string() const
{
- std::ostringstream s;
- s << "itf-stats-disable itf:" << m_swifindex.to_string();
- return (s.str());
+ return ("itf-dump");
}
-dump_cmd::dump_cmd()
+vhost_dump_cmd::vhost_dump_cmd()
{
}
bool
-dump_cmd::operator==(const dump_cmd& other) const
+vhost_dump_cmd::operator==(const vhost_dump_cmd& other) const
{
return (true);
}
rc_t
-dump_cmd::issue(connection& con)
+vhost_dump_cmd::issue(connection& con)
{
m_dump.reset(new msg_t(con.ctx(), std::ref(*this)));
- auto& payload = m_dump->get_request().get_payload();
- payload.name_filter_valid = 0;
-
VAPI_CALL(m_dump->execute());
wait();
}
std::string
-dump_cmd::to_string() const
-{
- return ("itf-dump");
-}
-
-vhost_dump_cmd::vhost_dump_cmd()
+vhost_dump_cmd::to_string() const
{
+ return ("vhost-itf-dump");
}
bool
-vhost_dump_cmd::operator==(const vhost_dump_cmd& other) const
+af_packet_dump_cmd::operator==(const af_packet_dump_cmd& other) const
{
return (true);
}
rc_t
-vhost_dump_cmd::issue(connection& con)
+af_packet_dump_cmd::issue(connection& con)
{
m_dump.reset(new msg_t(con.ctx(), std::ref(*this)));
}
std::string
-vhost_dump_cmd::to_string() const
+af_packet_dump_cmd::to_string() const
{
- return ("vhost-itf-dump");
+ return ("af-packet-itf-dump");
}
set_tag::set_tag(HW::item<handle_t>& item, const std::string& name)
auto& payload = req.get_request().get_payload();
payload.is_add = 1;
payload.sw_if_index = m_hw_item.data().value();
- 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
Code Review / vpp.git / blobdiff