Merge remote-tracking branch 'upstream/main' into instance

Author: abh1sar

.asf.yaml

@@ -53,13 +53,12 @@ github:
     - acs-robot
     - gpordeus
     - hsato03
-    - bernardodemarco
     - FelipeM525
     - lucas-a-martins
     - nicoschmdt
     - abh1sar
-    - sudo87
     - rosi-shapeblue
+    - sudo87
 
   protected_branches: ~
 

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

@@ -227,6 +227,7 @@ public class ApiConstants {
     public static final String FORCED_DESTROY_LOCAL_STORAGE = "forcedestroylocalstorage";
     public static final String FORCE_DELETE_HOST = "forcedeletehost";
     public static final String FORCE_MS_TO_IMPORT_VM_FILES = "forcemstoimportvmfiles";
+    public static final String FORCE_UPDATE_OS_TYPE = "forceupdateostype";
     public static final String FORMAT = "format";
     public static final String FOR_VIRTUAL_NETWORK = "forvirtualnetwork";
     public static final String FOR_SYSTEM_VMS = "forsystemvms";

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

@@ -51,6 +51,10 @@ public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
                description = "the ID of the OS type that best represents the OS of this image.")
     private Long osTypeId;
 
+    @Parameter(name = ApiConstants.FORCE_UPDATE_OS_TYPE, type = CommandType.BOOLEAN, since = "4.21", description = "Force OS type update. Warning: Updating OS type will " +
+            "update the guest OS configuration for all the existing Instances deployed with this template/iso, which may affect their behavior.")
+    private Boolean forceUpdateOsType;
+
     @Parameter(name = ApiConstants.FORMAT, type = CommandType.STRING, description = "the format for the image")
     private String format;
 
@@ -112,6 +116,10 @@ public Long getOsTypeId() {
         return osTypeId;
     }
 
+    public Boolean getForceUpdateOsType() {
+        return forceUpdateOsType;
+    }
+
     public Boolean getPasswordEnabled() {
         return passwordEnabled;
     }

api/src/main/java/org/apache/cloudstack/api/command/user/backup/DeleteBackupScheduleCmd.java

@@ -43,7 +43,7 @@
         description = "Deletes the backup schedule of a VM",
         responseObject = SuccessResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
-public class DeleteBackupScheduleCmd  extends BaseCmd {
+public class DeleteBackupScheduleCmd extends BaseCmd {
 
     @Inject
     private BackupManager backupManager;
@@ -52,17 +52,13 @@ public class DeleteBackupScheduleCmd  extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID,
-            type = CommandType.UUID,
-            entityType = UserVmResponse.class,
-            description = "ID of the VM")
+    @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, entityType = UserVmResponse.class,
+            description = "ID of the VM from which all backup schedules will be deleted.")
     private Long vmId;
 
-    @Parameter(name = ApiConstants.ID,
-            type = CommandType.UUID,
-            entityType = BackupScheduleResponse.class,
-            description = "ID of the schedule",
-            since = "4.20.1")
+    @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = BackupScheduleResponse.class,
+            since = "4.20.1", description = "ID of the backup schedule to be deleted. It has precedence over the 'virtualmachineid' parameter, " +
+            "i.e., when the 'id' parameter is specified, the 'virtualmachineid' parameter will be ignored.")
     private Long id;
 
     /////////////////////////////////////////////////////

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

