commit 07450445bb2afa05df2f636428e60f70b01ba8d2
author Ravi Teja <raviteja28031990@gmail.com> Thu Jul 07 04:30:57 2022 -0500
committer Ravi Teja <raviteja28031990@gmail.com> Wed Jul 13 08:44:42 2022 -0500
tree 999c5af9077dbfb27dc7533d3169dae0e5cae5e3
parent 33b4eaa734a32914d26b69ba92190bbe70272e05

Delete DHCP IP object while moving from DHCP to static

Currently when DHCP is enabled, if user configures same DHCP IP
as static IP config then networkd disable DHCP, fails to add
static entry and return error to the client.

This issue only seen if user configures static IP which is same as
DHCP IP.

Tested by:
Configured same DHCP IP as static IP via redfish

Signed-off-by: Ravi Teja <raviteja28031990@gmail.com>
Change-Id: I7b703c0e70867f79212c3f8955d7f88d22b8328a

src/ethernet_interface.cpp

diff --git a/src/ethernet_interface.cpp b/src/ethernet_interface.cpp
index 610ec79..7a8af9d 100644
--- a/src/ethernet_interface.cpp
+++ b/src/ethernet_interface.cpp
@@ -262,6 +262,9 @@
         log<level::INFO>("DHCP enabled on the interface"),
             entry("INTERFACE=%s", interfaceName().c_str());
         disableDHCP(protType);
+        // Delete the IP address object and that reloads the networkd
+        // to allow the same IP address to be set as Static IP
+        deleteObject(ipaddress);
     }
 
     IP::AddressOrigin origin = IP::AddressOrigin::Static;