X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=extras%2Fvom%2Fvom%2Finterface_factory.cpp;h=f0b25ffd837ad90866d83d07d27420693f948d61;hb=7c0eb56f4;hp=417f4775a7a3ddcd299e98bbba22ca20092f06dd;hpb=164e5f8c63652028ecb9c3570e1ea8618b163071;p=vpp.git

diff --git a/extras/vom/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp
index 417f4775a7a..f0b25ffd837 100644
--- a/extras/vom/vom/interface_factory.cpp
+++ b/extras/vom/vom/interface_factory.cpp
@@ -31,13 +31,31 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd)
    * Determine the interface type from the name and VLAN attributes
    */
   std::string name = reinterpret_cast<const char*>(vd.interface_name);
-  interface::type_t type = interface::type_t::from_string(name);
-  interface::admin_state_t state =
-    interface::admin_state_t::from_int(vd.link_up_down);
+  std::string device_type =
+    reinterpret_cast<const char*>(vd.interface_dev_type);
+  interface::type_t type = interface::type_t::from_string(device_type);
+  interface::admin_state_t state = interface::admin_state_t::from_int(
+    vd.flags & vapi_enum_if_status_flags::IF_STATUS_API_FLAG_ADMIN_UP);
   handle_t hdl(vd.sw_if_index);
-  l2_address_t l2_address(vd.l2_address, vd.l2_address_length);
+  l2_address_t l2_address(vd.l2_address, 6);
   std::string tag = "";
 
+  if (interface::type_t::UNKNOWN == type) {
+    return sp;
+  }
+
+  sp = interface::find(hdl);
+  if (sp) {
+    sp->set(state);
+    sp->set(l2_address);
+    if (!tag.empty())
+      sp->set(tag);
+    return sp;
+  }
+
+  /*
+   * If here, Fall back to old routine
+   */
   if (interface::type_t::AFPACKET == type) {
     /*
      * need to strip VPP's "host-" prefix from the interface name
@@ -60,23 +78,34 @@ 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::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
      *   split the name into the parent and VLAN
      */
     std::vector<std::string> parts;
+    std::shared_ptr<interface> parent;
     boost::split(parts, name, boost::is_any_of("."));
 
-    interface parent(parts[0], type, state, tag);
-    sp = sub_interface(parent, state, vd.sub_id).singular();
+    if ((parent = interface::find(parts[0])))
+      sp = sub_interface(*parent, state, vd.sub_id).singular();
+    else {
+      interface parent_itf(parts[0], type, state, tag);
+      sp = sub_interface(parent_itf, state, vd.sub_id).singular();
+    }
   } else if (interface::type_t::VXLAN == type) {
     /*
      * there's not enough information in a SW interface record to
@@ -88,16 +117,9 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd)
      * vhost interface already exist in db, look for it using
      * sw_if_index
      */
-    sp = interface::find(hdl);
-    if (sp) {
-      sp->set(state);
-      sp->set(l2_address);
-      if (!tag.empty())
-        sp->set(tag);
-    }
   } else if (interface::type_t::BOND == type) {
-    sp = bond_interface(name, state, l2_address,
-                        bond_interface::mode_t::UNSPECIFIED)
+    sp = bond_interface(
+           name, state, l2_address, bond_interface::mode_t::UNSPECIFIED)
            .singular();
   } else {
     sp = interface(name, type, state, tag).singular();
@@ -120,14 +142,55 @@ interface_factory::new_vhost_user_interface(
 {
   std::shared_ptr<interface> sp;
   std::string name = reinterpret_cast<const char*>(vd.sock_filename);
-  interface::type_t type = interface::type_t::from_string(name);
   handle_t hdl(vd.sw_if_index);
 
-  sp = interface(name, type, interface::admin_state_t::DOWN).singular();
+  sp = interface(name, interface::type_t::VHOST, interface::admin_state_t::DOWN)
+         .singular();
+  sp->set(hdl);
+  return (sp);
+}
+
+std::shared_ptr<interface>
+interface_factory::new_af_packet_interface(
+  const vapi_payload_af_packet_details& vd)
+{
+  std::shared_ptr<interface> sp;
+  std::string name = reinterpret_cast<const char*>(vd.host_if_name);
+  handle_t hdl(vd.sw_if_index);
+
+  sp =
+    interface(name, interface::type_t::AFPACKET, interface::admin_state_t::DOWN)
+      .singular();
   sp->set(hdl);
   return (sp);
 }
 
+std::shared_ptr<tap_interface>
+interface_factory::new_tap_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_prefix.address, vd.host_ip4_prefix.len);
+  else if (vd.host_ip6_prefix.len)
+    pfx = route::prefix_t(
+      1, (uint8_t*)vd.host_ip6_prefix.address, vd.host_ip6_prefix.len);
+
+  l2_address_t l2_address(vd.host_mac_addr, 6);
+  sp = tap_interface(name, 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)
@@ -161,6 +224,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
 
 /*