Merge remote-tracking branch 'apache/4.22'

shwstppr · shwstppr · commit eedd32971f7f · 2026-01-07T13:11:55.000+05:30
diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/AddBackupRepositoryCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/backup/repository/AddBackupRepositoryCmd.java
@@ -17,6 +17,7 @@
 
 package org.apache.cloudstack.api.command.user.backup.repository;
 
+import com.cloud.utils.StringUtils;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
@@ -100,7 +101,7 @@ public String getProvider() {
     }
 
     public String getMountOptions() {
-        return mountOptions == null ? "" : mountOptions;
+        return StringUtils.isBlank(mountOptions) ? "" : mountOptions;
     }
 
     public Long getZoneId() {
diff --git a/api/src/main/java/org/apache/cloudstack/api/response/BackupRepositoryResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/BackupRepositoryResponse.java
@@ -57,6 +57,10 @@ public class BackupRepositoryResponse extends BaseResponse {
     @Param(description = "backup type")
     private String type;
 
+    @SerializedName(ApiConstants.MOUNT_OPTIONS)
+    @Param(description = "mount options", since = "4.22.1")
+    private String mountOptions;
+
     @SerializedName(ApiConstants.CAPACITY_BYTES)
     @Param(description = "capacity of the backup repository")
     private Long capacityBytes;
@@ -128,6 +132,14 @@ public void setType(String type) {
         this.type = type;
     }
 
+    public String getMountOptions() {
+        return mountOptions;
+    }
+
+    public void setMountOptions(String mountOptions) {
+        this.mountOptions = mountOptions;
+    }
+
     public Long getCapacityBytes() {
         return capacityBytes;
     }
diff --git a/api/src/main/java/org/apache/cloudstack/backup/BackupRepositoryService.java b/api/src/main/java/org/apache/cloudstack/backup/BackupRepositoryService.java
@@ -32,5 +32,4 @@ public interface BackupRepositoryService {
     BackupRepository updateBackupRepository(UpdateBackupRepositoryCmd cmd);
     boolean deleteBackupRepository(DeleteBackupRepositoryCmd cmd);
     Pair<List<BackupRepository>, Integer> listBackupRepositories(ListBackupRepositoriesCmd cmd);
-
 }
diff --git a/core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java b/core/src/main/java/com/cloud/storage/template/HttpTemplateDownloader.java
@@ -151,7 +151,7 @@ private void checkCredentials(String user, String password) {
                 client.getParams().setAuthenticationPreemptive(true);
                 Credentials defaultcreds = new UsernamePasswordCredentials(user, password);
                 client.getState().setCredentials(new AuthScope(hostAndPort.first(), hostAndPort.second(), AuthScope.ANY_REALM), defaultcreds);
-                logger.info("Added username=" + user + ", password=" + password + "for host " + hostAndPort.first() + ":" + hostAndPort.second());
+                logger.info("Added username={}, password=****** for host {}:{}", user, hostAndPort.first(), hostAndPort.second());
             } else {
                 logger.info("No credentials configured for host=" + hostAndPort.first() + ":" + hostAndPort.second());
             }
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDao.java
@@ -163,5 +163,7 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S
 
     VolumeVO findOneByIScsiName(String iScsiName);
 
+    int getVolumeCountByOfferingId(long diskOfferingId);
+
     VolumeVO findByLastIdAndState(long lastVolumeId, Volume.State...states);
 }
diff --git a/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java b/engine/schema/src/main/java/com/cloud/storage/dao/VolumeDaoImpl.java
@@ -78,6 +78,7 @@ public class VolumeDaoImpl extends GenericDaoBase<VolumeVO, Long> implements Vol
     protected GenericSearchBuilder<VolumeVO, SumCount> primaryStorageSearch2;
     protected GenericSearchBuilder<VolumeVO, SumCount> secondaryStorageSearch;
     private final SearchBuilder<VolumeVO> poolAndPathSearch;
+    final GenericSearchBuilder<VolumeVO, Integer> CountByOfferingId;
 
     @Inject
     ReservationDao reservationDao;
@@ -506,6 +507,11 @@ public VolumeDaoImpl() {
         poolAndPathSearch.and("poolId", poolAndPathSearch.entity().getPoolId(), Op.EQ);
         poolAndPathSearch.and("path", poolAndPathSearch.entity().getPath(), Op.EQ);
         poolAndPathSearch.done();
+
+        CountByOfferingId = createSearchBuilder(Integer.class);
+        CountByOfferingId.select(null, Func.COUNT, CountByOfferingId.entity().getId());
+        CountByOfferingId.and("diskOfferingId", CountByOfferingId.entity().getDiskOfferingId(), Op.EQ);
+        CountByOfferingId.done();
     }
 
     @Override
@@ -914,6 +920,14 @@ public VolumeVO findOneByIScsiName(String iScsiName) {
         return findOneIncludingRemovedBy(sc);
     }
 
+    @Override
+    public int getVolumeCountByOfferingId(long diskOfferingId) {
+        SearchCriteria<Integer> sc = CountByOfferingId.create();
+        sc.setParameters("diskOfferingId", diskOfferingId);
+        List<Integer> results = customSearch(sc, null);
+        return results.get(0);
+    }
+
     @Override
     public VolumeVO findByLastIdAndState(long lastVolumeId, State ...states) {
         QueryBuilder<VolumeVO> sc = QueryBuilder.create(VolumeVO.class);
diff --git a/engine/schema/src/main/java/com/cloud/upgrade/DatabaseCreator.java b/engine/schema/src/main/java/com/cloud/upgrade/DatabaseCreator.java
@@ -99,7 +99,7 @@ private static void initDB(String dbPropsFile, String rootPassword, String[] dat
             String username = dbProperties.getProperty(String.format("db.%s.username", database));
             String password = dbProperties.getProperty(String.format("db.%s.password", database));
             String dbName = dbProperties.getProperty(String.format("db.%s.name", database));
-            System.out.println(String.format("========> Initializing database=%s with host=%s port=%s username=%s password=%s", dbName, host, port, username, password));
+            System.out.println(String.format("========> Initializing database=%s with host=%s port=%s username=%s password=******", dbName, host, port, username));
 
             List<String> queries = new ArrayList<String>();
             queries.add(String.format("drop database if exists `%s`", dbName));
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDao.java
@@ -187,5 +187,9 @@ List<VMInstanceVO> searchRemovedByRemoveDate(final Date startDate, final Date en
 
     Map<String, Long> getNameIdMapForVmIds(Collection<Long> ids);
 
+    int getVmCountByOfferingId(Long serviceOfferingId);
+
+    int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> domainIds);
+
     List<VMInstanceVO> listByIdsIncludingRemoved(List<Long> ids);
 }
diff --git a/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java b/engine/schema/src/main/java/com/cloud/vm/dao/VMInstanceDaoImpl.java
@@ -104,6 +104,8 @@ public class VMInstanceDaoImpl extends GenericDaoBase<VMInstanceVO, Long> implem
     protected SearchBuilder<VMInstanceVO> LastHostAndStatesSearch;
     protected SearchBuilder<VMInstanceVO> VmsNotInClusterUsingPool;
     protected SearchBuilder<VMInstanceVO> IdsPowerStateSelectSearch;
+    GenericSearchBuilder<VMInstanceVO, Integer> CountByOfferingId;
+    GenericSearchBuilder<VMInstanceVO, Integer> CountUserVmNotInDomain;
 
     @Inject
     ResourceTagDao tagsDao;
@@ -354,6 +356,18 @@ protected void init() {
                 IdsPowerStateSelectSearch.entity().getPowerStateUpdateCount(),
                 IdsPowerStateSelectSearch.entity().getPowerStateUpdateTime());
         IdsPowerStateSelectSearch.done();
+
+        CountByOfferingId = createSearchBuilder(Integer.class);
+        CountByOfferingId.select(null, Func.COUNT, CountByOfferingId.entity().getId());
+        CountByOfferingId.and("serviceOfferingId", CountByOfferingId.entity().getServiceOfferingId(), Op.EQ);
+        CountByOfferingId.done();
+
+        CountUserVmNotInDomain = createSearchBuilder(Integer.class);
+        CountUserVmNotInDomain.select(null, Func.COUNT, CountUserVmNotInDomain.entity().getId());
+        CountUserVmNotInDomain.and("serviceOfferingId", CountUserVmNotInDomain.entity().getServiceOfferingId(), Op.EQ);
+        CountUserVmNotInDomain.and("domainIdsNotIn", CountUserVmNotInDomain.entity().getDomainId(), Op.NIN);
+        CountUserVmNotInDomain.done();
+
     }
 
     @Override
@@ -1247,6 +1261,29 @@ public Map<String, Long> getNameIdMapForVmIds(Collection<Long> ids) {
                 .collect(Collectors.toMap(VMInstanceVO::getInstanceName, VMInstanceVO::getId));
     }
 
+    @Override
+    public int getVmCountByOfferingId(Long serviceOfferingId) {
+        if (serviceOfferingId == null) {
+            return 0;
+        }
+        SearchCriteria<Integer> sc = CountByOfferingId.create();
+        sc.setParameters("serviceOfferingId", serviceOfferingId);
+        List<Integer> count = customSearch(sc, null);
+        return count.get(0);
+    }
+
+    @Override
+    public int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> domainIds) {
+        if (serviceOfferingId == null || CollectionUtils.isEmpty(domainIds)) {
+            return 0;
+        }
+        SearchCriteria<Integer> sc = CountUserVmNotInDomain.create();
+        sc.setParameters("serviceOfferingId", serviceOfferingId);
+        sc.setParameters("domainIdsNotIn", domainIds.toArray());
+        List<Integer> count = customSearch(sc, null);
+        return count.get(0);
+    }
+
     @Override
     public List<VMInstanceVO> listByIdsIncludingRemoved(List<Long> ids) {
         SearchBuilder<VMInstanceVO> idsSearch = createSearchBuilder();
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -5530,6 +5530,9 @@ public BackupRepositoryResponse createBackupRepositoryResponse(BackupRepository
         response.setAddress(backupRepository.getAddress());
         response.setProviderName(backupRepository.getProvider());
         response.setType(backupRepository.getType());
+        if (StringUtils.isNotBlank(backupRepository.getMountOptions())) {
+            response.setMountOptions(backupRepository.getMountOptions());
+        }
         response.setCapacityBytes(backupRepository.getCapacityBytes());
         response.setCrossZoneInstanceCreation(backupRepository.crossZoneInstanceCreationEnabled());
         response.setObjectName("backuprepository");
diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -49,10 +49,6 @@
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
-import com.cloud.consoleproxy.ConsoleProxyManager;
-import com.cloud.network.router.VirtualNetworkApplianceManager;
-import com.cloud.storage.secondary.SecondaryStorageVmManager;
-import com.cloud.vm.VirtualMachineManager;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.affinity.AffinityGroup;
@@ -154,6 +150,7 @@
 import com.cloud.capacity.CapacityManager;
 import com.cloud.capacity.dao.CapacityDao;
 import com.cloud.configuration.Resource.ResourceType;
+import com.cloud.consoleproxy.ConsoleProxyManager;
 import com.cloud.dc.AccountVlanMapVO;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterDetailsVO;
@@ -204,6 +201,7 @@
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceAllocationException;
 import com.cloud.exception.ResourceUnavailableException;
+import com.cloud.exception.UnsupportedServiceException;
 import com.cloud.gpu.GPU;
 import com.cloud.gpu.VgpuProfileVO;
 import com.cloud.gpu.dao.VgpuProfileDao;
@@ -247,6 +245,7 @@
 import com.cloud.network.element.NetrisProviderVO;
 import com.cloud.network.element.NsxProviderVO;
 import com.cloud.network.netris.NetrisService;
+import com.cloud.network.router.VirtualNetworkApplianceManager;
 import com.cloud.network.rules.LoadBalancerContainer.Scheme;
 import com.cloud.network.vpc.VpcManager;
 import com.cloud.offering.DiskOffering;
@@ -281,6 +280,7 @@
 import com.cloud.storage.dao.StoragePoolTagsDao;
 import com.cloud.storage.dao.VMTemplateZoneDao;
 import com.cloud.storage.dao.VolumeDao;
+import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.test.IPRangeConfig;
 import com.cloud.user.Account;
 import com.cloud.user.AccountDetailVO;
@@ -314,6 +314,7 @@
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.NicIpAlias;
 import com.cloud.vm.VirtualMachine;
+import com.cloud.vm.VirtualMachineManager;
 import com.cloud.vm.VmDetailConstants;
 import com.cloud.vm.dao.NicIpAliasDao;
 import com.cloud.vm.dao.NicIpAliasVO;
@@ -3910,6 +3911,12 @@ public ServiceOffering updateServiceOffering(final UpdateServiceOfferingCmd cmd)
         List<Long> filteredDomainIds = filterChildSubDomains(domainIds);
         Collections.sort(filteredDomainIds);
 
+        // avoid domain update of service offering if any instance is associated to it
+        int instanceCount = _vmInstanceDao.getVmCountByOfferingNotInDomain(offeringHandle.getId(), filteredDomainIds);
+        if (instanceCount > 0) {
+            throw new UnsupportedServiceException("There are Instances associated to this service offering outside of the specified domains.");
+        }
+
         List<Long> filteredZoneIds = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(zoneIds)) {
             filteredZoneIds.addAll(zoneIds);
diff --git a/server/src/main/java/com/cloud/hypervisor/KVMGuru.java b/server/src/main/java/com/cloud/hypervisor/KVMGuru.java
@@ -134,7 +134,8 @@ protected void setVmQuotaPercentage(VirtualMachineTO to, VirtualMachineProfile v
             VirtualMachine vm = vmProfile.getVirtualMachine();
             HostVO host = hostDao.findById(vm.getHostId());
             if (host == null) {
-                throw new CloudRuntimeException("Host with id: " + vm.getHostId() + " not found");
+                logger.warn("Host is not available. Skipping setting CPU quota percentage for VM: {}", vm);
+                return;
             }
             logger.debug("Limiting CPU usage for VM: {} on host: {}", vm, host);
             double hostMaxSpeed = getHostCPUSpeed(host);
diff --git a/server/src/main/java/com/cloud/user/DomainManagerImpl.java b/server/src/main/java/com/cloud/user/DomainManagerImpl.java
@@ -34,6 +34,8 @@
 import com.cloud.api.query.vo.VpcOfferingJoinVO;
 import com.cloud.configuration.Resource;
 import com.cloud.domain.dao.DomainDetailsDao;
+import com.cloud.network.dao.NetworkDao;
+import com.cloud.network.vpc.dao.VpcDao;
 import com.cloud.network.vpc.dao.VpcOfferingDao;
 import com.cloud.network.vpc.dao.VpcOfferingDetailsDao;
 import com.cloud.offerings.dao.NetworkOfferingDao;
@@ -85,6 +87,7 @@
 import com.cloud.service.dao.ServiceOfferingDao;
 import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.dao.DiskOfferingDao;
+import com.cloud.storage.dao.VolumeDao;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.ManagerBase;
@@ -101,6 +104,8 @@
 import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.ReservationContext;
 import com.cloud.vm.ReservationContextImpl;
+import com.cloud.vm.dao.VMInstanceDao;
+
 import org.apache.commons.lang3.StringUtils;
 
 @Component
@@ -141,6 +146,14 @@ public class DomainManagerImpl extends ManagerBase implements DomainManager, Dom
     @Inject
     private ProjectDao _projectDao;
     @Inject
+    private VMInstanceDao vmInstanceDao;
+    @Inject
+    private NetworkDao networkDao;
+    @Inject
+    private VolumeDao volumeDao;
+    @Inject
+    private VpcDao vpcDao;
+    @Inject
     private ProjectManager _projectMgr;
     @Inject
     private RegionManager _regionMgr;
@@ -543,7 +556,8 @@ 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())) {
+            int vpcCount = vpcDao.getVpcCountByOfferingId(vpcOffering.getId());
+            if (vpcCount == 0) {
                 vpcOfferingDao.remove(vpcOffering.getId());
             } else {
                 vpcOfferingsDetailsToRemove.add(vpcOffering.getId());
@@ -558,7 +572,8 @@ 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())) {
+            int networkCount = networkDao.getNetworkCountByNetworkOffId(networkOffering.getId());
+            if (networkCount == 0) {
                 networkOfferingDao.remove(networkOffering.getId());
             } else {
                 networkOfferingsDetailsToRemove.add(networkOffering.getId());
@@ -573,7 +588,8 @@ 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())) {
+            int vmCount = vmInstanceDao.getVmCountByOfferingId(serviceOffering.getId());
+            if (vmCount == 0) {
                 serviceOfferingDao.remove(serviceOffering.getId());
             } else {
                 serviceOfferingsDetailsToRemove.add(serviceOffering.getId());
@@ -588,7 +604,8 @@ 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())) {
+            int volumeCount = volumeDao.getVolumeCountByOfferingId(diskOffering.getId());
+            if (volumeCount == 0) {
                 diskOfferingDao.remove(diskOffering.getId());
             } else {
                 diskOfferingsDetailsToRemove.add(diskOffering.getId());
diff --git a/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java b/server/src/test/java/com/cloud/hypervisor/KVMGuruTest.java
@@ -32,7 +32,6 @@
 import com.cloud.storage.dao.GuestOSDao;
 import com.cloud.storage.dao.GuestOSHypervisorDao;
 import com.cloud.utils.Pair;
-import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VirtualMachineProfile;
 import org.apache.cloudstack.api.ApiConstants;
@@ -141,10 +140,11 @@ public void testSetVmQuotaPercentage() {
         Mockito.verify(vmTO).setCpuQuotaPercentage(Mockito.anyDouble());
     }
 
-    @Test(expected = CloudRuntimeException.class)
+    @Test
     public void testSetVmQuotaPercentageNullHost() {
         Mockito.when(hostDao.findById(hostId)).thenReturn(null);
         guru.setVmQuotaPercentage(vmTO, vmProfile);
+        Mockito.verify(vmTO, Mockito.never()).setCpuQuotaPercentage(Mockito.anyDouble());
     }
 
     @Test
diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualMachineMO.java

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`package org.apache.cloudstack.api.command.user.backup.repository;`
`19`	`19`
	`20`	`+import com.cloud.utils.StringUtils;`
`20`	`21`	`import org.apache.cloudstack.acl.RoleType;`
`21`	`22`	`import org.apache.cloudstack.api.APICommand;`
`22`	`23`	`import org.apache.cloudstack.api.ApiConstants;`
`@@ -100,7 +101,7 @@ public String getProvider() {`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`public String getMountOptions() {`
`103`		`- return mountOptions == null ? "" : mountOptions;`
	`104`	`+ return StringUtils.isBlank(mountOptions) ? "" : mountOptions;`
`104`	`105`	`}`
`105`	`106`
`106`	`107`	`public Long getZoneId() {`
Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,4 @@ public interface BackupRepositoryService {`
`32`	`32`	`BackupRepository updateBackupRepository(UpdateBackupRepositoryCmd cmd);`
`33`	`33`	`boolean deleteBackupRepository(DeleteBackupRepositoryCmd cmd);`
`34`	`34`	`Pair<List<BackupRepository>, Integer> listBackupRepositories(ListBackupRepositoriesCmd cmd);`
`35`		`-`
`36`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ private void checkCredentials(String user, String password) {`
`151`	`151`	`client.getParams().setAuthenticationPreemptive(true);`
`152`	`152`	`Credentials defaultcreds = new UsernamePasswordCredentials(user, password);`
`153`	`153`	`client.getState().setCredentials(new AuthScope(hostAndPort.first(), hostAndPort.second(), AuthScope.ANY_REALM), defaultcreds);`
`154`		`- logger.info("Added username=" + user + ", password=" + password + "for host " + hostAndPort.first() + ":" + hostAndPort.second());`
	`154`	`+ logger.info("Added username={}, password=****** for host {}:{}", user, hostAndPort.first(), hostAndPort.second());`
`155`	`155`	`} else {`
`156`	`156`	`logger.info("No credentials configured for host=" + hostAndPort.first() + ":" + hostAndPort.second());`
`157`	`157`	`}`
Original file line number	Diff line number	Diff line change
`@@ -163,5 +163,7 @@ public interface VolumeDao extends GenericDao<VolumeVO, Long>, StateDao<Volume.S`
`163`	`163`
`164`	`164`	`VolumeVO findOneByIScsiName(String iScsiName);`
`165`	`165`
	`166`	`+ int getVolumeCountByOfferingId(long diskOfferingId);`
	`167`	`+`
`166`	`168`	`VolumeVO findByLastIdAndState(long lastVolumeId, Volume.State...states);`
`167`	`169`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,5 +187,9 @@ List<VMInstanceVO> searchRemovedByRemoveDate(final Date startDate, final Date en`
`187`	`187`
`188`	`188`	`Map<String, Long> getNameIdMapForVmIds(Collection<Long> ids);`
`189`	`189`
	`190`	`+ int getVmCountByOfferingId(Long serviceOfferingId);`
	`191`	`+`
	`192`	`+ int getVmCountByOfferingNotInDomain(Long serviceOfferingId, List<Long> domainIds);`
	`193`	`+`
`190`	`194`	`List<VMInstanceVO> listByIdsIncludingRemoved(List<Long> ids);`
`191`	`195`	`}`