From 45433ab86c6a13e43bdfb39d031e8248dc680ea7 Mon Sep 17 00:00:00 2001
From: Chris Yeoh <cyeoh@au1.ibm.com>
Date: Wed, 20 Nov 2013 22:18:43 +1030
Subject: [PATCH] Hide injected_file related quotas for V3 API

The injected_files, injected_file_content_bytes and
injected_file_path_bytes are all related to the
os-personalities extension which has been removed. They
can't be removed from the core quotas code as that has
to still support the V2 API. So for the V3 API we just
hide them.

DocImpact

Partially implements blueprint v3-api-remove-extensions

Change-Id: Iedb6e1427ac22f1926e929f3391e56403c37d088
---
 .../os-quota-class-sets/quota-classes-show-get-resp.json     | 5 +----
 .../os-quota-class-sets/quota-classes-show-get-resp.xml      | 5 +----
 .../os-quota-class-sets/quota-classes-update-post-req.json   | 5 +----
 .../os-quota-class-sets/quota-classes-update-post-req.xml    | 5 +----
 .../os-quota-class-sets/quota-classes-update-post-resp.json  | 5 +----
 .../os-quota-class-sets/quota-classes-update-post-resp.xml   | 5 +----
 .../os-quota-sets/quotas-show-defaults-get-resp.json         | 5 +----
 .../os-quota-sets/quotas-show-defaults-get-resp.xml          | 5 +----
 doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json   | 5 +----
 doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.xml    | 5 +----
 .../os-quota-sets/quotas-update-force-post-resp.json         | 5 +----
 .../os-quota-sets/quotas-update-force-post-resp.xml          | 5 +----
 .../api_samples/os-quota-sets/quotas-update-post-resp.json   | 5 +----
 doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.xml | 5 +----
 .../api_samples/os-quota-sets/user-quotas-show-get-resp.json | 5 +----
 .../api_samples/os-quota-sets/user-quotas-show-get-resp.xml  | 5 +----
 .../os-quota-sets/user-quotas-update-post-resp.json          | 5 +----
 .../os-quota-sets/user-quotas-update-post-resp.xml           | 5 +----
 18 files changed, 18 insertions(+), 72 deletions(-)

diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json b/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
index 462425c8f..f7f01611c 100644
--- a/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
+++ b/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "test_class",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 10,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml b/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
index d0570e9c8..1840e7c7e 100644
--- a/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
+++ b/doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>10</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_class_set>
\ No newline at end of file
+</quota_class_set>
diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json
index 4f6f840f1..4858f1bf5 100644
--- a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json
+++ b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json
@@ -6,11 +6,8 @@
         "floating_ips": 10,
         "fixed_ips": -1,
         "metadata_items": 128,
-        "injected_files": 5,
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
         "security_groups": 10,
         "security_group_rules": 20,
         "key_pairs": 100
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
index d55c98017..89b9b7629 100644
--- a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
+++ b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
@@ -3,13 +3,10 @@
   <cores>50</cores>
   <floating_ips>10</floating_ips>
   <fixed_ips>-1</fixed_ips>
-  <injected_file_content_bytes>10240</injected_file_content_bytes>
-  <injected_file_path_bytes>255</injected_file_path_bytes>
-  <injected_files>5</injected_files>
   <instances>50</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_class_set>
\ No newline at end of file
+</quota_class_set>
diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
index 41ebc43f4..a271766ca 100644
--- a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
+++ b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "test_class",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 50,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
index 045317f29..bf17b492c 100644
--- a/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
+++ b/doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
@@ -3,13 +3,10 @@
   <cores>50</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>50</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_class_set>
\ No newline at end of file
+</quota_class_set>
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json b/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
index 0f5407545..6b77169cb 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
+++ b/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 10,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml b/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
index da9a2577e..9ae64f3a7 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
+++ b/doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>10</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json b/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json
index 0f5407545..6b77169cb 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json
+++ b/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 10,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.xml b/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.xml
index da9a2577e..9ae64f3a7 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.xml
+++ b/doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>10</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json b/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json
index 8f98181fd..d32069728 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json
+++ b/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 45,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.xml b/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.xml
index 8d8818018..f679ccb0b 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.xml
+++ b/doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>45</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json b/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json
index ae2bda094..fea381f06 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json
+++ b/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 10,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 45
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.xml b/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.xml
index a97431e00..9183771b0 100644
--- a/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.xml
+++ b/doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>10</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>45</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>
diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json b/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json
index 0f5407545..6b77169cb 100644
--- a/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json
+++ b/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 10,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.xml b/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.xml
index da9a2577e..9ae64f3a7 100644
--- a/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.xml
+++ b/doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>10</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>
diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json b/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json
index 4a3fb5dd5..28ffee80e 100644
--- a/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json
+++ b/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json
@@ -4,9 +4,6 @@
         "fixed_ips": -1,
         "floating_ips": 10,
         "id": "fake_tenant",
-        "injected_file_content_bytes": 10240,
-        "injected_file_path_bytes": 255,
-        "injected_files": 5,
         "instances": 9,
         "key_pairs": 100,
         "metadata_items": 128,
@@ -14,4 +11,4 @@
         "security_group_rules": 20,
         "security_groups": 10
     }
-}
\ No newline at end of file
+}
diff --git a/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.xml b/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.xml
index dac476212..c475769d7 100644
--- a/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.xml
+++ b/doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.xml
@@ -3,13 +3,10 @@
   <cores>20</cores>
   <fixed_ips>-1</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>
-  <injected_files>5</injected_files>
   <instances>9</instances>
   <key_pairs>100</key_pairs>
   <metadata_items>128</metadata_items>
   <ram>51200</ram>
   <security_group_rules>20</security_group_rules>
   <security_groups>10</security_groups>
-</quota_set>
\ No newline at end of file
+</quota_set>