devices: tap API cleanup

[vpp.git] / extras / vom / vom / interface_factory.cpp

diff --git a/extras/vom/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp
index abb26f8..f0b25ff 100644 (file)
--- a/extras/vom/vom/interface_factory.cpp
+++ b/extras/vom/vom/interface_factory.cpp
@@ -31,11 +31,13 @@ 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.admin_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) {
@@ -116,8 +118,8 @@ interface_factory::new_interface(const vapi_payload_sw_interface_details& vd)
      * sw_if_index
      */
   } 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();
@@ -140,10 +142,10 @@ 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);
 }
@@ -173,12 +175,12 @@ interface_factory::new_tap_interface(
   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);
+  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)