commit 7784856dbf8dbc6bb4c4ab1caaa138e79f877c50
author William A. Kennington III <wak@google.com> Wed Oct 26 17:32:57 2022 -0700
committer William A. Kennington III <wak@google.com> Sat Nov 05 22:57:17 2022 -0700
tree 42da30f86e4aa742504355f2fff1a2e7e6cbd539
parent fd862be82cfc6439ef519ce8e2dcc6445d80c83f

test: Make mock syscalls take InterfaceInfo

This will make it easier to expand the parameters and plumb data through
the mock.

Change-Id: I5ca015a0494c092d9d247bbb2b7d0122c5e58fd8
Signed-off-by: William A. Kennington III <wak@google.com>

test/test_ethernet_interface.cpp

diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index e65d03c..654f45d 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -44,11 +44,11 @@
     static MockEthernetInterface makeInterface(sdbusplus::bus_t& bus,
                                                MockManager& manager)
     {
-        mock_clear();
-        mock_addIF("test0", /*idx=*/1);
-        return {bus, manager,
-                system::InterfaceInfo{.idx = 1, .flags = 0, .name = "test0"},
-                "/xyz/openbmc_test/network"sv, config::Parser()};
+        system::mock_clear();
+        system::InterfaceInfo info{.idx = 1, .flags = 0, .name = "test0"};
+        system::mock_addIF(info);
+        return {bus, manager, info, "/xyz/openbmc_test/network"sv,
+                config::Parser()};
     }
 
     int countIPObjects()
@@ -110,17 +110,16 @@
     EXPECT_EQ("", interface.macAddress());
     EXPECT_FALSE(interface.linkUp());
 
-    constexpr unsigned idx = 2;
     constexpr ether_addr mac{0x11, 0x22, 0x33, 0x44, 0x55, 0x66};
     constexpr unsigned mtu = 150;
 
-    mock_addIF("test1", idx, IFF_RUNNING, mac, mtu);
-    MockEthernetInterface intf(bus, manager,
-                               system::InterfaceInfo{.idx = idx,
-                                                     .flags = IFF_RUNNING,
-                                                     .name = "test1",
-                                                     .mac = mac,
-                                                     .mtu = mtu},
+    system::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());
 
     EXPECT_EQ(mtu, intf.mtu());