commit 0caf22131ed817280d142df71bd1a4e7990e07ce
author William A. Kennington III <wak@google.com> Thu Aug 18 18:15:51 2022 -0700
committer William A. Kennington III <wak@google.com> Thu Sep 22 11:30:46 2022 -0700
tree 7accb26b973dc86df7f29f055e63ac9c126bdf34
parent 87f6813e1f37129d7c6c83f46cf384bed5d938ac

ethernet_interface: Remove DHCP from constructor

It should be set or configured just like all other parameters.

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

test/mock_ethernet_interface.hpp

diff --git a/test/mock_ethernet_interface.hpp b/test/mock_ethernet_interface.hpp
index a0358ed..5e21170 100644
--- a/test/mock_ethernet_interface.hpp
+++ b/test/mock_ethernet_interface.hpp
@@ -13,9 +13,9 @@
 {
   public:
     MockEthernetInterface(sdbusplus::bus_t& bus, const std::string& objPath,
-                          const config::Parser& config, DHCPConf dhcpEnabled,
-                          Manager& parent, bool emitSignal) :
-        EthernetInterface(bus, objPath, config, dhcpEnabled, parent, emitSignal,
+                          const config::Parser& config, Manager& parent,
+                          bool emitSignal) :
+        EthernetInterface(bus, objPath, config, parent, emitSignal,
                           /*nicEnabled=*/true)
     {
     }

test/mock_network_manager.hpp

diff --git a/test/mock_network_manager.hpp b/test/mock_network_manager.hpp
index 46c7c4b..fde3bbd 100644
--- a/test/mock_network_manager.hpp
+++ b/test/mock_network_manager.hpp
@@ -34,8 +34,7 @@
             config::Parser config(config::pathForIntfConf(confDir, interface));
             auto intf =
                 std::make_shared<phosphor::network::MockEthernetInterface>(
-                    bus, objPath.string(), config, getDHCPValue(config), *this,
-                    true);
+                    bus, objPath.string(), config, *this, true);
             intf->createIPAddressObjects();
             intf->createStaticNeighborObjects();
             intf->loadNameServers(config);

test/test_ethernet_interface.cpp

diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index ac96190..0893147 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -43,12 +43,8 @@
     {
         mock_clear();
         mock_addIF("test0", 1, mac);
-        return {bus,
-                "/xyz/openbmc_test/network/test0",
-                config::Parser(),
-                EthernetInterface::DHCPConf::none,
-                manager,
-                true};
+        return {bus, "/xyz/openbmc_test/network/test0", config::Parser(),
+                manager, true};
     }
 
     int countIPObjects()

test/test_vlan_interface.cpp

diff --git a/test/test_vlan_interface.cpp b/test/test_vlan_interface.cpp
index 8d31c7b..c4734b1 100644
--- a/test/test_vlan_interface.cpp
+++ b/test/test_vlan_interface.cpp
@@ -44,7 +44,6 @@
         return {bus,
                 "/xyz/openbmc_test/network/test0",
                 config::Parser(),
-                EthernetInterface::DHCPConf::none,
                 manager,
                 false,
                 true};