From 83540aab27456badbaf74a0fa1c16987e47cea67 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Thu, 5 Oct 2023 06:56:43 -0400 Subject: [PATCH] revert reserving 1st IP in vpc segments --- .../java/com/cloud/network/IpAddressManagerImpl.java | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java index b5829d5619e..c85328807df 100644 --- a/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java +++ b/server/src/main/java/com/cloud/network/IpAddressManagerImpl.java @@ -2044,9 +2044,6 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage if (requestedIp != null) { return this.acquireGuestIpAddress(network, requestedIp); } - if ("NsxGuestNetworkGuru".equals(network.getGuruName())) { - return getRouterIp(network.getGateway()); - } String placementConfig = VrouterRedundantTiersPlacement.valueIn(network.getAccountId()); IpPlacement ipPlacement = IpPlacement.fromString(placementConfig); switch (ipPlacement) { @@ -2058,13 +2055,6 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage return this.acquireGuestIpAddress(network, null); } - private String getRouterIp(String gatewayIp) { - int i = gatewayIp.lastIndexOf('.'); - String ipPart1 = gatewayIp.substring(0, i); - int ipLastOctect = Integer.parseInt(gatewayIp.substring(i+1)) + 1; - return ipPart1.concat("." + ipLastOctect); - } - /** * Get the list of public IPs that need to be applied for a static NAT enable/disable operation. * Manipulating only these ips prevents concurrency issues when disabling static nat at the same time.