commit ffab00d0d3bfc670bbf80ac3747e0eab3379f72a
author William A. Kennington III <wak@google.com> Mon Nov 07 16:58:36 2022 -0800
committer William A. Kennington III <wak@google.com> Mon Nov 21 02:34:37 2022 -0800
tree eaf2c7ad658b4e8223ae96f776ec89f77d7e348f
parent c0fdaaf9b5e0f070dc69a7a9cbbb97e8fe2853ac

ethernet_interface: DHCP settings don't require refresh

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

src/dhcp_configuration.cpp

diff --git a/src/dhcp_configuration.cpp b/src/dhcp_configuration.cpp
index 1822c35..df71b31 100644
--- a/src/dhcp_configuration.cpp
+++ b/src/dhcp_configuration.cpp
@@ -52,7 +52,7 @@
     auto name = ConfigIntf::sendHostNameEnabled(value);
 
     manager.writeToConfigurationFile();
-    manager.reloadConfigs();
+    manager.reloadConfigsNoRefresh();
 
     return name;
 }
@@ -66,7 +66,7 @@
 
     auto name = ConfigIntf::hostNameEnabled(value);
     manager.writeToConfigurationFile();
-    manager.reloadConfigs();
+    manager.reloadConfigsNoRefresh();
 
     return name;
 }
@@ -80,7 +80,7 @@
 
     auto ntp = ConfigIntf::ntpEnabled(value);
     manager.writeToConfigurationFile();
-    manager.reloadConfigs();
+    manager.reloadConfigsNoRefresh();
 
     return ntp;
 }
@@ -94,7 +94,7 @@
 
     auto dns = ConfigIntf::dnsEnabled(value);
     manager.writeToConfigurationFile();
-    manager.reloadConfigs();
+    manager.reloadConfigsNoRefresh();
 
     return dns;
 }

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index e5a3110..a7bf8e3 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -341,7 +341,7 @@
     if (ipv6AcceptRA() != EthernetInterfaceIntf::ipv6AcceptRA(value))
     {
         writeConfigurationFile();
-        manager.reloadConfigs();
+        manager.reloadConfigsNoRefresh();
     }
     return value;
 }
@@ -351,7 +351,7 @@
     if (dhcp4() != EthernetInterfaceIntf::dhcp4(value))
     {
         writeConfigurationFile();
-        manager.reloadConfigs();
+        manager.reloadConfigsNoRefresh();
     }
     return value;
 }
@@ -361,7 +361,7 @@
     if (dhcp6() != EthernetInterfaceIntf::dhcp6(value))
     {
         writeConfigurationFile();
-        manager.reloadConfigs();
+        manager.reloadConfigsNoRefresh();
     }
     return value;
 }
@@ -383,7 +383,7 @@
     if (old4 != new4 || old6 != new6 || oldra != newra)
     {
         writeConfigurationFile();
-        manager.reloadConfigs();
+        manager.reloadConfigsNoRefresh();
     }
     return value;
 }
@@ -564,7 +564,7 @@
         EthernetInterfaceIntf::staticNameServers(value);
 
         writeConfigurationFile();
-        manager.reloadConfigs();
+        manager.reloadConfigsNoRefresh();
     }
     catch (const InternalFailure& e)
     {
@@ -717,7 +717,7 @@
         EthernetInterfaceIntf::staticNTPServers(value);
 
         writeConfigurationFile();
-        manager.reloadConfigs();
+        manager.reloadConfigsNoRefresh();
     }
     catch (InternalFailure& e)
     {

test/test_ethernet_interface.cpp

diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index bb28b22..bd03aff 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -136,7 +136,7 @@
 TEST_F(TestEthernetInterface, addStaticNameServers)
 {
     ServerList servers = {"9.1.1.1", "9.2.2.2", "9.3.3.3"};
-    EXPECT_CALL(manager, reloadConfigs());
+    EXPECT_CALL(manager, reloadConfigsNoRefresh());
     interface.staticNameServers(servers);
     fs::path filePath = confDir;
     filePath /= "00-bmc-test0.network";
@@ -155,7 +155,7 @@
 TEST_F(TestEthernetInterface, addStaticNTPServers)
 {
     ServerList servers = {"10.1.1.1", "10.2.2.2", "10.3.3.3"};
-    EXPECT_CALL(manager, reloadConfigs());
+    EXPECT_CALL(manager, reloadConfigsNoRefresh());
     interface.staticNTPServers(servers);
     fs::path filePath = confDir;
     filePath /= "00-bmc-test0.network";