Merge remote-tracking branch 'origin/main' into 4.19-list-network-protocols

Author: weizhouapache

.github/workflows/ci.yml

@@ -93,6 +93,7 @@ jobs:
                   smoke/test_nic
                   smoke/test_nic_adapter_type
                   smoke/test_non_contigiousvlan
+                  smoke/test_object_stores
                   smoke/test_outofbandmanagement
                   smoke/test_outofbandmanagement_nestedplugin
                   smoke/test_over_provisioning

api/src/main/java/com/cloud/event/EventTypes.java

@@ -29,6 +29,8 @@
 import org.apache.cloudstack.api.response.ZoneResponse;
 import org.apache.cloudstack.config.Configuration;
 import org.apache.cloudstack.ha.HAConfig;
+import org.apache.cloudstack.storage.object.Bucket;
+import org.apache.cloudstack.storage.object.ObjectStore;
 import org.apache.cloudstack.usage.Usage;
 import org.apache.cloudstack.vm.schedule.VMSchedule;
 
@@ -714,6 +716,16 @@ public class EventTypes {
     // SystemVM
     public static final String EVENT_LIVE_PATCH_SYSTEMVM = "LIVE.PATCH.SYSTEM.VM";
 
+    // OBJECT STORE
+    public static final String EVENT_OBJECT_STORE_CREATE = "OBJECT.STORE.CREATE";
+    public static final String EVENT_OBJECT_STORE_DELETE = "OBJECT.STORE.DELETE";
+    public static final String EVENT_OBJECT_STORE_UPDATE = "OBJECT.STORE.UPDATE";
+
+    // BUCKETS
+    public static final String EVENT_BUCKET_CREATE = "BUCKET.CREATE";
+    public static final String EVENT_BUCKET_DELETE = "BUCKET.DELETE";
+    public static final String EVENT_BUCKET_UPDATE = "BUCKET.UPDATE";
+
     static {
 
         // TODO: need a way to force author adding event types to declare the entity details as well, with out braking
@@ -1151,6 +1163,16 @@ public class EventTypes {
         entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class);
         entityEventDetails.put(EVENT_IMAGE_STORE_OBJECT_DOWNLOAD, ImageStore.class);
         entityEventDetails.put(EVENT_LIVE_PATCH_SYSTEMVM, "SystemVMs");
+
+        //Object Store
+        entityEventDetails.put(EVENT_OBJECT_STORE_CREATE, ObjectStore.class);
+        entityEventDetails.put(EVENT_OBJECT_STORE_UPDATE, ObjectStore.class);
+        entityEventDetails.put(EVENT_OBJECT_STORE_DELETE, ObjectStore.class);
+
+        //Buckets
+        entityEventDetails.put(EVENT_BUCKET_CREATE, Bucket.class);
+        entityEventDetails.put(EVENT_BUCKET_UPDATE, Bucket.class);
+        entityEventDetails.put(EVENT_BUCKET_DELETE, Bucket.class);
     }
 
     public static String getEntityForEvent(String eventName) {

api/src/main/java/com/cloud/server/ResourceTag.java

@@ -69,7 +69,8 @@ public enum ResourceObjectType {
         GuestOs(false, true),
         NetworkOffering(false, true),
         VpcOffering(true, false),
-        Domain(false, false, true);
+        Domain(false, false, true),
+        ObjectStore(false, false, true);
 
 
         ResourceObjectType(boolean resourceTagsSupport, boolean resourceMetadataSupport) {

api/src/main/java/com/cloud/storage/DataStoreRole.java

@@ -21,7 +21,7 @@
 import com.cloud.utils.exception.CloudRuntimeException;
 
 public enum DataStoreRole {
-    Primary("primary"), Image("image"), ImageCache("imagecache"), Backup("backup");
+    Primary("primary"), Image("image"), ImageCache("imagecache"), Backup("backup"), Object("object");
 
     public boolean isImageStore() {
         return (role.equalsIgnoreCase("image") || role.equalsIgnoreCase("imagecache")) ? true : false;
@@ -45,6 +45,8 @@ public static DataStoreRole getRole(String role) {
             return ImageCache;
         } else if (role.equalsIgnoreCase("backup")) {
             return Backup;
+        } else if (role.equalsIgnoreCase("object")) {
+            return Object;
         } else {
             throw new CloudRuntimeException("can't identify the role");
         }

api/src/main/java/com/cloud/storage/StorageService.java

@@ -24,16 +24,23 @@
 import org.apache.cloudstack.api.command.admin.storage.CreateSecondaryStagingStoreCmd;
 import org.apache.cloudstack.api.command.admin.storage.CreateStoragePoolCmd;
 import org.apache.cloudstack.api.command.admin.storage.DeleteImageStoreCmd;
+import org.apache.cloudstack.api.command.admin.storage.DeleteObjectStoragePoolCmd;
 import org.apache.cloudstack.api.command.admin.storage.DeletePoolCmd;
 import org.apache.cloudstack.api.command.admin.storage.DeleteSecondaryStagingStoreCmd;
 import org.apache.cloudstack.api.command.admin.storage.SyncStoragePoolCmd;
+import org.apache.cloudstack.api.command.admin.storage.UpdateObjectStoragePoolCmd;
 import org.apache.cloudstack.api.command.admin.storage.UpdateStoragePoolCmd;
 
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InsufficientCapacityException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.ResourceInUseException;
 import com.cloud.exception.ResourceUnavailableException;
+import org.apache.cloudstack.api.command.admin.storage.heuristics.CreateSecondaryStorageSelectorCmd;
+import org.apache.cloudstack.api.command.admin.storage.heuristics.RemoveSecondaryStorageSelectorCmd;
+import org.apache.cloudstack.api.command.admin.storage.heuristics.UpdateSecondaryStorageSelectorCmd;
+import org.apache.cloudstack.secstorage.heuristics.Heuristic;
+import org.apache.cloudstack.storage.object.ObjectStore;
 
 public interface StorageService {
     /**
@@ -109,4 +116,15 @@ public interface StorageService {
 
     StoragePool syncStoragePool(SyncStoragePoolCmd cmd);
 
+    Heuristic createSecondaryStorageHeuristic(CreateSecondaryStorageSelectorCmd cmd);
+
+    Heuristic updateSecondaryStorageHeuristic(UpdateSecondaryStorageSelectorCmd cmd);
+
+    void removeSecondaryStorageHeuristic(RemoveSecondaryStorageSelectorCmd cmd);
+
+    ObjectStore discoverObjectStore(String name, String url, String providerName, Map details) throws IllegalArgumentException, DiscoveryException, InvalidParameterValueException;
+
+    boolean deleteObjectStore(DeleteObjectStoragePoolCmd cmd);
+
+    ObjectStore updateObjectStore(Long id, UpdateObjectStoragePoolCmd cmd);
 }

api/src/main/java/org/apache/cloudstack/annotation/AnnotationService.java

@@ -45,7 +45,7 @@ enum EntityType {
         SERVICE_OFFERING(false), DISK_OFFERING(false), NETWORK_OFFERING(false),
         ZONE(false), POD(false), CLUSTER(false), HOST(false), DOMAIN(false),
         PRIMARY_STORAGE(false), SECONDARY_STORAGE(false), VR(false), SYSTEM_VM(false),
-        AUTOSCALE_VM_GROUP(true), MANAGEMENT_SERVER(false),;
+        AUTOSCALE_VM_GROUP(true), MANAGEMENT_SERVER(false), OBJECT_STORAGE(false);
 
         private final boolean usersAllowed;
 
@@ -78,6 +78,7 @@ static public List<EntityType> getNotAllowedTypesForNonAdmins(RoleType roleType)
             list.add(EntityType.VR);
             list.add(EntityType.SYSTEM_VM);
             list.add(EntityType.MANAGEMENT_SERVER);
+            list.add(EntityType.OBJECT_STORAGE);
             if (roleType != RoleType.DomainAdmin) {
                 list.add(EntityType.DOMAIN);
                 list.add(EntityType.SERVICE_OFFERING);

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

@@ -78,7 +78,9 @@ public enum ApiCommandResourceType {
     VmSnapshot(com.cloud.vm.snapshot.VMSnapshot.class),
     Role(org.apache.cloudstack.acl.Role.class),
     VpnCustomerGateway(com.cloud.network.Site2SiteCustomerGateway.class),
-    ManagementServer(org.apache.cloudstack.management.ManagementServerHost.class);
+    ManagementServer(org.apache.cloudstack.management.ManagementServerHost.class),
+    ObjectStore(org.apache.cloudstack.storage.object.ObjectStore.class),
+    Bucket(org.apache.cloudstack.storage.object.Bucket.class);
 
     private final Class<?> clazz;
 

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

@@ -1050,10 +1050,20 @@ public class ApiConstants {
     public static final String MTU = "mtu";
     public static final String AUTO_ENABLE_KVM_HOST = "autoenablekvmhost";
     public static final String LIST_APIS = "listApis";
+    public static final String OBJECT_STORAGE_ID = "objectstorageid";
+    public static final String VERSIONING = "versioning";
+    public static final String OBJECT_LOCKING = "objectlocking";
+    public static final String ENCRYPTION = "encryption";
+    public static final String QUOTA = "quota";
+    public static final String ACCESS_KEY = "accesskey";
 
     public static final String SOURCE_NAT_IP = "sourcenatipaddress";
     public static final String SOURCE_NAT_IP_ID = "sourcenatipaddressid";
     public static final String HAS_RULES = "hasrules";
+    public static final String OBJECT_STORAGE = "objectstore";
+
+    public static final String HEURISTIC_RULE = "heuristicrule";
+    public static final String HEURISTIC_TYPE_VALID_OPTIONS = "Valid options are: ISO, SNAPSHOT, TEMPLATE and VOLUME.";
 
     public static final String MANAGEMENT = "management";
     public static final String IS_VNF = "isvnf";

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

@@ -42,6 +42,7 @@
 import org.apache.cloudstack.network.lb.ApplicationLoadBalancerService;
 import org.apache.cloudstack.network.lb.InternalLoadBalancerVMService;
 import org.apache.cloudstack.query.QueryService;
+import org.apache.cloudstack.storage.object.BucketApiService;
 import org.apache.cloudstack.storage.ImageStoreService;
 import org.apache.cloudstack.storage.template.VnfTemplateManager;
 import org.apache.cloudstack.usage.UsageService;
@@ -216,6 +217,9 @@ public static enum CommandType {
     public Ipv6Service ipv6Service;
     @Inject
     public VnfTemplateManager vnfTemplateManager;
+    @Inject
+    public BucketApiService _bucketService;
+
 
     public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException,
         ResourceAllocationException, NetworkRuleConflictException;

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

@@ -22,6 +22,7 @@
 import java.util.Map;
 import java.util.Set;
 
+import org.apache.cloudstack.storage.object.Bucket;
 import org.apache.cloudstack.affinity.AffinityGroup;
 import org.apache.cloudstack.affinity.AffinityGroupResponse;
 import org.apache.cloudstack.api.ApiConstants.HostDetails;
@@ -37,6 +38,7 @@
 import org.apache.cloudstack.api.response.BackupOfferingResponse;
 import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.api.response.BackupScheduleResponse;
+import org.apache.cloudstack.api.response.BucketResponse;
 import org.apache.cloudstack.api.response.CapacityResponse;
 import org.apache.cloudstack.api.response.ClusterResponse;
 import org.apache.cloudstack.api.response.ConditionResponse;
@@ -82,6 +84,7 @@
 import org.apache.cloudstack.api.response.NetworkResponse;
 import org.apache.cloudstack.api.response.NicResponse;
 import org.apache.cloudstack.api.response.NicSecondaryIpResponse;
+import org.apache.cloudstack.api.response.ObjectStoreResponse;
 import org.apache.cloudstack.api.response.OvsProviderResponse;
 import org.apache.cloudstack.api.response.PhysicalNetworkResponse;
 import org.apache.cloudstack.api.response.PodResponse;
@@ -101,6 +104,7 @@
 import org.apache.cloudstack.api.response.RollingMaintenanceResponse;
 import org.apache.cloudstack.api.response.RouterHealthCheckResultResponse;
 import org.apache.cloudstack.api.response.SSHKeyPairResponse;
+import org.apache.cloudstack.api.response.SecondaryStorageHeuristicsResponse;
 import org.apache.cloudstack.api.response.SecurityGroupResponse;
 import org.apache.cloudstack.api.response.ServiceOfferingResponse;
 import org.apache.cloudstack.api.response.ServiceResponse;
@@ -145,6 +149,8 @@
 import org.apache.cloudstack.region.PortableIp;
 import org.apache.cloudstack.region.PortableIpRange;
 import org.apache.cloudstack.region.Region;
+import org.apache.cloudstack.secstorage.heuristics.Heuristic;
+import org.apache.cloudstack.storage.object.ObjectStore;
 import org.apache.cloudstack.usage.Usage;
 
 import com.cloud.capacity.Capacity;
@@ -532,5 +538,11 @@ List<TemplateResponse> createTemplateResponses(ResponseView view, VirtualMachine
 
     FirewallResponse createIpv6FirewallRuleResponse(FirewallRule acl);
 
+    SecondaryStorageHeuristicsResponse createSecondaryStorageSelectorResponse(Heuristic heuristic);
+
     IpQuarantineResponse createQuarantinedIpsResponse(PublicIpQuarantine publicIp);
+
+    ObjectStoreResponse createObjectStoreResponse(ObjectStore os);
+
+    BucketResponse createBucketResponse(Bucket bucket);
 }