Merge branch 'apache:main' into main

Author: mhkadhum

.github/dependabot.yml

@@ -26,3 +26,5 @@ updates:
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    cooldown:
+      default-days: 7

.github/workflows/stale.yml

@@ -33,9 +33,11 @@ jobs:
           stale-issue-message: 'This issue is stale because it has been open for 120 days with no activity. It may be removed by administrators of this project at any time. Remove the stale label or comment to request for removal of it to prevent this.'
           stale-pr-message: 'This PR is stale because it has been open for 120 days with no activity. It may be removed by administrators of this project at any time. Remove the stale label or comment to request for removal of it to prevent this.'
           close-issue-message: 'This issue was closed because it has been stale for 120 days with no activity.'
-          close-pr-message: 'This PR was closed because it has been stale for 120 days with no activity.'
+          close-pr-message: 'This PR was closed because it has been stale for 240 days with no activity.'
           stale-issue-label: 'no-issue-activity'
           stale-pr-label: 'no-pr-activity'
           days-before-stale: 120
+          days-before-close: -1
+          days-before-pr-close: 240
           exempt-issue-labels: 'gsoc,good-first-issue,long-term-plan'
           exempt-pr-labels: 'status:ready-for-merge,status:needs-testing,status:on-hold'

.pre-commit-config.yaml

@@ -62,6 +62,16 @@ repos:
           - .github/workflows/license-templates/LICENSE.txt
           - --fuzzy-match-generates-todo
         exclude: ^(CHANGES|ISSUE_TEMPLATE|PULL_REQUEST_TEMPLATE)\.md$|^ui/docs/(full|smoke)-test-plan\.template\.md$
+      - id: insert-license
+        name: add license for all properties files
+        description: automatically adds a licence header to all properties files that don't have a license header
+        files: \.properties$
+        args:
+          - --comment-style
+          - '|#|'
+          - --license-filepath
+          - .github/workflows/license-templates/LICENSE.txt
+          - --fuzzy-match-generates-todo
       - id: insert-license
         name: add license for all Shell files
         description: automatically adds a licence header to all Shell files that don't have a license header

api/src/main/java/com/cloud/vm/VmDetailConstants.java

@@ -55,6 +55,9 @@ public interface VmDetailConstants {
     String NIC_MULTIQUEUE_NUMBER = "nic.multiqueue.number";
     String NIC_PACKED_VIRTQUEUES_ENABLED = "nic.packed.virtqueues.enabled";
 
+    // KVM specific, disk controllers
+    String KVM_SKIP_FORCE_DISK_CONTROLLER = "skip.force.disk.controller";
+
     // Mac OSX guest specific (internal)
     String SMC_PRESENT = "smc.present";
     String FIRMWARE = "firmware";

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

@@ -375,6 +375,7 @@ public class ApiConstants {
     public static final String MAC_ADDRESS = "macaddress";
     public static final String MAC_ADDRESSES = "macaddresses";
     public static final String MANUAL_UPGRADE = "manualupgrade";
+    public static final String MATCH_TYPE = "matchtype";
     public static final String MAX = "max";
     public static final String MAX_SNAPS = "maxsnaps";
     public static final String MAX_BACKUPS = "maxbackups";

api/src/main/java/org/apache/cloudstack/api/command/admin/user/DisableUserCmd.java

@@ -78,12 +78,12 @@ public long getEntityOwnerId() {
 
     @Override
     public String getEventDescription() {
-        return "disabling user: " + getId();
+        return "disabling user: " + this._uuidMgr.getUuid(User.class, getId());
     }
 
     @Override
     public void execute() {
-        CallContext.current().setEventDetails("UserId: " + getId());
+        CallContext.current().setEventDetails("User ID: " + this._uuidMgr.getUuid(User.class, getId()));
         UserAccount user = _regionService.disableUser(this);
 
         if (user != null) {

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

@@ -19,6 +19,7 @@
 
 import javax.inject.Inject;
 
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandResourceType;
@@ -138,7 +139,8 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Creating backup for Instance " + vmId;
+        String vmUuid = _uuidMgr.getUuid(VirtualMachine.class, getVmId());
+        return "Creating backup for Instance " + vmUuid;
     }
 
     @Override

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

@@ -26,7 +26,6 @@
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
 import org.apache.cloudstack.api.ServerApiException;
-import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.api.response.BackupScheduleResponse;
 import org.apache.cloudstack.api.response.UserVmResponse;
 import org.apache.cloudstack.backup.BackupManager;
@@ -38,7 +37,7 @@
 
 @APICommand(name = "createBackupSchedule",
         description = "Creates a User-defined Instance backup schedule",
-        responseObject = BackupResponse.class, since = "4.14.0",
+        responseObject = BackupScheduleResponse.class, since = "4.14.0",
         authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
 public class CreateBackupScheduleCmd extends BaseCmd {
 

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

@@ -28,6 +28,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.BackupResponse;
 import org.apache.cloudstack.api.response.SuccessResponse;
+import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.lang3.BooleanUtils;
@@ -111,6 +112,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Deleting backup ID " + backupId;
+        String backupUuid = _uuidMgr.getUuid(Backup.class, getId());
+        return "Deleting backup ID " + backupUuid;
     }
 }

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

@@ -28,6 +28,7 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.BackupResponse;
+import org.apache.cloudstack.backup.Backup;
 import org.apache.cloudstack.backup.BackupManager;
 import org.apache.cloudstack.context.CallContext;
 
@@ -99,6 +100,7 @@ public String getEventType() {
 
     @Override
     public String getEventDescription() {
-        return "Restoring Instance from backup: " + backupId;
+        String backupUuid = _uuidMgr.getUuid(Backup.class, getBackupId());
+        return "Restoring Instance from backup: " + backupUuid;
     }
 }