Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -4672,7 +4672,8 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
final Map<String, Object> capabilities = new HashMap<>();

final Account caller = getCaller();
final boolean isCallerAdmin = _accountService.isAdmin(caller.getId());
final boolean isCallerRootAdmin = _accountService.isRootAdmin(caller.getId());
final boolean isCallerAdmin = isCallerRootAdmin || _accountService.isAdmin(caller.getId());
boolean securityGroupsEnabled = false;
boolean elasticLoadBalancerEnabled;
String supportELB = "false";
Expand Down Expand Up @@ -4753,7 +4754,7 @@ public Map<String, Object> listCapabilities(final ListCapabilitiesCmd cmd) {
}
capabilities.put(ApiConstants.SHAREDFSVM_MIN_CPU_COUNT, fsVmMinCpu);
capabilities.put(ApiConstants.SHAREDFSVM_MIN_RAM_SIZE, fsVmMinRam);
if (isCallerAdmin) {
if (isCallerRootAdmin) {
capabilities.put(ApiConstants.EXTENSIONS_PATH, extensionsManager.getExtensionsPath());
}
capabilities.put(ApiConstants.ADDITONAL_CONFIG_ENABLED, UserVmManager.EnableAdditionalVmConfig.valueIn(caller.getId()));
Expand Down
Loading