Merge pull request #3248 from shapeblue/storage-offering-domains-zones

Enable service offerings to be scoped to domain(s) and zone(s)

Author: Paul Angus

api/src/main/java/com/cloud/configuration/ConfigurationService.java

@@ -106,6 +106,20 @@ public interface ConfigurationService {
      */
     boolean deleteServiceOffering(DeleteServiceOfferingCmd cmd);
 
+    /**
+     * Retrieve ID of domains for a service offering
+     *
+     * @param serviceOfferingId
+     */
+    List<Long> getServiceOfferingDomains(Long serviceOfferingId);
+
+    /**
+     * Retrieve ID of domains for a service offering
+     *
+     * @param serviceOfferingId
+     */
+    List<Long> getServiceOfferingZones(Long serviceOfferingId);
+
     /**
      * Updates a disk offering
      *
@@ -139,6 +153,20 @@ public interface ConfigurationService {
      */
     DiskOffering createDiskOffering(CreateDiskOfferingCmd cmd);
 
+    /**
+     * Retrieve ID of domains for a disk offering
+     *
+     * @param diskOfferingId
+     */
+    List<Long> getDiskOfferingDomains(Long diskOfferingId);
+
+    /**
+     * Retrieve ID of domains for a disk offering
+     *
+     * @param diskOfferingId
+     */
+    List<Long> getDiskOfferingZones(Long diskOfferingId);
+
     /**
      * Creates a new pod based on the parameters specified in the command object
      *
@@ -269,6 +297,20 @@ Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCap
 
     boolean deleteNetworkOffering(DeleteNetworkOfferingCmd cmd);
 
+    /**
+     * Retrieve ID of domains for a network offering
+     *
+     * @param networkOfferingId
+     */
+    List<Long> getNetworkOfferingDomains(Long networkOfferingId);
+
+    /**
+     * Retrieve ID of domains for a network offering
+     *
+     * @param networkOfferingId
+     */
+    List<Long> getNetworkOfferingZones(Long networkOfferingId);
+
     Account getVlanAccount(long vlanId);
 
     Domain getVlanDomain(long vlanId);

api/src/main/java/com/cloud/network/vpc/VpcOffering.java

@@ -16,6 +16,8 @@
 // under the License.
 package com.cloud.network.vpc;
 
+import java.util.Date;
+
 import org.apache.cloudstack.api.Identity;
 import org.apache.cloudstack.api.InternalIdentity;
 
@@ -59,13 +61,16 @@ public enum State {
     /**
      * @return true if the offering provides a distributed router capable of one-hop forwarding
      */
-    boolean supportsDistributedRouter();
+    boolean isSupportsDistributedRouter();
 
     /**
      * @return true if VPC created with the offering can span multiple zones in the region
      */
-    boolean offersRegionLevelVPC();
+    boolean isOffersRegionLevelVPC();
+
+    boolean isRedundantRouter();
 
-    boolean getRedundantRouter();
+    Date getRemoved();
 
+    Date getCreated();
 }

api/src/main/java/com/cloud/network/vpc/VpcProvisioningService.java

@@ -20,21 +20,24 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.cloudstack.api.command.admin.vpc.CreateVPCOfferingCmd;
 import org.apache.cloudstack.api.command.admin.vpc.UpdateVPCOfferingCmd;
+import org.apache.cloudstack.api.command.user.vpc.ListVPCOfferingsCmd;
 
 import com.cloud.utils.Pair;
 
 public interface VpcProvisioningService {
 
-    public VpcOffering getVpcOffering(long vpcOfferingId);
+    VpcOffering getVpcOffering(long vpcOfferingId);
 
-    public VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
-                                         Map<String, List<String>> serviceProviders,
-                                         Map serviceCapabilitystList,
-                                         Long serviceOfferingId);
+    VpcOffering createVpcOffering(CreateVPCOfferingCmd cmd);
 
-    Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(Long id, String name, String displayText, List<String> supportedServicesStr, Boolean isDefault, String keyword,
-        String state, Long startIndex, Long pageSizeVal);
+    VpcOffering createVpcOffering(String name, String displayText, List<String> supportedServices,
+                                  Map<String, List<String>> serviceProviders,
+                                  Map serviceCapabilitystList,
+                                  Long serviceOfferingId, List<Long> domainIds, List<Long> zoneIds);
+
+    Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(ListVPCOfferingsCmd cmd);
 
     /**
      * @param offId
@@ -46,9 +49,22 @@ Pair<List<? extends VpcOffering>,Integer> listVpcOfferings(Long id, String name,
     public VpcOffering updateVpcOffering(long vpcOffId, String vpcOfferingName, String displayText, String state);
 
     /**
-     * @param vpcOfferingCmd
+     * @param cmd
      * @return
      */
-    public VpcOffering updateVpcOffering(final UpdateVPCOfferingCmd vpcOfferingCmd);
+    VpcOffering updateVpcOffering(final UpdateVPCOfferingCmd cmd);
+
+    /**
+     * Retrieve ID of domains for a VPC offering
+     *
+     * @param vpcOfferingId
+     */
+    List<Long> getVpcOfferingDomains(Long vpcOfferingId);
 
+    /**
+     * Retrieve ID of domains for a VPC offering
+     *
+     * @param vpcOfferingId
+     */
+    List<Long> getVpcOfferingZones(Long vpcOfferingId);
 }

