types: Migrate all of the Info types
Change-Id: I00f4fdf6141aafc4552d61fa06f75275dea71b20
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/test/mock_syscall.cpp b/test/mock_syscall.cpp
index d16b668..0699ceb 100644
--- a/test/mock_syscall.cpp
+++ b/test/mock_syscall.cpp
@@ -27,7 +27,7 @@
std::map<int, std::queue<std::string>> mock_rtnetlinks;
-using phosphor::network::system::InterfaceInfo;
+using phosphor::network::InterfaceInfo;
std::map<std::string, InterfaceInfo> mock_if;
diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index bd03aff..a7b3c69 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -48,7 +48,7 @@
MockManager& manager)
{
system::mock_clear();
- system::InterfaceInfo info{.idx = 1, .flags = 0, .name = "test0"};
+ InterfaceInfo info{.idx = 1, .flags = 0, .name = "test0"};
system::mock_addIF(info);
return {bus, manager, info, "/xyz/openbmc_test/network"sv,
config::Parser()};
@@ -81,11 +81,11 @@
constexpr ether_addr mac{0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
constexpr unsigned mtu = 150;
- system::InterfaceInfo info{.idx = 2,
- .flags = IFF_RUNNING,
- .name = "test1",
- .mac = mac,
- .mtu = mtu};
+ InterfaceInfo info{.idx = 2,
+ .flags = IFF_RUNNING,
+ .name = "test1",
+ .mac = mac,
+ .mtu = mtu};
system::mock_addIF(info);
MockEthernetInterface intf(bus, manager, info,
"/xyz/openbmc_test/network"sv, config::Parser());
diff --git a/test/test_netlink.cpp b/test/test_netlink.cpp
index c5292a7..c6f7983 100644
--- a/test/test_netlink.cpp
+++ b/test/test_netlink.cpp
@@ -298,7 +298,7 @@
system::mock_clear();
for (unsigned i = 0; i < ifs; ++i)
{
- system::mock_addIF(system::InterfaceInfo{
+ system::mock_addIF(InterfaceInfo{
.idx = i + 1u, .flags = 0, .name = fmt::format("eth{}", i)});
}