Repository: cloudstack Updated Branches: refs/heads/master f7d80d9a6 -> 44e8fc47d
CLOUDSTACK-3822: ListResourceLimits,UpdateResourceCount,UpdateResourceLimit: resourcetype description Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bca3f1b9 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bca3f1b9 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bca3f1b9 Branch: refs/heads/master Commit: bca3f1b93f882ca59b2b901c790acc5087105fbf Parents: f7d80d9 Author: Pierre-Luc Dion <[email protected]> Authored: Sun Sep 21 19:48:49 2014 -0400 Committer: Pierre-Luc Dion <[email protected]> Committed: Sun Sep 21 19:48:49 2014 -0400 ---------------------------------------------------------------------- .../user/resource/ListResourceLimitsCmd.java | 21 ++++++++++++-------- .../user/resource/UpdateResourceCountCmd.java | 20 +++++++++---------- .../user/resource/UpdateResourceLimitCmd.java | 19 +++++++++++------- 3 files changed, 35 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bca3f1b9/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 1576d93..c21dbe8 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 @@ -43,14 +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 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.") + @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.INTEGER, description = "Type of resource. Values are 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 and 11. " + + "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 - PrimaryStorage. Total primary storage space (in GiB) a user can use. " + + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use. ") private Integer resourceType; ///////////////////////////////////////////////////// http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bca3f1b9/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java index 81d725b..0591a84 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceCountCmd.java @@ -63,16 +63,16 @@ public class UpdateResourceCountCmd extends BaseCmd { description = "Type of resource to update. If specifies valid values are 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 and 11. If not specified will update all resource counts" + "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." - + "5 - Project. Number of projects that a user can create." - + "6 - Network. Number of guest network a user can create." - + "7 - VPC. Number of VPC a user can create." - + "8 - CPU. Total number of CPU cores a user can use." - + "9 - Memory. Total Memory (in MB) a user can use." - + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use." - + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.") + + "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. " + + "5 - Project. Number of projects that a user can create. " + + "6 - Network. Number of guest network a user can create. " + + "7 - VPC. Number of VPC a user can create. " + + "8 - CPU. Total number of CPU cores a user can use. " + + "9 - Memory. Total Memory (in MB) a user can use. " + + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use. " + + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use. ") private Integer resourceType; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "Update resource limits for project") http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bca3f1b9/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java index 22d20d3..bccec89 100644 --- a/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/resource/UpdateResourceLimitCmd.java @@ -59,13 +59,18 @@ public class UpdateResourceLimitCmd extends BaseCmd { @Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.INTEGER, required = true, - description = "Type of resource to update. Values are 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 and 11. 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." - + "6 - Network. Number of guest network a user can create." + "7 - VPC. Number of VPC a user can create." - + "8 - CPU. Total number of CPU cores a user can use." + "9 - Memory. Total Memory (in MB) a user can use." - + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use." - + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use.") + description = "Type of resource to update. Values are 0, 1, 2, 3, 4, 6, 7, 8, 9, 10 and 11. " + + "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. " + + "6 - Network. Number of guest network a user can create. " + + "7 - VPC. Number of VPC a user can create. " + + "8 - CPU. Total number of CPU cores a user can use. " + + "9 - Memory. Total Memory (in MB) a user can use. " + + "10 - PrimaryStorage. Total primary storage space (in GiB) a user can use. " + + "11 - SecondaryStorage. Total secondary storage space (in GiB) a user can use. ") private Integer resourceType; /////////////////////////////////////////////////////
