apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow modification of user vm details if user.vm.readonly.details is empty

Browse Source
This commit is contained in:
Pearl Dsilva 2025-11-10 13:57:49 -05:00
parent 50fe265017
commit 2e631b5909
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/main/java/org/apache/cloudstack/query/QueryService.java
View File

@ -17,6 +17,7 @@
package org.apache.cloudstack.query; package org.apache.cloudstack.query;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.affinity.AffinityGroupResponse;
@ -120,7 +121,7 @@ public interface QueryService {
ConfigKey<String> UserVMReadOnlyDetails = new ConfigKey<>(String.class, ConfigKey<String> UserVMReadOnlyDetails = new ConfigKey<>(String.class,
"user.vm.readonly.details", "Advanced", "dataDiskController, rootDiskController", "user.vm.readonly.details", "Advanced", "dataDiskController, rootDiskController",
"List of read-only VM settings/details as comma separated string", true, ConfigKey.Scope.Global, null, null, null, null, null, ConfigKey.Kind.CSV, null); "List of read-only VM settings/details as comma separated string", true, Collections.singletonList(ConfigKey.Scope.Global), null, null, null, null, null, ConfigKey.Kind.CSV, null, "");
ConfigKey<Boolean> SortKeyAscending = new ConfigKey<>("Advanced", Boolean.class, "sortkey.algorithm", "true", ConfigKey<Boolean> SortKeyAscending = new ConfigKey<>("Advanced", Boolean.class, "sortkey.algorithm", "true",
"Sort algorithm - ascending or descending - to use. For entities that use sort key(template, disk offering, service offering, " + "Sort algorithm - ascending or descending - to use. For entities that use sort key(template, disk offering, service offering, " +

27
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java
View File

@ -267,10 +267,18 @@ public class ConfigKey<T> {
static ConfigDepotImpl s_depot = null; static ConfigDepotImpl s_depot = null;
static public void init(ConfigDepotImpl depot) { private String _defaultValueIfEmpty = null;
public static void init(ConfigDepotImpl depot) {
s_depot = depot; s_depot = depot;
} }
public ConfigKey(Class<T> type, String name, String category, String defaultValue, String description, boolean isDynamic, List<Scope> scopes, T multiplier,
String displayText, String parent, Ternary<String, String, Long> group, Pair<String, Long> subGroup, Kind kind, String options, String defaultValueIfEmpty) {
this(type, name, category, defaultValue, description, isDynamic, scopes, multiplier, displayText, parent, group, subGroup, kind, options);
this._defaultValueIfEmpty = defaultValueIfEmpty;
}
public ConfigKey(String category, Class<T> type, String name, String defaultValue, String description, boolean isDynamic, Scope scope) { public ConfigKey(String category, Class<T> type, String name, String defaultValue, String description, boolean isDynamic, Scope scope) {
this(type, name, category, defaultValue, description, isDynamic, scope, null); this(type, name, category, defaultValue, description, isDynamic, scope, null);
} }
@ -380,7 +388,19 @@ public class ConfigKey<T> {
public T value() { public T value() {
if (_value == null || isDynamic()) { if (_value == null || isDynamic()) {
String value = s_depot != null ? s_depot.getConfigStringValue(_name, Scope.Global, null) : null; String value = s_depot != null ? s_depot.getConfigStringValue(_name, Scope.Global, null) : null;
_value = valueOf((value == null) ? defaultValue() : value);
String effective;
if (value != null) {
if (value.isEmpty() && _defaultValueIfEmpty != null) {
effective = _defaultValueIfEmpty;
} else {
effective = value;
}
} else {
effective = _defaultValueIfEmpty != null ? _defaultValueIfEmpty : defaultValue();
}
_value = valueOf(effective);
} }
return _value; return _value;
} }
@ -409,6 +429,9 @@ public class ConfigKey<T> {
return valueInGlobalOrAvailableParentScope(scope, id); return valueInGlobalOrAvailableParentScope(scope, id);
} }
logger.trace("Scope({}) value for config ({}): {}", scope, _name, _value); logger.trace("Scope({}) value for config ({}): {}", scope, _name, _value);
if (value.isEmpty() && _defaultValueIfEmpty != null) {
return valueOf(_defaultValueIfEmpty);
}
return valueOf(value); return valueOf(value);
} }