Merge pull request #1993 from Accelerite/sharednw

CLOUDSTACK-8931: Fail to deploy VM instance when use.system.public.ips=false

Author: karuturi

server/src/com/cloud/network/IpAddressManagerImpl.java

@@ -678,6 +678,7 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
                 boolean fetchFromDedicatedRange = false;
                 List<Long> dedicatedVlanDbIds = new ArrayList<Long>();
                 List<Long> nonDedicatedVlanDbIds = new ArrayList<Long>();
+                DataCenter zone = _entityMgr.findById(DataCenter.class, dcId);
 
                 SearchCriteria<IPAddressVO> sc = null;
                 if (podId != null) {
@@ -691,10 +692,14 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
 
                 // If owner has dedicated Public IP ranges, fetch IP from the dedicated range
                 // Otherwise fetch IP from the system pool
-                List<AccountVlanMapVO> maps = _accountVlanMapDao.listAccountVlanMapsByAccount(owner.getId());
-                for (AccountVlanMapVO map : maps) {
-                    if (vlanDbIds == null || vlanDbIds.contains(map.getVlanDbId()))
-                        dedicatedVlanDbIds.add(map.getVlanDbId());
+                Network network = _networksDao.findById(guestNetworkId);
+                //Checking if network is null in the case of system VM's. At the time of allocation of IP address to systemVm, no network is present.
+                if(network == null || !(network.getGuestType() == GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced)) {
+                    List<AccountVlanMapVO> maps = _accountVlanMapDao.listAccountVlanMapsByAccount(owner.getId());
+                    for (AccountVlanMapVO map : maps) {
+                        if (vlanDbIds == null || vlanDbIds.contains(map.getVlanDbId()))
+                            dedicatedVlanDbIds.add(map.getVlanDbId());
+                    }
                 }
                 List<DomainVlanMapVO> domainMaps = _domainVlanMapDao.listDomainVlanMapsByDomain(owner.getDomainId());
                 for (DomainVlanMapVO map : domainMaps) {
@@ -727,8 +732,6 @@ public IPAddressVO doInTransaction(TransactionStatus status) throws Insufficient
 
                 sc.setParameters("dc", dcId);
 
-                DataCenter zone = _entityMgr.findById(DataCenter.class, dcId);
-
                 // for direct network take ip addresses only from the vlans belonging to the network
                 if (vlanUse == VlanType.DirectAttached) {
                     sc.setJoinParameters("vlan", "networkId", guestNetworkId);