(cloudstack) branch 4.20 updated: set `displayName` to `name` by default (#9719)

[harikrishna]

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

harikrishna 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 25eacaa1ff1 set `displayName` to `name` by default (#9719)
25eacaa1ff1 is described below

commit 25eacaa1ff1a1c01aa51a9ae745734961ca33956
Author: dahn <d...@onecht.net>
AuthorDate: Fri Jan 30 08:33:21 2026 +0100

    set `displayName` to `name` by default (#9719)
    
    * set `desplayName` to `name` by default
    
    * list by displayname instead of name
    
    * back to using name
    
    * Update 
api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
    
    ---------
    
    Co-authored-by: Daan Hoogland <d...@apache.org>
---
 .../java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java  | 5 ++++-
 .../java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java  | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java 
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
index e3b7e343623..f08f906997c 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
@@ -56,7 +56,6 @@ import org.apache.cloudstack.context.CallContext;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.BooleanUtils;
-import org.apache.commons.lang3.StringUtils;
 
 import com.cloud.agent.api.LogLevel;
 import com.cloud.event.EventTypes;
@@ -74,6 +73,7 @@ import com.cloud.template.VirtualMachineTemplate;
 import com.cloud.uservm.UserVm;
 import com.cloud.utils.net.Dhcp;
 import com.cloud.utils.net.NetUtils;
+import com.cloud.utils.StringUtils;
 import com.cloud.vm.VirtualMachine;
 import com.cloud.vm.VmDetailConstants;
 
@@ -298,6 +298,9 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd 
implements SecurityG
     }
 
     public String getDisplayName() {
+        if (StringUtils.isEmpty(displayName)) {
+            displayName = name;
+        }
         return displayName;
     }
 
diff --git 
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java 
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
index 2185c042820..67a929bc6c2 100644
--- 
a/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
+++ 
b/api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java
@@ -21,6 +21,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.utils.StringUtils;
 import com.cloud.utils.exception.CloudRuntimeException;
 
 import org.apache.cloudstack.api.ApiArgValidator;
@@ -159,6 +160,9 @@ public class UpdateVMCmd extends BaseCustomIdCmd implements 
SecurityGroupAction,
     /////////////////////////////////////////////////////
 
     public String getDisplayName() {
+        if (StringUtils.isBlank(displayName)) {
+            displayName = name;
+        }
         return displayName;
     }