cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject git commit: updated refs/heads/rbac to d40e527
Date Mon, 27 Jan 2014 18:46:24 GMT
Updated Branches:
  refs/heads/rbac 8f8cd21de -> d40e52776


Add ResourceType annotation for ListTemplatesCmd.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d40e5277
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d40e5277
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d40e5277

Branch: refs/heads/rbac
Commit: d40e52776a6221ff9f8c99c68d4fe0c5d9edf87b
Parents: 8f8cd21
Author: Min Chen <min.chen@citrix.com>
Authored: Mon Jan 27 10:45:09 2014 -0800
Committer: Min Chen <min.chen@citrix.com>
Committed: Mon Jan 27 10:46:15 2014 -0800

----------------------------------------------------------------------
 .../api/command/admin/template/ListTemplatesCmdByAdmin.java       | 3 ++-
 .../cloudstack/api/command/user/template/ListTemplatesCmd.java    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d40e5277/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
b/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
index bc74288..ae90840 100644
--- a/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
+++ b/api/src/org/apache/cloudstack/api/command/admin/template/ListTemplatesCmdByAdmin.java
@@ -16,12 +16,13 @@
 // under the License.
 package org.apache.cloudstack.api.command.admin.template;
 
+import org.apache.cloudstack.acl.AclEntityType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.command.user.template.ListTemplatesCmd;
 import org.apache.cloudstack.api.response.TemplateResponse;
 
-@APICommand(name = "listTemplates", description = "List all public, private, and privileged
templates.", responseObject = TemplateResponse.class, responseView = ResponseView.Full)
+@APICommand(name = "listTemplates", description = "List all public, private, and privileged
templates.", responseObject = TemplateResponse.class, entityType = {AclEntityType.VirtualMachineTemplate},
responseView = ResponseView.Full)
 public class ListTemplatesCmdByAdmin extends ListTemplatesCmd {
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d40e5277/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
index 6af904f..88a640e 100644
--- a/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/template/ListTemplatesCmd.java
@@ -18,6 +18,7 @@ package org.apache.cloudstack.api.command.user.template;
 
 import org.apache.log4j.Logger;
 
+import org.apache.cloudstack.acl.AclEntityType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiCommandJobType;
 import org.apache.cloudstack.api.ApiConstants;
@@ -32,7 +33,7 @@ import org.apache.cloudstack.context.CallContext;
 import com.cloud.template.VirtualMachineTemplate.TemplateFilter;
 import com.cloud.user.Account;
 
-@APICommand(name = "listTemplates", description = "List all public, private, and privileged
templates.", responseObject = TemplateResponse.class, responseView = ResponseView.Restricted)
+@APICommand(name = "listTemplates", description = "List all public, private, and privileged
templates.", responseObject = TemplateResponse.class, entityType = {AclEntityType.VirtualMachineTemplate},
responseView = ResponseView.Restricted)
 public class ListTemplatesCmd extends BaseListTaggedResourcesCmd {
     public static final Logger s_logger = Logger.getLogger(ListTemplatesCmd.class.getName());
 


Mime
View raw message