X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Finterface_factory.cpp;h=abb26f84a6fc568b1bfa8af15fdda514c9157b1e;hp=c417c1cc3debb24aefbc2d7a2ce3606b1b9b26e6;hb=8e1cc46b2bba1ade546d611cdf7b6e48c97d90a1;hpb=9aca7b5ee915b8035fb5b690b7520ab155fcb36e

diff --git a/extras/vom/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp
index c417c1cc3de..abb26f84a6f 100644
--- a/extras/vom/vom/interface_factory.cpp
+++ b/extras/vom/vom/interface_factory.cpp
@@ -38,6 +38,10 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd)
   l2_address_t l2_address(vd.l2_address, vd.l2_address_length);
   std::string tag = "";
 
+  if (interface::type_t::UNKNOWN == type) {
+    return sp;
+  }
+
   sp = interface::find(hdl);
   if (sp) {
     sp->set(state);
@@ -72,13 +76,19 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd)
   /*
    * pull out the other special cases
    */
-  if (interface::type_t::TAP == type || interface::type_t::TAPV2 == type) {
+  if (interface::type_t::TAPV2 == type) {
     /*
      * TAP interfaces
      */
     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
@@ -155,21 +165,6 @@ interface_factory::new_af_packet_interface(
 
 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;
@@ -186,8 +181,7 @@ interface_factory::new_tap_v2_interface(
       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)
+  sp = tap_interface(name, interface::admin_state_t::UP, pfx, l2_address)
          .singular();
 
   sp->set(hdl);
@@ -228,6 +222,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
 
 /*