clear operational reservations on delete account

Author: Daan Hoogland

engine/schema/src/main/java/com/cloud/dc/dao/DataCenterVnetDao.java

@@ -45,6 +45,8 @@ public interface DataCenterVnetDao extends GenericDao<DataCenterVnetVO, Long> {
 
     public void release(String vnet, long physicalNetworkId, long accountId, String reservationId);
 
+    public void releaseForAccount(long accountId);
+
     public void releaseDedicatedGuestVlans(Long dedicatedGuestVlanRangeId);
 
     public int countVnetsAllocatedToAccount(long dcId, long accountId);

engine/schema/src/main/java/com/cloud/dc/dao/DataCenterVnetDaoImpl.java

@@ -237,6 +237,18 @@ public void release(String vnet, long physicalNetworkId, long accountId, String
         update(vo.getId(), vo);
     }
 
+    @Override
+    public void releaseForAccount(long accountId) {
+        SearchCriteria<DataCenterVnetVO> sc = VnetDcSearchAllocated.create();
+        sc.setParameters("account", accountId);
+
+        DataCenterVnetVO vo = findOneIncludingRemovedBy(sc);
+        vo.setTakenAt(null);
+        vo.setAccountId(null);
+        vo.setReservationId(null);
+        update(vo.getId(), vo);
+    }
+
     @Override
     public void releaseDedicatedGuestVlans(Long dedicatedGuestVlanRangeId) {
         SearchCriteria<DataCenterVnetVO> sc = DedicatedGuestVlanRangeSearch.create();

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -1120,6 +1120,11 @@ public int compare(NetworkVO network1, NetworkVO network2) {
                         accountCleanupNeeded = true;
                     }
                 }
+                // this is clearing the operational reservations or vlans for the account
+                // this should have happened before and covours up the release issues for the vlans
+                // but as it is purely operational and no business logic is involved we clean now
+                // as a last resort, to prevent allocation issue on the long run.
+                _dataCenterVnetDao.releaseForAccount(accountId);
             }
 
             // Delete Site 2 Site VPN customer gateway

test/integration/smoke/test_migration.py

@@ -194,12 +194,14 @@ def test_01_native_to_native_network_migration(self):
         self.cleanup.append(isolated_network)
 
         self.migrate_network(
-                self.network_offering_nouserdata,
-                isolated_network, resume=False)
+            self.network_offering_nouserdata,
+            isolated_network,
+            resume=False)
 
         self.migrate_network(
-                self.network_offering_all,
-                isolated_network, resume=False)
+            self.network_offering_all,
+            isolated_network,
+            resume=False)
 
         deployVmResponse = VirtualMachine.create(
                 self.apiclient,
@@ -209,16 +211,14 @@ def test_01_native_to_native_network_migration(self):
                 serviceofferingid=self.service_offering.id,
                 networkids=[str(isolated_network.id)],
                 templateid=self.template.id,
-                zoneid=self.zone.id
-        )
+                zoneid=self.zone.id)
         self.cleanup.append(deployVmResponse)
 
         vms = list_virtual_machines(
                 self.apiclient,
                 account=self.account.name,
                 domainid=self.account.domainid,
-                id=deployVmResponse.id
-        )
+                id=deployVmResponse.id)
         self.assertTrue(len(vms) > 0, "There are no Vms deployed in the account"
                                    " %s" % self.account.name)
         vm = vms[0]
@@ -227,12 +227,14 @@ def test_01_native_to_native_network_migration(self):
         self.assertTrue(vm.state == "Running", "VM is not in Running state")
 
         self.migrate_network(
-                self.network_offering_nouserdata,
-                isolated_network, resume=False)
+            self.network_offering_nouserdata,
+            isolated_network,
+            resume=False)
 
         self.migrate_network(
-                self.network_offering_all,
-                isolated_network, resume=False)
+            self.network_offering_all,
+            isolated_network,
+            resume=False)
 
     @skipTestIf("hypervisorNotSupported")
     @attr(tags=["advanced", "smoke", "nativevpconly"],