(cloudstack) branch 4.20 updated: api: create/register/upload template with empty template tag (#12234)

[dahn]

This is an automated email from the ASF dual-hosted git repository.

dahn pushed a commit to branch 4.20
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.20 by this push:
     new ba26d95ad7c api: create/register/upload template with empty template 
tag (#12234)
ba26d95ad7c is described below

commit ba26d95ad7c8c2f71029da22c4f82fc0fcc7c968
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Tue Dec 16 15:48:06 2025 +0100

    api: create/register/upload template with empty template tag (#12234)
---
 .../apache/cloudstack/api/command/user/template/CreateTemplateCmd.java  | 2 +-
 .../api/command/user/template/GetUploadParamsForTemplateCmd.java        | 2 +-
 .../cloudstack/api/command/user/template/RegisterTemplateCmd.java       | 2 +-
 .../src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java   | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
index 5f09ac6698d..ec5624715b6 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/template/CreateTemplateCmd.java
@@ -211,7 +211,7 @@ public class CreateTemplateCmd extends BaseAsyncCreateCmd 
implements UserCmd {
     }
 
     public String getTemplateTag() {
-        return templateTag;
+        return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
     public Map getDetails() {
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
index 8fa1a5d53eb..a4596c04a92 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/template/GetUploadParamsForTemplateCmd.java
@@ -160,7 +160,7 @@ public class GetUploadParamsForTemplateCmd extends 
AbstractGetUploadParamsCmd {
     }
 
     public String getTemplateTag() {
-        return templateTag;
+        return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
     public boolean isDeployAsIs() {
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
 
b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
index 1f968b869b9..8fe1a93a5a2 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/template/RegisterTemplateCmd.java
@@ -265,7 +265,7 @@ public class RegisterTemplateCmd extends BaseCmd implements 
UserCmd {
     }
 
     public String getTemplateTag() {
-        return templateTag;
+        return StringUtils.isBlank(templateTag) ? null : templateTag;
     }
 
     public Map getDetails() {
diff --git 
a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 22cfe785edf..c11d8e1ae08 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -734,7 +734,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
                     logger.debug("Unable to allocate proxy {} with {} in {} 
due to [{}]. Retrying with another template", proxy, template, dc, 
e.getMessage(), e);
                     continue;
                 }
-                throw new CloudRuntimeException("Failed to allocate proxy [%s] 
in zone [%s] with available templates", e);
+                throw new CloudRuntimeException(String.format("Failed to 
allocate proxy [%s] in zone [%s] with available templates", proxy, dc), e);
             }
         }