From 99429214d4ddb5bdc7de185693b8a53ad50df3c6 Mon Sep 17 00:00:00 2001
From: Michael Still <mikal@stillhq.com>
Date: Tue, 5 Mar 2013 05:53:43 +1100
Subject: Add quotas for fixed ips.

DocImpact: there is now a default quota of 10 fixed ips per tenant.
This will need to be adjusted by deployers if that number does not
meet their needs.

Resolves bug 1125468.

Change-Id: Iffa19583340f80cb2a13ba5fce31f7ff724a52d6
---
 doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json   | 1 +
 doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml    | 1 +
 .../os-quota-class-sets/quota-classes-update-post-resp.json            | 1 +
 doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml | 1 +
 doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json       | 3 ++-
 doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml        | 3 ++-
 doc/api_samples/os-quota-sets/quotas-show-get-resp.json                | 3 ++-
 doc/api_samples/os-quota-sets/quotas-show-get-resp.xml                 | 3 ++-
 doc/api_samples/os-quota-sets/quotas-update-post-resp.json             | 3 ++-
 doc/api_samples/os-quota-sets/quotas-update-post-resp.xml              | 3 ++-
 10 files changed, 16 insertions(+), 6 deletions(-)

(limited to 'doc')

diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
index e4d0a5b47..e5748a4cd 100644
--- a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
+++ b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
@@ -1,6 +1,7 @@
 {
     "quota_class_set": {
         "cores": 20,
+        "fixed_ips": 10,
         "floating_ips": 10,
         "id": "test_class",
         "injected_file_content_bytes": 10240,
diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
index 74532bc98..8e7444634 100644
--- a/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
+++ b/doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_class_set id="test_class">
   <cores>20</cores>
+  <fixed_ips>10</fixed_ips>
   <floating_ips>10</floating_ips>
   <injected_file_content_bytes>10240</injected_file_content_bytes>
   <injected_file_path_bytes>255</injected_file_path_bytes>
diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
index 99a11f4ff..6325bb562 100644
--- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
+++ b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
@@ -1,6 +1,7 @@
 {
     "quota_class_set": {
         "cores": 50,
+        "fixed_ips": 10,
         "floating_ips": 10,
         "injected_file_content_bytes": 10240,
         "injected_file_path_bytes": 255,
diff --git a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
index 44c658a41..26a29fc23 100644
--- a/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
+++ b/doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_class_set>
   <cores>50</cores>
+  <fixed_ips>10</fixed_ips>
   <floating_ips>10</floating_ips>
   <injected_file_content_bytes>10240</injected_file_content_bytes>
   <injected_file_path_bytes>255</injected_file_path_bytes>
diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
index ee1f6a397..efc35cf00 100644
--- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
+++ b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
@@ -1,6 +1,7 @@
 {
     "quota_set": {
         "cores": 20,
+        "fixed_ips": 10,
         "floating_ips": 10,
         "id": "fake_tenant",
         "injected_file_content_bytes": 10240,
@@ -13,4 +14,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
index 6a39c8506..dd4c6d66d 100644
--- a/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
+++ b/doc/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_set id="fake_tenant">
   <cores>20</cores>
+  <fixed_ips>10</fixed_ips>
   <floating_ips>10</floating_ips>
   <injected_file_content_bytes>10240</injected_file_content_bytes>
   <injected_file_path_bytes>255</injected_file_path_bytes>
@@ -11,4 +12,4 @@
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
+</quota_set>
\ No newline at end of file
diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.json b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json
index ee1f6a397..efc35cf00 100644
--- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.json
+++ b/doc/api_samples/os-quota-sets/quotas-show-get-resp.json
@@ -1,6 +1,7 @@
 {
     "quota_set": {
         "cores": 20,
+        "fixed_ips": 10,
         "floating_ips": 10,
         "id": "fake_tenant",
         "injected_file_content_bytes": 10240,
@@ -13,4 +14,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml b/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml
index 6a39c8506..dd4c6d66d 100644
--- a/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml
+++ b/doc/api_samples/os-quota-sets/quotas-show-get-resp.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_set id="fake_tenant">
   <cores>20</cores>
+  <fixed_ips>10</fixed_ips>
   <floating_ips>10</floating_ips>
   <injected_file_content_bytes>10240</injected_file_content_bytes>
   <injected_file_path_bytes>255</injected_file_path_bytes>
@@ -11,4 +12,4 @@
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
+</quota_set>
\ No newline at end of file
diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.json b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json
index c16dc6bb5..14324e365 100644
--- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.json
+++ b/doc/api_samples/os-quota-sets/quotas-update-post-resp.json
@@ -1,6 +1,7 @@
 {
     "quota_set": {
         "cores": 20,
+        "fixed_ips": 10,
         "floating_ips": 10,
         "injected_file_content_bytes": 10240,
         "injected_file_path_bytes": 255,
@@ -12,4 +13,4 @@
         "security_group_rules": 20,
         "security_groups": 45
     }
-}
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml b/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml
index 126c3fced..5e6bb893e 100644
--- a/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml
+++ b/doc/api_samples/os-quota-sets/quotas-update-post-resp.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <quota_set>
   <cores>20</cores>
+  <fixed_ips>10</fixed_ips>
   <floating_ips>10</floating_ips>
   <injected_file_content_bytes>10240</injected_file_content_bytes>
   <injected_file_path_bytes>255</injected_file_path_bytes>
@@ -11,4 +12,4 @@
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>45</security_groups>
-</quota_set>
+</quota_set>
\ No newline at end of file
-- 
cgit