You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by al...@apache.org on 2013/07/22 22:24:43 UTC

git commit: updated refs/heads/4.2 to 4e59c4d

Updated Branches:
  refs/heads/4.2 3f405be8e -> 4e59c4daf


CLOUDSTACK-3720: fixed API doc for listResourceLimits API


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

Branch: refs/heads/4.2
Commit: 4e59c4daf99f96784df79210d0071d5f12d5b3ce
Parents: 3f405be
Author: Alena Prokharchyk <al...@citrix.com>
Authored: Mon Jul 22 13:23:52 2013 -0700
Committer: Alena Prokharchyk <al...@citrix.com>
Committed: Mon Jul 22 13:24:17 2013 -0700

----------------------------------------------------------------------
 .../user/resource/ListResourceLimitsCmd.java     | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e59c4da/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
index 191e958..4d5d4f4 100644
--- a/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
+++ b/api/src/org/apache/cloudstack/api/command/user/resource/ListResourceLimitsCmd.java
@@ -28,6 +28,7 @@ import org.apache.cloudstack.api.response.ResourceLimitResponse;
 import org.apache.log4j.Logger;
 
 import com.cloud.configuration.ResourceLimit;
+import com.cloud.configuration.Resource.ResourceOwnerType;
 
 @APICommand(name = "listResourceLimits", description="Lists resource limits.", responseObject=ResourceLimitResponse.class)
 public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd {
@@ -42,11 +43,19 @@ public class ListResourceLimitsCmd extends BaseListProjectAndAccountResourcesCmd
     @Parameter(name=ApiConstants.ID, type=CommandType.LONG, description="Lists resource limits by ID.")
     private Long id;
 
-    @Parameter(name=ApiConstants.RESOURCE_TYPE, type=CommandType.INTEGER, description="Type of resource to update. Values are 0, 1, 2, 3, and 4. 0 - Instance. Number of instances a user can create. " +
-                                                                                        "1 - IP. Number of public IP addresses a user can own. " +
-                                                                                        "2 - Volume. Number of disk volumes a user can create." +
-                                                                                        "3 - Snapshot. Number of snapshots a user can create." +
-                                                                                        "4 - Template. Number of templates that a user can register/create.")
+    @Parameter(name=ApiConstants.RESOURCE_TYPE, type=CommandType.INTEGER, description="Type of resource to update. Values are 0, 1, 2, 3, and 4." +
+    		                                                                            "0 - Instance. Number of instances a user can create. " +
+                                                                                        "1 - IP. Number of public IP addresses an account can own. " +
+                                                                                        "2 - Volume. Number of disk volumes an account can own." +
+                                                                                        "3 - Snapshot. Number of snapshots an account can own." +
+                                                                                        "4 - Template. Number of templates an account can register/create." +
+                                                                                        "5 - Project. Number of projects an account can own." +
+                                                                                        "6 - Network. Number of networks an account can own." +
+                                                                                        "7 - VPC. Number of VPC an account can own." +
+                                                                                        "8 - CPU. Number of CPU an account can allocate for his resources." +
+                                                                                        "9 - Memory. Amount of RAM an account can allocate for his resources." +
+                                                                                        "10 - Primary Storage. Amount of Primary storage an account can allocate for his resoruces." +
+                                                                                        "11 - Secondary Storage. Amount of Secondary storage an account can allocate for his resources.")
     private Integer resourceType;
 
     /////////////////////////////////////////////////////