fixes

Check for NPE during nic network validation
Filter orphan, removed volumes while list unmanaged VMs from VMware
Publish usage and update resource count only after import complete
Use disk size when disk offering for disk is of higher size durng import

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java

@@ -1674,15 +1674,6 @@ public DiskProfile importVolume(Type type, String name, DiskOffering offering, L
         vol.setChainInfo(chainInfo);
         vol.setState(Volume.State.Ready);
         vol = _volsDao.persist(vol);
-
-        // Save usage event and update resource count for user vm volumes
-        if (vm.getType() == VirtualMachine.Type.User) {
-            UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), offering.getId(), null, size,
-                    Volume.class.getName(), vol.getUuid(), vol.isDisplayVolume());
-
-            _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.volume, vol.isDisplayVolume());
-            _resourceLimitMgr.incrementResourceCount(vm.getAccountId(), ResourceType.primary_storage, vol.isDisplayVolume(), new Long(vol.getSize()));
-        }
         return toDiskProfile(vol, offering);
     }
 }

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java

@@ -96,6 +96,8 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
 
     List<Long> listZoneWidePoolIdsByVolumeCount(long dcId, long accountId);
 
+    List<VolumeVO> findIncludingRemovedByZone(long zoneId);
+
     /**
      * Gets the Total Primary Storage space allocated for an account
      *

engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java

@@ -595,6 +595,13 @@ public List<Long> listZoneWidePoolIdsByVolumeCount(long dcId, long accountId) {
         }
     }
 
+    @Override
+    public List<VolumeVO> findIncludingRemovedByZone(long zoneId) {
+        SearchCriteria<VolumeVO> sc = AllFieldsSearch.create();
+        sc.setParameters("dcId", zoneId);
+        return searchIncludingRemoved(sc, null, null, false);
+    }
+
     @Override
     @DB()
     public Pair<Long, Long> getNonDestroyedCountAndTotalByPool(long poolId) {

server/src/main/java/com/cloud/vm/UserVmManagerImpl.java

@@ -3977,16 +3977,18 @@ public UserVmVO doInTransaction(TransactionStatus status) throws InsufficientCap
                 }
                 CallContext.current().setEventDetails("Vm Id: " + vm.getUuid());
 
-                if (!offering.isDynamic()) {
-                    UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
-                            hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
-                } else {
-                    UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
-                            hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), customParameters, vm.isDisplayVm());
-                }
+                if (!isImport) {
+                    if (!offering.isDynamic()) {
+                        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
+                                hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplayVm());
+                    } else {
+                        UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_CREATE, accountId, zone.getId(), vm.getId(), vm.getHostName(), offering.getId(), template.getId(),
+                                hypervisorType.toString(), VirtualMachine.class.getName(), vm.getUuid(), customParameters, vm.isDisplayVm());
+                    }
 
-                //Update Resource Count for the given account
-                resourceCountIncrement(accountId, isDisplayVm, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+                    //Update Resource Count for the given account
+                    resourceCountIncrement(accountId, isDisplayVm, new Long(offering.getCpu()), new Long(offering.getRamSize()));
+                }
                 return vm;
             }
         });