etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.13' into 4.14

This commit is contained in:
Rohit Yadav 2020-06-18 19:48:12 +05:30
parent 88c5e6e6df 06f3ff0b04
commit 148fab4e43
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java
View File

@ -18,7 +18,7 @@
package org.apache.cloudstack.api; package org.apache.cloudstack.api;
import org.apache.cloudstack.acl.RoleType; import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.command.admin.vm.ListVMsCmdByAdmin; import org.apache.cloudstack.api.command.user.vm.ListVMsCmd;
import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.UserVmResponse;
import org.apache.cloudstack.metrics.MetricsService; import org.apache.cloudstack.metrics.MetricsService;
@ -30,7 +30,7 @@ import java.util.List;
@APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class, @APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full,
since = "4.9.3", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) since = "4.9.3", authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class ListVMsMetricsCmd extends ListVMsCmdByAdmin { public class ListVMsMetricsCmd extends ListVMsCmd {
public static final String APINAME = "listVirtualMachinesMetrics"; public static final String APINAME = "listVirtualMachinesMetrics";
@Inject @Inject

5
server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
View File

@ -837,7 +837,8 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
Pair<List<UserVmJoinVO>, Integer> result = searchForUserVMsInternal(cmd); Pair<List<UserVmJoinVO>, Integer> result = searchForUserVMsInternal(cmd);
ListResponse<UserVmResponse> response = new ListResponse<UserVmResponse>(); ListResponse<UserVmResponse> response = new ListResponse<UserVmResponse>();
ResponseView respView = ResponseView.Restricted; ResponseView respView = ResponseView.Restricted;
if (cmd instanceof ListVMsCmdByAdmin) { Account caller = CallContext.current().getCallingAccount();
if (_accountMgr.isRootAdmin(caller.getId())) {
respView = ResponseView.Full; respView = ResponseView.Full;
} }
List<UserVmResponse> vmResponses = ViewResponseHelper.createUserVmResponse(respView, "virtualmachine", cmd.getDetails(), result.first().toArray(new UserVmJoinVO[result.first().size()])); List<UserVmResponse> vmResponses = ViewResponseHelper.createUserVmResponse(respView, "virtualmachine", cmd.getDetails(), result.first().toArray(new UserVmJoinVO[result.first().size()]));
@ -1766,7 +1767,7 @@ public class QueryManagerImpl extends MutualExclusiveIdsManagerBase implements Q
ResponseView respView = cmd.getResponseView(); ResponseView respView = cmd.getResponseView();
Account account = CallContext.current().getCallingAccount(); Account account = CallContext.current().getCallingAccount();
if (_accountMgr.isAdmin(account.getAccountId())) { if (_accountMgr.isRootAdmin(account.getAccountId())) {
respView = ResponseView.Full; respView = ResponseView.Full;
} }