X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Finterface_factory.cpp;h=f4425130a4e3293dda273b52f3b1c54b70407548;hb=208c29aac523231af2420a95ba7e5d361698780b;hp=715c3b6f4db318da7594ed1206dd08449df41fac;hpb=0af529c4c50bfa52e83cd4190e7d8baa5b20022f;p=vpp.git

diff --git a/extras/vom/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp
index 715c3b6f4db..f4425130a4e 100644
--- a/extras/vom/vom/interface_factory.cpp
+++ b/extras/vom/vom/interface_factory.cpp
@@ -72,13 +72,19 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd)
   /*
    * pull out the other special cases
    */
-  if (interface::type_t::TAP == type) {
+  if (interface::type_t::TAP == type || interface::type_t::TAPV2 == type) {
     /*
-     * TAP interface
+     * TAP interfaces
      */
-    sp = tap_interface(name, state, route::prefix_t()).singular();
+    sp = interface::find(hdl);
     if (sp && !tag.empty())
       sp->set(tag);
+  } else if (interface::type_t::PIPE == type) {
+    /*
+     * there's not enough information in a SW interface record to
+     * construct a pipe. so skip it. They have
+     * their own dump routines
+     */
   } else if ((name.find(".") != std::string::npos) && (0 != vd.sub_id)) {
     /*
      * Sub-interface
@@ -153,6 +159,48 @@ interface_factory::new_af_packet_interface(
   return (sp);
 }
 
+std::shared_ptr<tap_interface>
+interface_factory::new_tap_interface(
+  const vapi_payload_sw_interface_tap_details& vd)
+{
+  std::shared_ptr<tap_interface> sp;
+  std::string name = reinterpret_cast<const char*>(vd.dev_name);
+  handle_t hdl(vd.sw_if_index);
+
+  sp = tap_interface(name, interface::type_t::TAP, interface::admin_state_t::UP,
+                     route::prefix_t::ZERO)
+         .singular();
+  sp->set(hdl);
+  return (sp);
+}
+
+std::shared_ptr<tap_interface>
+interface_factory::new_tap_v2_interface(
+  const vapi_payload_sw_interface_tap_v2_details& vd)
+{
+  std::shared_ptr<tap_interface> sp;
+  handle_t hdl(vd.sw_if_index);
+  std::string name = reinterpret_cast<const char*>(vd.host_if_name);
+  route::prefix_t pfx(route::prefix_t::ZERO);
+  boost::asio::ip::address addr;
+
+  if (vd.host_ip4_prefix_len)
+    pfx =
+      route::prefix_t(0, (uint8_t*)vd.host_ip4_addr, vd.host_ip4_prefix_len);
+  else if (vd.host_ip6_prefix_len)
+    pfx =
+      route::prefix_t(1, (uint8_t*)vd.host_ip6_addr, vd.host_ip6_prefix_len);
+
+  l2_address_t l2_address(vd.host_mac_addr, 6);
+  sp = tap_interface(name, interface::type_t::TAPV2,
+                     interface::admin_state_t::UP, pfx, l2_address)
+         .singular();
+
+  sp->set(hdl);
+
+  return (sp);
+}
+
 std::shared_ptr<bond_interface>
 interface_factory::new_bond_interface(
   const vapi_payload_sw_interface_bond_details& vd)
@@ -186,6 +234,24 @@ interface_factory::new_bond_member_interface(
   bond_member bm(*itf, mode, rate);
   return (bm);
 }
+
+std::shared_ptr<pipe>
+interface_factory::new_pipe_interface(const vapi_payload_pipe_details& payload)
+{
+  std::shared_ptr<pipe> sp;
+
+  handle_t hdl(payload.sw_if_index);
+  pipe::handle_pair_t hdl_pair(payload.pipe_sw_if_index[0],
+                               payload.pipe_sw_if_index[1]);
+
+  sp = pipe(payload.instance, interface::admin_state_t::UP).singular();
+
+  sp->set(hdl);
+  sp->set_ends(hdl_pair);
+
+  return (sp);
+}
+
 }; // namespace VOM
 
 /*