Improve IPv4 default gateway removal
Removing the IPv4 default gateway doesn't work correctly when only a
single static address has been assigned. This is expected to be the
common mode of operation, and needs to work correctly.
When more than one static address is managed it's necessary to
preserve the existing gateway. If any address is left unmodified,
added, or is modified the gateway must be preserved.
Tested:
Turned off DHCPv4, and assigned a single static address
Sent a PATCH null to delete the address.
Confirmed the default gateway got cleared.
Assigned two static addresses.
Sent a PATCH {}, null
Sent PATCH null
Confirmed expected default gateway handling
Assigned two static addresses.
Sent a PATCH null, {}
Sent PATCH null
Confirmed expected default gateway handling
Change-Id: I85c4a0533f9468b424602aeb636b8f4f218a9a13
Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>
diff --git a/redfish-core/lib/ethernet.hpp b/redfish-core/lib/ethernet.hpp
index f797bfb..cb7bfb9 100644
--- a/redfish-core/lib/ethernet.hpp
+++ b/redfish-core/lib/ethernet.hpp
@@ -1518,6 +1518,7 @@
getNextStaticIpEntry(ipv4Data.cbegin(), ipv4Data.cend());
bool gatewayValueAssigned{};
+ bool preserveGateway{};
std::string activePath{};
std::string activeGateway{};
if (!ethData.defaultGateway.empty() && ethData.defaultGateway != "0.0.0.0")
@@ -1544,7 +1545,7 @@
deleteIPAddress(ifaceId, nicIpEntry->id, asyncResp);
nicIpEntry = getNextStaticIpEntry(++nicIpEntry,
ipv4Data.cend());
- if (!gatewayValueAssigned && (nicIpEntry == ipv4Data.cend()))
+ if (!preserveGateway && (nicIpEntry == ipv4Data.cend()))
{
// All entries have been processed, and this last has
// requested the IP address be deleted. No prior entry
@@ -1681,11 +1682,13 @@
*gateway, asyncResp);
nicIpEntry = getNextStaticIpEntry(++nicIpEntry,
ipv4Data.cend());
+ preserveGateway = true;
}
else
{
createIPv4(ifaceId, prefixLength, *gateway, *address,
asyncResp);
+ preserveGateway = true;
}
entryIdx++;
}
@@ -1696,6 +1699,7 @@
{
nicIpEntry = getNextStaticIpEntry(++nicIpEntry,
ipv4Data.cend());
+ preserveGateway = true;
entryIdx++;
}
else