diff options
| -rw-r--r-- | extras/vom/vom/interface_factory.cpp | 12 | ||||
| -rw-r--r-- | extras/vom/vom/interface_types.cpp | 31 |
2 files changed, 21 insertions, 22 deletions
diff --git a/extras/vom/vom/interface_factory.cpp b/extras/vom/vom/interface_factory.cpp index 2c64e321330..a5981fda623 100644 --- a/extras/vom/vom/interface_factory.cpp +++ b/extras/vom/vom/interface_factory.cpp @@ -31,7 +31,9 @@ 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); + 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); @@ -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); } diff --git a/extras/vom/vom/interface_types.cpp b/extras/vom/vom/interface_types.cpp index b63e4633ff8..239c3e6abf6 100644 --- a/extras/vom/vom/interface_types.cpp +++ b/extras/vom/vom/interface_types.cpp @@ -45,29 +45,30 @@ interface::type_t::from_string(const std::string& str) { if ((str.find("Virtual") != std::string::npos) || (str.find("vhost") != std::string::npos) || - (str.find("vhu") != std::string::npos)) { + (str.find("vhu") != std::string::npos) || + (str.find("vhost-user") != std::string::npos)) { return interface::type_t::VHOST; - } else if (str.find("Bond") != std::string::npos) { + } else if (str.find("bond") != std::string::npos) { return interface::type_t::BOND; - } else if (str.find("Ethernet") != std::string::npos) { + } else if (str.find("dpdk") != std::string::npos) { return interface::type_t::ETHERNET; - } else if (str.find("vxlan") != std::string::npos) { + } else if (str.find("VXLAN") != std::string::npos) { return interface::type_t::VXLAN; - } else if ((str.find("loop") != std::string::npos) || + } else if ((str.find("Loopback") != std::string::npos) || (str.find("recirc") != std::string::npos)) { return interface::type_t::LOOPBACK; - } else if (str.find("host-") != std::string::npos) { + } else if (str.find("af-packet") != std::string::npos) { return interface::type_t::AFPACKET; } else if (str.find("local") != std::string::npos) { return interface::type_t::LOCAL; } else if ((str.find("tapcli") != std::string::npos) || (str.find("tuntap") != std::string::npos)) { return interface::type_t::UNKNOWN; - } else if (str.find("tap") != std::string::npos) { + } else if (str.find("virtio") != std::string::npos) { return interface::type_t::TAPV2; - } else if (str.find("bvi") != std::string::npos) { + } else if (str.find("BVI") != std::string::npos) { return interface::type_t::BVI; - } else if (str.find("pipe") != std::string::npos) { + } else if (str.find("Pipe") != std::string::npos) { return interface::type_t::PIPE; } @@ -76,23 +77,19 @@ interface::type_t::from_string(const std::string& str) interface::type_t::type_t(int v, const std::string& s) : enum_base<interface::type_t>(v, s) -{ -} +{} interface::oper_state_t::oper_state_t(int v, const std::string& s) : enum_base<interface::oper_state_t>(v, s) -{ -} +{} interface::admin_state_t::admin_state_t(int v, const std::string& s) : enum_base<interface::admin_state_t>(v, s) -{ -} +{} interface::stats_type_t::stats_type_t(int v, const std::string& s) : enum_base<interface::stats_type_t>(v, s) -{ -} +{} interface::admin_state_t interface::admin_state_t::from_int(uint8_t v) |