clean vpc offerings and fix unit tests

Author: DaanHoogland

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

@@ -25,8 +25,12 @@
 import javax.inject.Inject;
 
 import com.cloud.api.query.dao.NetworkOfferingJoinDao;
+import com.cloud.api.query.dao.VpcOfferingJoinDao;
 import com.cloud.api.query.vo.NetworkOfferingJoinVO;
+import com.cloud.api.query.vo.VpcOfferingJoinVO;
 import com.cloud.domain.dao.DomainDetailsDao;
+import com.cloud.network.vpc.dao.VpcOfferingDao;
+import com.cloud.network.vpc.dao.VpcOfferingDetailsDao;
 import com.cloud.offerings.dao.NetworkOfferingDao;
 import com.cloud.offerings.dao.NetworkOfferingDetailsDao;
 import org.apache.cloudstack.annotation.AnnotationService;
@@ -122,6 +126,12 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
     @Inject
     private ServiceOfferingDetailsDao serviceOfferingDetailsDao;
     @Inject
+    private VpcOfferingDao vpcOfferingDao;
+    @Inject
+    private VpcOfferingJoinDao vpcOfferingJoinDao;
+    @Inject
+    private VpcOfferingDetailsDao vpcOfferingDetailsDao;
+    @Inject
     private ProjectDao _projectDao;
     @Inject
     private ProjectManager _projectMgr;
@@ -499,6 +509,23 @@ protected void cleanupDomainOfferings(Long domainId) {
         removeServiceOfferings(domainId, domainIdString);
 
         removeNetworkOfferings(domainId, domainIdString);
+
+        removeVpcOfferings(domainId, domainIdString);
+    }
+
+    private void removeVpcOfferings(Long domainId, String domainIdString) {
+        List<Long> vpcOfferingsDetailsToRemove = new ArrayList<>();
+        List<VpcOfferingJoinVO> vpcOfferingsForThisDomain = vpcOfferingJoinDao.findByDomainId(domainId);
+        for (VpcOfferingJoinVO vpcOffering : vpcOfferingsForThisDomain) {
+            if (domainIdString.equals(vpcOffering.getDomainId())) {
+                vpcOfferingDao.remove(vpcOffering.getId());
+            } else {
+                vpcOfferingsDetailsToRemove.add(vpcOffering.getId());
+            }
+        }
+        for (final Long vpcOfferingId : vpcOfferingsDetailsToRemove) {
+            vpcOfferingDetailsDao.removeDetail(vpcOfferingId, ApiConstants.DOMAIN_ID, domainIdString);
+        }
     }
 
     private void removeNetworkOfferings(Long domainId, String domainIdString) {

server/src/test/java/com/cloud/user/DomainManagerImplTest.java

@@ -22,6 +22,8 @@
 import java.util.List;
 import java.util.UUID;
 
+import com.cloud.api.query.dao.NetworkOfferingJoinDao;
+import com.cloud.api.query.dao.VpcOfferingJoinDao;
 import com.cloud.configuration.ResourceLimit;
 import com.cloud.domain.dao.DomainDetailsDao;
 import com.cloud.utils.UuidUtils;
@@ -82,7 +84,11 @@ public class DomainManagerImplTest {
     @Mock
     DiskOfferingJoinDao _diskOfferingDao;
     @Mock
-    ServiceOfferingJoinDao _offeringsDao;
+    NetworkOfferingJoinDao networkOfferingJoinDao;
+    @Mock
+    ServiceOfferingJoinDao serviceOfferingJoinDao;
+    @Mock
+    VpcOfferingJoinDao vpcOfferingJoinDao;
     @Mock
     ProjectDao _projectDao;
     @Mock
@@ -142,6 +148,11 @@ public void setup() throws NoSuchFieldException, SecurityException,
         Mockito.when(_accountDao.findCleanupsForRemovedAccounts(DOMAIN_ID)).thenReturn(domainAccountsForCleanup);
         Mockito.when(_networkDomainDao.listNetworkIdsByDomain(DOMAIN_ID)).thenReturn(domainNetworkIds);
         Mockito.when(_dedicatedDao.listByDomainId(DOMAIN_ID)).thenReturn(domainDedicatedResources);
+
+        Mockito.when(_diskOfferingDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
+        Mockito.when(networkOfferingJoinDao.findByDomainId(Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(Collections.emptyList());
+        Mockito.when(serviceOfferingJoinDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
+        Mockito.when(vpcOfferingJoinDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
     }
 
     @Test
@@ -266,8 +277,6 @@ public void deleteDomain() {
         Mockito.when(_dedicatedDao.listByDomainId(Mockito.anyLong())).thenReturn(new ArrayList<DedicatedResourceVO>());
         Mockito.when(domainDaoMock.remove(Mockito.anyLong())).thenReturn(true);
         Mockito.when(_configMgr.releaseDomainSpecificVirtualRanges(Mockito.anyLong())).thenReturn(true);
-        Mockito.when(_diskOfferingDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
-        Mockito.when(_offeringsDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
 
         try {
             Assert.assertTrue(domainManager.deleteDomain(20l, false));
@@ -299,8 +308,6 @@ public void deleteDomainCleanup() {
         Mockito.when(_resourceCountDao.removeEntriesByOwner(Mockito.anyLong(), Mockito.eq(ResourceOwnerType.Domain))).thenReturn(1l);
         Mockito.when(_resourceLimitDao.removeEntriesByOwner(Mockito.anyLong(), Mockito.eq(ResourceOwnerType.Domain))).thenReturn(1l);
         Mockito.when(_configMgr.releaseDomainSpecificVirtualRanges(Mockito.anyLong())).thenReturn(true);
-        Mockito.when(_diskOfferingDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
-        Mockito.when(_offeringsDao.findByDomainId(Mockito.anyLong())).thenReturn(Collections.emptyList());
 
         try {
             Assert.assertTrue(domainManager.deleteDomain(20l, true));