Merge 828f186b98 into cd5bb09d0d

back to using name
Merge branch '4.20' into defaultDisplayName
2026-01-22 09:59:54 +00:00 · 2025-12-24 11:05:35 +01:00 · 2025-12-23 20:43:20 +01:00 · 2025-12-08 16:25:57 +01:00 · 2024-09-23 10:45:48 +02:00 · 2024-09-23 10:45:39 +02:00
2 changed files with 10 additions and 1 deletions
--- 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,8 @@ 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 org.apache.log4j.Logger;

 import com.cloud.agent.api.LogLevel;
 import com.cloud.event.EventTypes;
@ -74,6 +75,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 +300,9 @@ public class DeployVMCmd extends BaseAsyncCreateCustomIdCmd implements SecurityG
    }

    public String getDisplayName() {
+        if (StringUtils.isEmpty(displayName)) {
+            displayName = name;
+        }
        return displayName;
    }

--- 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;
    }
Author	SHA1	Message	Date
dahn	7ebfbe67b8	Merge `828f186b98` into `cd5bb09d0d`	2026-01-22 09:59:54 +00:00
Daan Hoogland	828f186b98	back to using name	2025-12-24 11:05:35 +01:00
dahn	4da0dd2988	Merge branch '4.20' into defaultDisplayName	2025-12-23 20:43:20 +01:00
dahn	96988ea6cf	Merge branch '4.20' into defaultDisplayName	2025-12-08 16:25:57 +01:00
Daan Hoogland	7e3bf26e45	list by displayname instead of name	2024-09-23 10:45:48 +02:00
Daan Hoogland	b4ac303ed4	set `desplayName` to `name` by default	2024-09-23 10:45:39 +02:00