Added additional marvin tests + defensive checks

Author: Pearl Dsilva

engine/orchestration/src/main/java/com/cloud/vm/VirtualMachineManagerImpl.java

@@ -1850,10 +1850,12 @@ private void orchestrateStop(final String vmUuid, final boolean cleanUpEvenIfUna
 
     private void getPersistenceMap(Map<String, Boolean> vlanToPersistenceMap, NetworkVO networkVO) {
         NetworkOfferingVO offeringVO = networkOfferingDao.findById(networkVO.getNetworkOfferingId());
-        Pair<String, Boolean> data = getVMNetworkDetails(networkVO, offeringVO.isPersistent());
-        Boolean shouldDeleteNwResource = MapUtils.isNotEmpty(vlanToPersistenceMap) ? vlanToPersistenceMap.get(data.first()) : null;
-        if (shouldDeleteNwResource == null || shouldDeleteNwResource){
-            vlanToPersistenceMap.put(data.first(), data.second());
+        if (offeringVO != null) {
+            Pair<String, Boolean> data = getVMNetworkDetails(networkVO, offeringVO.isPersistent());
+            Boolean shouldDeleteNwResource = (MapUtils.isNotEmpty(vlanToPersistenceMap) && data != null) ? vlanToPersistenceMap.get(data.first()) : null;
+            if (data != null && (shouldDeleteNwResource == null || shouldDeleteNwResource)) {
+                vlanToPersistenceMap.put(data.first(), data.second());
+            }
         }
     }
 
@@ -1866,7 +1868,7 @@ private Map<String, Boolean> getVlanToPersistenceMapForVM(long vmId) {
         }
         if (userVmJoinVOS.isEmpty()) {
             VMInstanceVO vmInstanceVO = _vmDao.findById(vmId);
-            if (vmInstanceVO.getType() == VirtualMachine.Type.DomainRouter) {
+            if (vmInstanceVO != null && vmInstanceVO.getType() == VirtualMachine.Type.DomainRouter) {
                 DomainRouterJoinVO routerVO = domainRouterJoinDao.findById(vmId);
                 NetworkVO networkVO = _networkDao.findById(routerVO.getNetworkId());
                 getPersistenceMap(vlanToPersistenceMap, networkVO);
@@ -1886,18 +1888,21 @@ private Map<String, Boolean> getVlanToPersistenceMapForVM(long vmId) {
      */
     private Pair<String, Boolean> getVMNetworkDetails(NetworkVO networkVO, boolean isPersistent) {
         URI broadcastUri = networkVO.getBroadcastUri();
-        String scheme = broadcastUri.getScheme();
-        String vlanId = Networks.BroadcastDomainType.getValue(broadcastUri);
-        boolean shouldDelete = !((networkVO.getGuestType() == Network.GuestType.L2 || networkVO.getGuestType() == Network.GuestType.Isolated) &&
-                (scheme.equalsIgnoreCase("vlan"))
-                && isPersistent);
-        if (shouldDelete) {
-            int persistentNetworksCount = _networkDao.getOtherPersistentNetworksCount(networkVO.getId(), networkVO.getBroadcastUri().toString(), true);
-            if (persistentNetworksCount > 0) {
-                shouldDelete = false;
-            }
-        }
-        return new Pair<>(vlanId, shouldDelete);
+        if (broadcastUri != null) {
+            String scheme = broadcastUri.getScheme();
+            String vlanId = Networks.BroadcastDomainType.getValue(broadcastUri);
+            boolean shouldDelete = !((networkVO.getGuestType() == Network.GuestType.L2 || networkVO.getGuestType() == Network.GuestType.Isolated) &&
+                    (scheme != null && scheme.equalsIgnoreCase("vlan"))
+                    && isPersistent);
+            if (shouldDelete) {
+                int persistentNetworksCount = _networkDao.getOtherPersistentNetworksCount(networkVO.getId(), networkVO.getBroadcastUri().toString(), true);
+                if (persistentNetworksCount > 0) {
+                    shouldDelete = false;
+                }
+            }
+            return new Pair<>(vlanId, shouldDelete);
+        }
+        return null;
     }
 
     private void advanceStop(final VMInstanceVO vm, final boolean cleanUpEvenIfUnableToStop) throws AgentUnavailableException, OperationTimedoutException,

test/integration/smoke/test_persistent_network.py

@@ -330,6 +330,49 @@ def test_02_L2_persistent_network(self):
             network_vlan,
             "vlan must not be null for persistent network")
 
+        self.validate_persistent_network_resources_created_on_host(network_vlan)
+
+    @attr(tags=["advanced", "l2", "persistent", "network"], required_hardware="false")
+    def test_03_deploy_and_destroy_VM_and_verify_network_resources_persist(self):
+        network_vlan = 99
+        network = Network.create(
+            self.apiclient,
+            self.services["l2_network"],
+            networkofferingid=self.l2_persistent_network_offering.id,
+            zoneid=self.zone.id,
+            vlan=network_vlan)
+        self.cleanup.append(network)
+        response = verifyNetworkState(
+            self.apiclient,
+            network.id,
+            "implemented")
+        logger.debug(response)
+        exceptionOccured = response[0]
+        isNetworkInDesiredState = response[1]
+        exceptionMessage = response[2]
+
+        if (exceptionOccured or (not isNetworkInDesiredState)):
+            self.fail(exceptionMessage)
+        self.assertIsNotNone(
+            network_vlan,
+            "vlan must not be null for persistent network")
+        try:
+            virtual_machine = VirtualMachine.create(
+                self.apiclient,
+                self.services["virtual_machine"],
+                networkids=[
+                    network.id],
+                serviceofferingid=self.service_offering.id)
+
+            VirtualMachine.delete(virtual_machine, self.apiclient, expunge=True)
+
+            self.validate_persistent_network_resources_created_on_host(network_vlan)
+        except Exception as e:
+            self.fail("Exception occurred: %s" % e)
+        return
+
+
+    def validate_persistent_network_resources_created_on_host(self, network_vlan):
         hosts = self.list_all_hosts_in_zone(self.zone.id)
         if self.hypervisor.lower() in "kvm":
             for host in hosts: