From b4ac303ed4a5fe7e9922dbd98483158b0d9cf874 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Mon, 23 Sep 2024 08:58:13 +0200 Subject: [PATCH 1/3] set `desplayName` to `name` by default --- .../apache/cloudstack/api/command/user/vm/DeployVMCmd.java | 5 ++++- .../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 107bd8175165..d06c4686ae1d 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 @@ -27,6 +27,7 @@ import javax.annotation.Nonnull; +import com.cloud.utils.StringUtils; import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ACL; @@ -55,7 +56,6 @@ 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; @@ -283,6 +283,9 @@ public String getDeploymentPlanner() { } 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 32ce1f6db524..886db7c83e9c 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.List; import java.util.Map; +import com.cloud.utils.StringUtils; import com.cloud.utils.exception.CloudRuntimeException; import org.apache.cloudstack.api.response.UserDataResponse; import org.apache.log4j.Logger; @@ -151,6 +152,9 @@ public class UpdateVMCmd extends BaseCustomIdCmd implements SecurityGroupAction, ///////////////////////////////////////////////////// public String getDisplayName() { + if (StringUtils.isBlank(displayName)) { + displayName = name; + } return displayName; } From 7e3bf26e45f5f806d222efe8290fb319ee3e0988 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Fri, 12 Jan 2024 16:06:42 +0100 Subject: [PATCH 2/3] list by displayname instead of name --- ui/src/config/section/compute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index 9bf8c9491448..4dc1f1645145 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -46,7 +46,7 @@ export default { return filters }, columns: () => { - const fields = ['name', 'state', 'ipaddress'] + const fields = ['displayname', 'state', 'ipaddress'] const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal', { memoryused: (record) => { @@ -74,7 +74,7 @@ export default { fields.push('zonename') return fields }, - searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'tags'], + searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'tags'], details: () => { var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename', 'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'boottype', 'bootmode', 'account', From 828f186b984b01aaa8b4f95dc390fb1aa3433a85 Mon Sep 17 00:00:00 2001 From: Daan Hoogland Date: Wed, 24 Dec 2025 11:05:35 +0100 Subject: [PATCH 3/3] back to using name --- ui/src/config/section/compute.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ui/src/config/section/compute.js b/ui/src/config/section/compute.js index e36d48630946..3b483c19b74e 100644 --- a/ui/src/config/section/compute.js +++ b/ui/src/config/section/compute.js @@ -47,7 +47,7 @@ export default { return filters }, columns: () => { - const fields = ['displayname', 'state', 'ipaddress'] + const fields = ['name', 'state', 'ipaddress'] const metricsFields = ['cpunumber', 'cputotal', 'cpuused', 'memorytotal', { memoryused: (record) => { @@ -78,7 +78,7 @@ export default { fields.push('zonename') return fields }, - searchFilters: ['displayname', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'tags'], + searchFilters: ['name', 'zoneid', 'domainid', 'account', 'groupid', 'arch', 'tags'], details: () => { var fields = ['name', 'displayname', 'id', 'state', 'ipaddress', 'ip6address', 'templatename', 'ostypename', 'serviceofferingname', 'isdynamicallyscalable', 'haenable', 'hypervisor', 'arch', 'boottype', 'bootmode', 'account',