api/src/main/java/com/cloud/offering/DiskOffering.java

@@ -34,13 +34,13 @@ enum State {
         Inactive, Active,
     }
 
-    public enum Type {
+    enum Type {
         Disk, Service
     };
 
     State getState();
 
-    public enum DiskCacheMode {
+    enum DiskCacheMode {
         NONE("none"), WRITEBACK("writeback"), WRITETHROUGH("writethrough");
 
         private final String _diskCacheMode;
@@ -59,19 +59,17 @@ public String toString() {
 
     boolean isUseLocalStorage();
 
-    Long getDomainId();
-
     String getName();
 
     boolean isSystemUse();
 
     String getDisplayText();
 
-    public ProvisioningType getProvisioningType();
+    ProvisioningType getProvisioningType();
 
-    public String getTags();
+    String getTags();
 
-    public String[] getTagsArray();
+    String[] getTagsArray();
 
     Date getCreated();
 

api/src/main/java/com/cloud/offering/NetworkOffering.java

@@ -38,7 +38,7 @@ public enum State {
     }
 
     public enum Detail {
-        InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, RelatedNetworkOffering
+        InternalLbProvider, PublicLbProvider, servicepackageuuid, servicepackagedescription, PromiscuousMode, MacAddressChanges, ForgedTransmits, RelatedNetworkOffering, domainid, zoneid
     }
 
     public final static String SystemPublicNetwork = "System-Public-Network";

api/src/main/java/com/cloud/offering/ServiceOffering.java

@@ -104,9 +104,6 @@ public enum StorageType {
     @Override
     boolean isUseLocalStorage();
 
-    @Override
-    Long getDomainId();
-
     /**
      * @return tag that should be present on the host needed, optional parameter
      */

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

@@ -25,9 +25,12 @@
 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.network.vpc.VpcOffering;
 import com.cloud.offering.DiskOffering;
+import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;
 
 public interface AccountService {
@@ -96,9 +99,13 @@ 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;
+    void checkAccess(Account account, DiskOffering dof, DataCenter zone) throws PermissionDeniedException;
+
+    void checkAccess(Account account, NetworkOffering nof, DataCenter zone) throws PermissionDeniedException;
+
+    void checkAccess(Account account, VpcOffering vof, DataCenter zone) throws PermissionDeniedException;
 
     void checkAccess(User user, ControlledEntity entity);
 

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

@@ -19,7 +19,9 @@
 import com.cloud.dc.DataCenter;
 import com.cloud.domain.Domain;
 import com.cloud.exception.PermissionDeniedException;
+import com.cloud.network.vpc.VpcOffering;
 import com.cloud.offering.DiskOffering;
+import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.user.Account;
 import com.cloud.user.User;
@@ -136,7 +138,11 @@ 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;
+    boolean checkAccess(Account account, ServiceOffering so, DataCenter zone) throws PermissionDeniedException;
 
-    boolean checkAccess(Account account, DiskOffering dof) throws PermissionDeniedException;
+    boolean checkAccess(Account account, DiskOffering dof, DataCenter zone) throws PermissionDeniedException;
+
+    boolean checkAccess(Account account, NetworkOffering nof, DataCenter zone) throws PermissionDeniedException;
+
+    boolean checkAccess(Account account, VpcOffering vof, DataCenter zone) throws PermissionDeniedException;
 }

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

@@ -358,6 +358,7 @@ public class ApiConstants {
     public static final String VNET = "vnet";
     public static final String IS_VOLATILE = "isvolatile";
     public static final String VOLUME_ID = "volumeid";
+    public static final String ZONE = "zone";
     public static final String ZONE_ID = "zoneid";
     public static final String ZONE_NAME = "zonename";
     public static final String NETWORK_TYPE = "networktype";