server: compute offerings for specified domain(s) and zone(s)

Service or compute offerings will be allowed to link with specified domain(s) and zone(s). Compute offering linked with multiple domains and zones can be created both with UI and API. Refactored createServiceOffering API to allow passing list of domain and zone IDs with domainids and zoneids parameter respectively. UI has been refactored to allow selecting multiple domains and zones while creating compute offering using multi-select elements. When list of passed domains contain both parent and child domain, offering will be created for parent domain. Compute offering details will now show list of linked domains and zones as a comma-separated list of names. Linked domains and zones will be stored in the cloud.service_offering_details table in database as comma-separated list of IDs with key domainids and zoneids respectively.

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Author: shwstppr

api/src/main/java/com/cloud/user/AccountService.java

@@ -25,6 +25,7 @@
 import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 
+import com.cloud.dc.DataCenter;
 import com.cloud.domain.Domain;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.offering.DiskOffering;
@@ -96,7 +97,7 @@ UserAccount createUserAccount(String userName, String password, String firstName
 
     void checkAccess(Account account, AccessType accessType, boolean sameOwner, ControlledEntity... entities) throws PermissionDeniedException;
 
-    void checkAccess(Account account, ServiceOffering so) throws PermissionDeniedException;
+    void checkAccess(Account account, ServiceOffering so, DataCenter zone) throws PermissionDeniedException;
 
     void checkAccess(Account account, DiskOffering dof) throws PermissionDeniedException;
 

api/src/main/java/org/apache/cloudstack/acl/SecurityChecker.java

@@ -136,7 +136,7 @@ boolean checkAccess(Account caller, AccessType accessType, String action, Contro
 
     boolean checkAccess(Account account, DataCenter zone) throws PermissionDeniedException;
 
-    public boolean checkAccess(Account account, ServiceOffering so) throws PermissionDeniedException;
+    public boolean checkAccess(Account account, ServiceOffering so, DataCenter zone) throws PermissionDeniedException;
 
     boolean checkAccess(Account account, DiskOffering dof) throws PermissionDeniedException;
 }

api/src/main/java/org/apache/cloudstack/api/ApiConstants.java

@@ -111,6 +111,8 @@ public class ApiConstants {
     public static final String IP6_DNS2 = "ip6dns2";
     public static final String DOMAIN = "domain";
     public static final String DOMAIN_ID = "domainid";
+    public static final String DOMAIN_ID_LIST = "domainids";
+    public static final String DOMAIN_NAME_LIST = "domainnames";
     public static final String DOMAIN__ID = "domainId";
     public static final String DURATION = "duration";
     public static final String ELIGIBLE = "eligible";
@@ -706,6 +708,7 @@ public class ApiConstants {
     public static final String NETSCALER_SERVICEPACKAGE_ID = "netscalerservicepackageid";
 
     public static final String ZONE_ID_LIST = "zoneids";
+    public static final String ZONE_NAME_LIST = "zonenames";
     public static final String DESTINATION_ZONE_ID_LIST = "destzoneids";
     public static final String ADMIN = "admin";
     public static final String CHECKSUM_PARAMETER_PREFIX_DESCRIPTION = "The parameter containing the checksum will be considered a MD5sum if it is not prefixed\n"

api/src/main/java/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java

@@ -16,12 +16,13 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.offering;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 
-import com.cloud.storage.Storage;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
@@ -30,9 +31,11 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.DomainResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.log4j.Logger;
 
 import com.cloud.offering.ServiceOffering;
+import com.cloud.storage.Storage;
 import com.cloud.user.Account;
 
 @APICommand(name = "createServiceOffering", description = "Creates a service offering.", responseObject = ServiceOfferingResponse.class,
@@ -86,6 +89,24 @@ public class CreateServiceOfferingCmd extends BaseCmd {
                description = "the ID of the containing domain, null for public offerings")
     private Long domainId;
 
+    @Parameter(name = ApiConstants.DOMAIN_ID_LIST,
+            type = CommandType.LIST,
+            collectionType = CommandType.UUID,
+            entityType = DomainResponse.class,
+            required = false,
+            description = "the ID of the domains offering is associated with, null for all domain offerings",
+            since = "4.13")
+    private List<Long> domainIds;
+
+    @Parameter(name = ApiConstants.ZONE_ID_LIST,
+            type = CommandType.LIST,
+            collectionType = CommandType.UUID,
+            entityType = ZoneResponse.class,
+            required = false,
+            description = "the ID of the zones offering is associated with, null for all zone offerings",
+            since = "4.13")
+    private List<Long> zoneIds;
+
     @Parameter(name = ApiConstants.HOST_TAGS, type = CommandType.STRING, description = "the host tag for this service offering.")
     private String hostTag;
 
@@ -214,6 +235,20 @@ public Long getDomainId() {
         return domainId;
     }
 
+    public List<Long> getDomainIds() {
+        if (domainId != null) {
+            if (domainIds == null) {
+                domainIds = new ArrayList<>();
+            }
+            domainIds.add(domainId);
+        }
+        return domainIds;
+    }
+
+    public List<Long> getZoneIds() {
+        return zoneIds;
+    }
+
     public String getHostTag() {
         return hostTag;
     }

api/src/main/java/org/apache/cloudstack/api/command/admin/offering/UpdateServiceOfferingCmd.java

@@ -16,15 +16,14 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.offering;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
+import org.apache.log4j.Logger;
 
 import com.cloud.offering.ServiceOffering;
 import com.cloud.user.Account;

api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListServiceOfferingsCmd.java

@@ -16,15 +16,15 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.offering;
 
-import org.apache.log4j.Logger;
-
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseListDomainResourcesCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.log4j.Logger;
 
 @APICommand(name = "listServiceOfferings", description = "Lists all available service offerings.", responseObject = ServiceOfferingResponse.class,
         requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
@@ -57,6 +57,13 @@ public class ListServiceOfferingsCmd extends BaseListDomainResourcesCmd {
                description = "the system VM type. Possible types are \"consoleproxy\", \"secondarystoragevm\" or \"domainrouter\".")
     private String systemVmType;
 
+    @Parameter(name = ApiConstants.ZONE_ID,
+            type = CommandType.UUID,
+            entityType = ZoneResponse.class,
+            description = "id of zone disk offering is associated with",
+            since = "4.13")
+    private Long zoneId;
+
     /////////////////////////////////////////////////////
     /////////////////// Accessors ///////////////////////
     /////////////////////////////////////////////////////
@@ -81,6 +88,8 @@ public String getSystemVmType() {
         return systemVmType;
     }
 
+    public Long getZoneId() { return zoneId; }
+
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
     /////////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/response/ServiceOfferingResponse.java

@@ -19,14 +19,13 @@
 import java.util.Date;
 import java.util.Map;
 
-import com.google.gson.annotations.SerializedName;
-
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseResponse;
 import org.apache.cloudstack.api.EntityReference;
 
 import com.cloud.offering.ServiceOffering;
 import com.cloud.serializer.Param;
+import com.google.gson.annotations.SerializedName;
 
 @EntityReference(value = ServiceOffering.class)
 public class ServiceOfferingResponse extends BaseResponse {
@@ -416,6 +415,10 @@ public void setIopsWriteRate(Long iopsWriteRate) {
 
     public void setIopsWriteRateMaxLength(Long iopsWriteRateMaxLength) { this.iopsWriteRateMaxLength = iopsWriteRateMaxLength; }
 
+    public Map<String, String> getDetails() {
+        return details;
+    }
+
     public void setDetails(Map<String, String> details) {
         this.details = details;
     }

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

@@ -121,4 +121,6 @@ public Integer getVlan() {
     List<DataCenterVO> findByKeyword(String keyword);
 
     List<DataCenterVO> listAllZones();
+
+    List<DataCenterVO> list(Object[] ids);
 }

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

@@ -437,4 +437,12 @@ public List<DataCenterVO> listAllZones() {
 
         return dcs;
     }
+
+    @Override
+    public List<DataCenterVO> list(Object[] ids) {
+        SearchBuilder<DataCenterVO> sb = createSearchBuilder();
+        SearchCriteria<DataCenterVO> sc = sb.create();
+        sc.addAnd("id", SearchCriteria.Op.IN, ids);
+        return listBy(sc);
+    }
 }

engine/schema/src/main/java/com/cloud/domain/dao/DomainDao.java

@@ -40,4 +40,6 @@ public interface DomainDao extends GenericDao<DomainVO, Long> {
     Set<Long> getDomainParentIds(long domainId);
 
     List<Long> getDomainChildrenIds(String path);
+
+    List<DomainVO> list(Object[] ids);
 }