X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Ftap_interface_cmds.cpp;h=16bb065e01638dbc164580b77d265ee39bafd8a9;hb=5de4fb707;hp=b08856077425d494eace77ec72dd9d7fd5a73a3e;hpb=164e5f8c63652028ecb9c3570e1ea8618b163071;p=vpp.git

diff --git a/extras/vom/vom/tap_interface_cmds.cpp b/extras/vom/vom/tap_interface_cmds.cpp
index b0885607742..16bb065e016 100644
--- a/extras/vom/vom/tap_interface_cmds.cpp
+++ b/extras/vom/vom/tap_interface_cmds.cpp
@@ -15,96 +15,121 @@
 
 #include "vom/tap_interface_cmds.hpp"
 
-#include <vapi/tap.api.vapi.hpp>
+#include <vapi/tapv2.api.vapi.hpp>
+
+DEFINE_VAPI_MSG_IDS_TAPV2_API_JSON;
 
 namespace VOM {
 namespace tap_interface_cmds {
-create_cmd::create_cmd(HW::item<handle_t>& item,
-                       const std::string& name,
-                       route::prefix_t& prefix,
-                       const l2_address_t& l2_address)
-  : interface::create_cmd<vapi::Tap_connect>(item, name)
+/*
+ * TAPV2
+ */
+tapv2_create_cmd::tapv2_create_cmd(HW::item<handle_t>& item,
+                                   const std::string& name,
+                                   const route::prefix_t& prefix,
+                                   const l2_address_t& l2_address)
+  : interface::create_cmd<vapi::Tap_create_v2>(item, name)
   , m_prefix(prefix)
   , m_l2_address(l2_address)
-{
-}
+{}
 
 rc_t
-create_cmd::issue(connection& con)
+tapv2_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)));
+  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.host_if_name_set = 1;
+
   if (m_prefix != route::prefix_t::ZERO) {
     if (m_prefix.address().is_v6()) {
-      m_prefix.to_vpp(&payload.ip6_address_set, payload.ip6_address,
-                      &payload.ip6_mask_width);
+      m_prefix.to_vpp((uint8_t*)&payload.host_ip6_prefix_set,
+                      payload.host_ip6_prefix.address,
+                      &payload.host_ip6_prefix.len);
     } else {
-      m_prefix.to_vpp(&payload.ip4_address_set, payload.ip4_address,
-                      &payload.ip4_mask_width);
-      payload.ip4_address_set = 1;
+      m_prefix.to_vpp((uint8_t*)&payload.host_ip4_prefix_set,
+                      payload.host_ip4_prefix.address,
+                      &payload.host_ip4_prefix.len);
+      payload.host_ip4_prefix_set = 1;
     }
   }
 
   if (m_l2_address != l2_address_t::ZERO) {
-    m_l2_address.to_bytes(payload.mac_address, 6);
-  } else {
-    payload.use_random_mac = 1;
+    m_l2_address.to_bytes(payload.host_mac_addr, 6);
+    payload.host_mac_addr_set = 1;
   }
 
+  payload.id = 0xffffffff;
+  payload.use_random_mac = 1;
+  payload.tx_ring_sz = 1024;
+  payload.rx_ring_sz = 1024;
+
   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
-create_cmd::to_string() const
+tapv2_create_cmd::to_string() const
 {
   std::ostringstream s;
-  s << "tap-intf-create: " << m_hw_item.to_string()
+  s << "tapv2-intf-create: " << m_hw_item.to_string()
     << " ip-prefix:" << m_prefix.to_string();
 
   return (s.str());
 }
 
-delete_cmd::delete_cmd(HW::item<handle_t>& item)
-  : interface::delete_cmd<vapi::Tap_delete>(item)
-{
-}
+tapv2_delete_cmd::tapv2_delete_cmd(HW::item<handle_t>& item)
+  : interface::delete_cmd<vapi::Tap_delete_v2>(item)
+{}
 
 rc_t
-delete_cmd::issue(connection& con)
+tapv2_delete_cmd::issue(connection& con)
 {
-  // finally... call VPP
 
+  msg_t req(con.ctx(), std::ref(*this));
+
+  auto& payload = req.get_request().get_payload();
+
+  payload.sw_if_index = m_hw_item.data().value();
+
+  VAPI_CALL(req.execute());
+
+  wait();
+  m_hw_item.set(rc_t::NOOP);
+
+  remove_interface();
   return rc_t::OK;
 }
 std::string
-delete_cmd::to_string() const
+tapv2_delete_cmd::to_string() const
 {
   std::ostringstream s;
-  s << "tap-itf-delete: " << m_hw_item.to_string();
+  s << "tapv2-itf-delete: " << m_hw_item.to_string();
 
   return (s.str());
 }
 
-dump_cmd::dump_cmd()
-{
-}
+tapv2_dump_cmd::tapv2_dump_cmd() {}
 
 bool
-dump_cmd::operator==(const dump_cmd& other) const
+tapv2_dump_cmd::operator==(const tapv2_dump_cmd& other) const
 {
   return (true);
 }
 
 rc_t
-dump_cmd::issue(connection& con)
+tapv2_dump_cmd::issue(connection& con)
 {
   m_dump.reset(new msg_t(con.ctx(), std::ref(*this)));
 
@@ -116,10 +141,11 @@ dump_cmd::issue(connection& con)
 }
 
 std::string
-dump_cmd::to_string() const
+tapv2_dump_cmd::to_string() const
 {
-  return ("tap-itf-dump");
+  return ("tapv2-itf-dump");
 }
+
 } // namespace tap_interface_cmds
 } // namespace VOM