@@ -28,6 +28,9 @@
 
 @EntityReference(value = BackupSchedule.class)
 public class BackupScheduleResponse extends BaseResponse {
+    @SerializedName(ApiConstants.ID)
+    @Param(description = "ID of the backup schedule.")
+    private String id;
 
     @SerializedName(ApiConstants.VIRTUAL_MACHINE_NAME)
     @Param(description = "name of the VM")
@@ -51,7 +54,11 @@ public class BackupScheduleResponse extends BaseResponse {
 
     @SerializedName(ApiConstants.MAX_BACKUPS)
     @Param(description = "maximum number of backups retained")
-    private Integer maxBakups;
+    private Integer maxBackups;
+
+    public void setId(String id) {
+        this.id = id;
+    }
 
     @SerializedName(ApiConstants.QUIESCE_VM)
     @Param(description = "quiesce the instance before checkpointing the disks for backup")
@@ -97,8 +104,8 @@ public void setTimezone(String timezone) {
         this.timezone = timezone;
     }
 
-    public void setMaxBakups(Integer maxBakups) {
-        this.maxBakups = maxBakups;
+    public void setMaxBackups(Integer maxBackups) {
+        this.maxBackups = maxBackups;
     }
 
     public void setQuiesceVM(Boolean quiesceVM) {

api/src/main/java/org/apache/cloudstack/backup/BackupSchedule.java

@@ -32,4 +32,5 @@ public interface BackupSchedule extends InternalIdentity {
     Long getAsyncJobId();
     Integer getMaxBackups();
     Boolean getQuiesceVM();
+    String getUuid();
 }

client/pom.xml

@@ -321,16 +321,6 @@
             <artifactId>cloud-plugin-hypervisor-ucs</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-hypervisor-ovm</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.cloudstack</groupId>
-            <artifactId>cloud-plugin-hypervisor-ovm3</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.apache.cloudstack</groupId>
             <artifactId>cloud-plugin-hypervisor-kvm</artifactId>

engine/schema/src/main/java/org/apache/cloudstack/backup/BackupScheduleVO.java

@@ -18,6 +18,7 @@
 package org.apache.cloudstack.backup;
 
 import java.util.Date;
+import java.util.UUID;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -39,6 +40,9 @@ public class BackupScheduleVO implements BackupSchedule {
     @Column(name = "id")
     private long id;
 
+    @Column(name = "uuid", nullable = false)
+    private String uuid = UUID.randomUUID().toString();
+
     @Column(name = "vm_id")
     private Long vmId;
 
@@ -88,6 +92,11 @@ public long getId() {
         return id;
     }
 
+    @Override
+    public String getUuid() {
+        return uuid;
+    }
+
     public Long getVmId() {
         return vmId;
     }

engine/schema/src/main/java/org/apache/cloudstack/backup/dao/BackupScheduleDaoImpl.java

@@ -92,12 +92,13 @@ public List<BackupScheduleVO> getSchedulesToExecute(Date currentTimestamp) {
     public BackupScheduleResponse newBackupScheduleResponse(BackupSchedule schedule) {
         VMInstanceVO vm = vmInstanceDao.findByIdIncludingRemoved(schedule.getVmId());
         BackupScheduleResponse response = new BackupScheduleResponse();
+        response.setId(schedule.getUuid());
         response.setVmId(vm.getUuid());
         response.setVmName(vm.getHostName());
         response.setIntervalType(schedule.getScheduleType());
         response.setSchedule(schedule.getSchedule());
         response.setTimezone(schedule.getTimezone());
-        response.setMaxBakups(schedule.getMaxBackups());
+        response.setMaxBackups(schedule.getMaxBackups());
         if (schedule.getQuiesceVM() != null) {
             response.setQuiesceVM(schedule.getQuiesceVM());
         }

engine/schema/src/main/resources/META-INF/db/schema-42010to42100.sql

@@ -230,6 +230,9 @@ CREATE TABLE IF NOT EXISTS `cloud`.`gui_themes_details` (
     CONSTRAINT `fk_gui_themes_details__gui_theme_id` FOREIGN KEY (`gui_theme_id`) REFERENCES `gui_themes`(`id`)
 );
 
+CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'uuid', 'VARCHAR(40) NOT NULL');
+UPDATE `cloud`.`backup_schedule` SET uuid = UUID();
+
 -- Add column max_backup to backup_schedule table
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'max_backups', 'int(8) default NULL COMMENT "maximum number of backups to maintain"');
 CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.backup_schedule', 'quiescevm', 'tinyint(1) default NULL COMMENT "Quiesce VM before taking backup"');