[cloudstack] branch 4.13 updated: server: export full response view for zones response when caller is root admin (#3989)

[rohit]

This is an automated email from the ASF dual-hosted git repository.

rohit pushed a commit to branch 4.13
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.13 by this push:
     new 2e3390f  server: export full response view for zones response when 
caller is root admin (#3989)
2e3390f is described below

commit 2e3390f06e11400237d68929e4095376b13574d8
Author: Rohit Yadav <rohit.ya...@shapeblue.com>
AuthorDate: Wed Mar 25 12:53:41 2020 +0530

    server: export full response view for zones response when caller is root 
admin (#3989)
    
    The listZonesMetrics does not return same keys are listZones as the
    default response view is restricted. This fixes that by ensuring that
    for root admin full response view is used.
    
    Signed-off-by: Rohit Yadav <rohit.ya...@shapeblue.com>
---
 server/src/main/java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java 
b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
index c815be8..d55aea4 100644
--- a/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
+++ b/server/src/main/java/com/cloud/api/query/QueryManagerImpl.java
@@ -2881,7 +2881,7 @@ public class QueryManagerImpl extends 
MutualExclusiveIdsManagerBase implements Q
         ListResponse<ZoneResponse> response = new ListResponse<ZoneResponse>();
 
         ResponseView respView = ResponseView.Restricted;
-        if (cmd instanceof ListZonesCmdByAdmin) {
+        if (cmd instanceof ListZonesCmdByAdmin || 
CallContext.current().getCallingAccount().getType() == 
Account.ACCOUNT_TYPE_ADMIN) {
             respView = ResponseView.Full;
         }