[cloudstack] branch 4.13 updated: fixed inconsistency of IP on VR when VR is destroyed and recrea… (#3825)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new b581f85  fixed inconsistency of IP on VR when VR is destroyed and 
recrea… (#3825)
b581f85 is described below

commit b581f85d4bfcb132c7b9fc04933d3e2289529a3f
Author: Pearl Dsilva <pearl1...@gmail.com>
AuthorDate: Thu Jan 23 21:29:00 2020 +0530

    fixed inconsistency of IP on VR when VR is destroyed and recrea… (#3825)
---
 server/src/main/java/com/cloud/network/NetworkModelImpl.java | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java 
b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
index 1ea4322..b8bd2c3 100644
--- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java
+++ b/server/src/main/java/com/cloud/network/NetworkModelImpl.java
@@ -2298,6 +2298,10 @@ public class NetworkModelImpl extends ManagerBase 
implements NetworkModel, Confi
                     } else {
                         ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), 
nic.getIPv6Address());
                     }
+
+                    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()) {