From bd97500d00117fd16b8b33d2b05ba250bda47160 Mon Sep 17 00:00:00 2001 From: Rui Chen Date: Sun, 4 Jan 2015 11:40:30 +0800 Subject: [PATCH] Add quotas for Server Groups (V2.1 API change) Change-Id: I1e81c8c3c9b9e8d4e395f762881a981222ba5332 Closes-bug: #1368617 --- .../quota-classes-show-get-resp.json | 6 ++-- .../quota-classes-update-post-req.json | 6 ++-- .../quota-classes-update-post-resp.json | 6 ++-- .../quotas-show-defaults-get-resp.json | 6 ++-- .../os-quota-sets/quotas-show-get-resp.json | 6 ++-- .../quotas-update-force-post-resp.json | 6 ++-- .../quotas-update-post-resp.json | 6 ++-- .../user-quotas-show-get-resp.json | 6 ++-- .../user-quotas-update-post-resp.json | 6 ++-- .../src/wadls/compute-api/src/v2.1/common.ent | 36 +++++++++++++++++++ 10 files changed, 72 insertions(+), 18 deletions(-) diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json index eddeb7130..6575c154e 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json index bc2606be6..0423bf0a0 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-req.json @@ -8,6 +8,8 @@ "metadata_items": 128, "security_groups": 10, "security_group_rules": 20, - "key_pairs": 100 + "key_pairs": 100, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json index 060333e05..6d305f67d 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json index c445e0762..dbd4f7943 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-get-resp.json index c445e0762..dbd4f7943 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-show-get-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-force-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-force-post-resp.json index 2bef2cfbc..153778c34 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-force-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-force-post-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-post-resp.json index 79f46b24d..ad0fbc032 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/quotas-update-post-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 45 + "security_groups": 45, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-show-get-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-show-get-resp.json index c445e0762..dbd4f7943 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-show-get-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-show-get-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-update-post-resp.json b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-update-post-resp.json index 202e8e8ba..cceb56002 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-update-post-resp.json +++ b/api-ref/src/wadls/compute-api/src/v2.1/api_samples/os-quota-sets/user-quotas-update-post-resp.json @@ -9,6 +9,8 @@ "metadata_items": 128, "ram": 51200, "security_group_rules": 20, - "security_groups": 10 + "security_groups": 10, + "server_group_members": 10, + "server_groups": 10 } -} \ No newline at end of file +} diff --git a/api-ref/src/wadls/compute-api/src/v2.1/common.ent b/api-ref/src/wadls/compute-api/src/v2.1/common.ent index 758666c69..8dd2bf2aa 100644 --- a/api-ref/src/wadls/compute-api/src/v2.1/common.ent +++ b/api-ref/src/wadls/compute-api/src/v2.1/common.ent @@ -565,6 +565,24 @@ The number of security groups allowed for each tenant. + + + + The number of server groups allowed + for each tenant. + + + + The number of members allowed for each + server group. '> + + + The number of server groups allowed + for each tenant. + + + + The number of members allowed for each + server group. + '> GET'>