From dbeb3454c7933f8ec6a57049791458f0c6255df2 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 21 Jan 2020 16:30:00 +0530 Subject: [PATCH 1/3] fixed inconsistency of IP on VR when VR is destroyed and recreated (shared network) --- server/src/main/java/com/cloud/network/NetworkModelImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index 1ea43221ce46..f47a076757e6 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -2299,6 +2299,9 @@ public NicVO getPlaceholderNicForRouter(Network network, Long podId) { ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), nic.getIPv6Address()); } //return nic only when its ip address belong to the pod range (for the Basic zone case) + if (vlans.isEmpty()) { + return nic; + } for (Vlan vlan : vlans) { if (ip != null && ip.getVlanId() == vlan.getId()) { return nic; From 2f395aeea9c9c43b1bd28579b96b27d5ae24c853 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Tue, 21 Jan 2020 20:50:17 +0530 Subject: [PATCH 2/3] Update NetworkModelImpl.java --- server/src/main/java/com/cloud/network/NetworkModelImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index f47a076757e6..e9000e829a55 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -2298,10 +2298,11 @@ public NicVO getPlaceholderNicForRouter(Network network, Long podId) { } else { ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), nic.getIPv6Address()); } - //return nic only when its ip address belong to the pod range (for the Basic zone case) + if (vlans.isEmpty()) { return nic; } + //return nic only when its ip address belong to the pod range (for the Basic zone case) for (Vlan vlan : vlans) { if (ip != null && ip.getVlanId() == vlan.getId()) { return nic; From a3946b26fdfde505a520c6a14ad43c87c7812139 Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Wed, 22 Jan 2020 23:58:35 +0530 Subject: [PATCH 3/3] removed training spaces --- server/src/main/java/com/cloud/network/NetworkModelImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index e9000e829a55..b8bd2c38d0d9 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java @@ -2298,7 +2298,7 @@ public NicVO getPlaceholderNicForRouter(Network network, Long podId) { } else { ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), nic.getIPv6Address()); } - + if (vlans.isEmpty()) { return nic; }