Merge release branch 4.22 to main

* 4.22:
  Update templateConfig.sh to not break with directorys with space on t… (#10898)
  Fix VM and volume metrics listing regressions (#12284)
  packaging: use latest cmk release link directly (#11429)
  api:rename RegisterCmd.java => RegisterUserKeyCmd.java (#12259)
  Prioritize copying templates from other secondary storages instead of downloading them (#10363)
  Show time correctly in the backup schedule UI  (#12012)
  kvm: use preallocation option for fat disk resize (#11986)
  Python exception processing static routes fixed (#11967)
  KVM memballooning requires free page reporting and autodeflate (#11932)
  api: create/register/upload template with empty template tag (#12234)

Author: Daan Hoogland

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

@@ -25,7 +25,7 @@
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
 import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 
 import com.cloud.dc.DataCenter;
@@ -95,7 +95,7 @@ User createUser(String userName, String password, String firstName, String lastN
 
     void markUserRegistered(long userId);
 
-    public String[] createApiKeyAndSecretKey(RegisterCmd cmd);
+    public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd cmd);
 
     public String[] createApiKeyAndSecretKey(final long userId);
 

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

@@ -26,14 +26,14 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.RegisterResponse;
+import org.apache.cloudstack.api.response.RegisterUserKeyResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 
 import java.util.Map;
 
 @APICommand(name = "getUserKeys",
             description = "This command allows the user to query the seceret and API keys for the account",
-            responseObject = RegisterResponse.class,
+            responseObject = RegisterUserKeyResponse.class,
             requestHasSensitiveInfo = false,
             responseHasSensitiveInfo = true,
             authorized = {RoleType.User, RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin},
@@ -57,7 +57,7 @@ public Long getID(){
     public void execute(){
         Pair<Boolean, Map<String, String>> keys = _accountService.getKeys(this);
 
-        RegisterResponse response = new RegisterResponse();
+        RegisterUserKeyResponse response = new RegisterUserKeyResponse();
         if(keys != null){
             response.setApiKeyAccess(keys.first());
             response.setApiKey(keys.second().get("apikey"));

…/api/command/admin/user/RegisterCmd.java …mmand/admin/user/RegisterUserKeyCmd.javaapi/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java renamed to api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java

@@ -22,17 +22,17 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.RegisterResponse;
+import org.apache.cloudstack.api.response.RegisterUserKeyResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 
 import com.cloud.user.Account;
 import com.cloud.user.User;
 
 @APICommand(name = "registerUserKeys",
-            responseObject = RegisterResponse.class,
+            responseObject = RegisterUserKeyResponse.class,
             description = "This command allows a user to register for the developer API, returning a secret key and an API key. This request is made through the integration API port, so it is a privileged command and must be made on behalf of a user. It is up to the implementer just how the username and password are entered, and then how that translates to an integration API request. Both secret key and API key should be returned to the user",
             requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RegisterCmd extends BaseCmd {
+public class RegisterUserKeyCmd extends BaseCmd {
 
 
     /////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public ApiCommandResourceType getApiResourceType() {
     @Override
     public void execute() {
         String[] keys = _accountService.createApiKeyAndSecretKey(this);
-        RegisterResponse response = new RegisterResponse();
+        RegisterUserKeyResponse response = new RegisterUserKeyResponse();
         if (keys != null) {
             response.setApiKey(keys[0]);
             response.setSecretKey(keys[1]);

api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java

@@ -211,7 +211,7 @@ public String getUrl() {
     }
 
     public String getTemplateTag() {
-        return templateTag;
+        return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
     public Map getDetails() {

api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java

@@ -170,7 +170,7 @@ public Boolean isSshKeyEnabled() {
     }
 
     public String getTemplateTag() {
-        return templateTag;
+        return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
     public boolean isDeployAsIs() {

api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java

@@ -279,7 +279,7 @@ public String getChecksum() {
     }
 
     public String getTemplateTag() {
-        return templateTag;
+        return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
     public Map getDetails() {

…stack/api/response/RegisterResponse.java …pi/response/RegisterUserKeyResponse.javaapi/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java renamed to api/src/main/java/org/apache/cloudstack/api/response/RegisterUserKeyResponse.java api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java renamed to api/src/main/java/org/apache/cloudstack/api/response/RegisterUserKeyResponse.java

@@ -23,7 +23,7 @@
 
 import com.cloud.serializer.Param;
 
-public class RegisterResponse extends BaseResponse {
+public class RegisterUserKeyResponse extends BaseResponse {
     @SerializedName(ApiConstants.API_KEY)
     @Param(description = "the api key of the registered user", isSensitive = true)
     private String apiKey;

debian/rules

@@ -4,7 +4,6 @@ VERSION := $(shell grep '<version>' pom.xml | head -2 | tail -1 | cut -d'>' -f2
 PACKAGE = $(shell dh_listpackages|head -n 1|cut -d '-' -f 1)
 SYSCONFDIR = "/etc"
 DESTDIR = "debian/tmp"
-CMK_REL := $(shell wget -O - "https://api.github.com/repos/apache/cloudstack-cloudmonkey/releases" 2>/dev/null | jq -r '.[0].tag_name')
 
 %:
 	dh $@ --with systemd
@@ -90,7 +89,7 @@ override_dh_auto_install:
 	rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-management/templates/systemvm/sha512sum.txt
 
 	# Bundle cmk in cloudstack-management
-	wget https://github.com/apache/cloudstack-cloudmonkey/releases/download/$(CMK_REL)/cmk.linux.x86-64 -O $(DESTDIR)/usr/bin/cmk
+	wget https://github.com/apache/cloudstack-cloudmonkey/releases/latest/download/cmk.linux.x86-64 -O $(DESTDIR)/usr/bin/cmk
 	chmod +x $(DESTDIR)/usr/bin/cmk
 
 	# nast hack for a couple of configuration files

engine/api/src/main/java/org/apache/cloudstack/engine/orchestration/service/StorageOrchestrationService.java

@@ -18,12 +18,18 @@
 package org.apache.cloudstack.engine.orchestration.service;
 
 import java.util.List;
+import java.util.concurrent.Future;
 
 import org.apache.cloudstack.api.response.MigrationResponse;
+import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
+import org.apache.cloudstack.engine.subsystem.api.storage.TemplateService.TemplateApiResult;
 import org.apache.cloudstack.storage.ImageStoreService.MigrationPolicy;
 
 public interface StorageOrchestrationService {
     MigrationResponse migrateData(Long srcDataStoreId, List<Long> destDatastores, MigrationPolicy migrationPolicy);
 
     MigrationResponse migrateResources(Long srcImgStoreId, Long destImgStoreId, List<Long> templateIdList, List<Long> snapshotIdList);
+
+    Future<TemplateApiResult> orchestrateTemplateCopyToImageStore(TemplateInfo source, DataStore destStore);
 }

engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/TemplateService.java

@@ -78,4 +78,6 @@ public TemplateInfo getTemplate() {
     AsyncCallFuture<TemplateApiResult> createDatadiskTemplateAsync(TemplateInfo parentTemplate, TemplateInfo dataDiskTemplate, String path, String diskId, long fileSize, boolean bootable);
 
     List<DatadiskTO> getTemplateDatadisksOnImageStore(TemplateInfo templateInfo, String configurationId);
+
+    AsyncCallFuture<TemplateApiResult> copyTemplateToImageStore(DataObject source, DataStore destStore);
 }