clean network offerings for domain on remove

Author: DaanHoogland

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

@@ -965,7 +965,7 @@ private Pair<List<InstanceGroupJoinVO>, Integer> searchForVmGroupsInternal(ListV
     @Override
     public ListResponse<UserVmResponse> searchForUserVMs(ListVMsCmd cmd) {
         Pair<List<UserVmJoinVO>, Integer> result = searchForUserVMsInternal(cmd);
-        ListResponse<UserVmResponse> response = new ListResponse<UserVmResponse>();
+        ListResponse<UserVmResponse> response = new ListResponse<>();
         ResponseView respView = ResponseView.Restricted;
         Account caller = CallContext.current().getCallingAccount();
         if (_accountMgr.isRootAdmin(caller.getId())) {
@@ -1303,7 +1303,7 @@ private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsInternal(ListVMsCmd cm
             vmIds[i++] = v.getId();
         }
         List<UserVmJoinVO> vms = _userVmJoinDao.searchByIds(vmIds);
-        return new Pair<List<UserVmJoinVO>, Integer>(vms, count);
+        return new Pair<>(vms, count);
     }
 
     @Override

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

@@ -2955,18 +2955,17 @@ public void buildACLSearchParameters(Account caller, Long id, String accountName
         if (projectId != null) {
             if (!forProjectInvitation) {
                 if (projectId == -1L) {
-                    if (caller.getType() == Account.Type.ADMIN) {
-                        domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.ListProjectResourcesOnly);
-                        if (listAll) {
-                            domainIdRecursiveListProject.third(ListProjectResourcesCriteria.ListAllIncludingProjectResources);
-                        }
-                    } else {
+                    domainIdRecursiveListProject.third(Project.ListProjectResourcesCriteria.ListProjectResourcesOnly);
+                    if (caller.getType() != Account.Type.ADMIN) {
                         permittedAccounts.addAll(_projectMgr.listPermittedProjectAccounts(caller.getId()));
                         // permittedAccounts can be empty when the caller is not a part of any project (a domain account)
                         if (permittedAccounts.isEmpty()) {
                             permittedAccounts.add(caller.getId());
                         }
                     }
+                    if (listAll) {
+                        domainIdRecursiveListProject.third(ListProjectResourcesCriteria.ListAllIncludingProjectResources);
+                    }
                 } else {
                     Project project = _projectMgr.getProject(projectId);
                     if (project == null) {

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

@@ -24,7 +24,11 @@
 
 import javax.inject.Inject;
 
+import com.cloud.api.query.dao.NetworkOfferingJoinDao;
+import com.cloud.api.query.vo.NetworkOfferingJoinVO;
 import com.cloud.domain.dao.DomainDetailsDao;
+import com.cloud.offerings.dao.NetworkOfferingDao;
+import com.cloud.offerings.dao.NetworkOfferingDetailsDao;
 import org.apache.cloudstack.annotation.AnnotationService;
 import org.apache.cloudstack.annotation.dao.AnnotationDao;
 import org.apache.cloudstack.api.ApiConstants;
@@ -106,6 +110,12 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
     @Inject
     private DiskOfferingDetailsDao diskOfferingDetailsDao;
     @Inject
+    private NetworkOfferingDao networkOfferingDao;
+    @Inject
+    private NetworkOfferingJoinDao networkOfferingJoinDao;
+    @Inject
+    private NetworkOfferingDetailsDao networkOfferingDetailsDao;
+    @Inject
     private ServiceOfferingJoinDao serviceOfferingJoinDao;
     @Inject
     private ServiceOfferingDao serviceOfferingDao;
@@ -483,18 +493,31 @@ protected void cleanupDomainOfferings(Long domainId) {
         }
 
         String domainIdString = String.valueOf(domainId);
-        List<Long> diskOfferingsDetailsToRemove = new ArrayList<>();
-        List<Long> serviceOfferingsDetailsToRemove = new ArrayList<>();
 
-        // delete the service and disk offerings associated with this domain
-        List<DiskOfferingJoinVO> diskOfferingsForThisDomain = diskOfferingJoinDao.findByDomainId(domainId);
-        for (DiskOfferingJoinVO diskOffering : diskOfferingsForThisDomain) {
-            if (domainIdString.equals(diskOffering.getDomainId())) {
-                diskOfferingDao.remove(diskOffering.getId());
+        removeDiskOfferings(domainId, domainIdString);
+
+        removeServiceOfferings(domainId, domainIdString);
+
+        removeNetworkOfferings(domainId, domainIdString);
+    }
+
+    private void removeNetworkOfferings(Long domainId, String domainIdString) {
+        List<Long> networkOfferingsDetailsToRemove = new ArrayList<>();
+        List<NetworkOfferingJoinVO> networkOfferingsForThisDomain = networkOfferingJoinDao.findByDomainId(domainId, false);
+        for (NetworkOfferingJoinVO networkOffering : networkOfferingsForThisDomain) {
+            if (domainIdString.equals(networkOffering.getDomainId())) {
+                networkOfferingDao.remove(networkOffering.getId());
             } else {
-                diskOfferingsDetailsToRemove.add(diskOffering.getId());
+                networkOfferingsDetailsToRemove.add(networkOffering.getId());
             }
         }
+        for (final Long networkOfferingId : networkOfferingsDetailsToRemove) {
+            networkOfferingDetailsDao.removeDetail(networkOfferingId, ApiConstants.DOMAIN_ID, domainIdString);
+        }
+    }
+
+    private void removeServiceOfferings(Long domainId, String domainIdString) {
+        List<Long> serviceOfferingsDetailsToRemove = new ArrayList<>();
         List<ServiceOfferingJoinVO> serviceOfferingsForThisDomain = serviceOfferingJoinDao.findByDomainId(domainId);
         for (ServiceOfferingJoinVO serviceOffering : serviceOfferingsForThisDomain) {
             if (domainIdString.equals(serviceOffering.getDomainId())) {
@@ -503,14 +526,25 @@ protected void cleanupDomainOfferings(Long domainId) {
                 serviceOfferingsDetailsToRemove.add(serviceOffering.getId());
             }
         }
+        for (final Long serviceOfferingId : serviceOfferingsDetailsToRemove) {
+            serviceOfferingDetailsDao.removeDetail(serviceOfferingId, ApiConstants.DOMAIN_ID, domainIdString);
+        }
+    }
 
+    private void removeDiskOfferings(Long domainId, String domainIdString) {
+        List<Long> diskOfferingsDetailsToRemove = new ArrayList<>();
+        List<DiskOfferingJoinVO> diskOfferingsForThisDomain = diskOfferingJoinDao.findByDomainId(domainId);
+        for (DiskOfferingJoinVO diskOffering : diskOfferingsForThisDomain) {
+            if (domainIdString.equals(diskOffering.getDomainId())) {
+                diskOfferingDao.remove(diskOffering.getId());
+            } else {
+                diskOfferingsDetailsToRemove.add(diskOffering.getId());
+            }
+        }
         // Remove domain IDs for offerings which may be multi-domain
         for (final Long diskOfferingId : diskOfferingsDetailsToRemove) {
             diskOfferingDetailsDao.removeDetail(diskOfferingId, ApiConstants.DOMAIN_ID, domainIdString);
         }
-        for (final Long serviceOfferingId : serviceOfferingsDetailsToRemove) {
-            serviceOfferingDetailsDao.removeDetail(serviceOfferingId, ApiConstants.DOMAIN_ID, domainIdString);
-        }
     }
 
     protected boolean cleanupDomain(Long domainId, Long ownerId) throws ConcurrentOperationException, ResourceUnavailableException {