x/gantt
Code Issues Proposed changes

Hide injected_file related quotas for V3 API

Browse Source 
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
This commit is contained in:
Chris Yeoh
2013-11-20 22:18:43 +10:30
parent f3e4d06a71
commit 45433ab86c
18 changed files with 18 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "test_class", "id": "test_class",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10, "instances": 10,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>10</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_class_set> </quota_class_set>

5
doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.json
View File

@@ -6,11 +6,8 @@
"floating_ips": 10, "floating_ips": 10,
"fixed_ips": -1, "fixed_ips": -1,
"metadata_items": 128, "metadata_items": 128,
"injected_files": 5,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"security_groups": 10, "security_groups": 10,
"security_group_rules": 20, "security_group_rules": 20,
"key_pairs": 100 "key_pairs": 100
} }
} }

5
doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
View File

@@ -3,13 +3,10 @@
<cores>50</cores> <cores>50</cores>
<floating_ips>10</floating_ips> <floating_ips>10</floating_ips>
<fixed_ips>-1</fixed_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> <instances>50</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_class_set> </quota_class_set>

5
doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "test_class", "id": "test_class",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 50, "instances": 50,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>50</cores> <cores>50</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>50</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_class_set> </quota_class_set>

5
doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "fake_tenant", "id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10, "instances": 10,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-sets/quotas-show-defaults-get-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>10</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_set> </quota_set>

5
doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "fake_tenant", "id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10, "instances": 10,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-sets/quotas-show-get-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>10</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_set> </quota_set>

5
doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "fake_tenant", "id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 45, "instances": 45,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-sets/quotas-update-force-post-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>45</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_set> </quota_set>

5
doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "fake_tenant", "id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10, "instances": 10,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 45 "security_groups": 45
} }
} }

5
doc/v3/api_samples/os-quota-sets/quotas-update-post-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>10</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>45</security_groups> <security_groups>45</security_groups>
</quota_set> </quota_set>

5
doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "fake_tenant", "id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10, "instances": 10,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-sets/user-quotas-show-get-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>10</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_set> </quota_set>

5
doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.json
View File

@@ -4,9 +4,6 @@
"fixed_ips": -1, "fixed_ips": -1,
"floating_ips": 10, "floating_ips": 10,
"id": "fake_tenant", "id": "fake_tenant",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 9, "instances": 9,
"key_pairs": 100, "key_pairs": 100,
"metadata_items": 128, "metadata_items": 128,
@@ -14,4 +11,4 @@
"security_group_rules": 20, "security_group_rules": 20,
"security_groups": 10 "security_groups": 10
} }
} }

5
doc/v3/api_samples/os-quota-sets/user-quotas-update-post-resp.xml
View File

@@ -3,13 +3,10 @@
<cores>20</cores> <cores>20</cores>
<fixed_ips>-1</fixed_ips> <fixed_ips>-1</fixed_ips>
<floating_ips>10</floating_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> <instances>9</instances>
<key_pairs>100</key_pairs> <key_pairs>100</key_pairs>
<metadata_items>128</metadata_items> <metadata_items>128</metadata_items>
<ram>51200</ram> <ram>51200</ram>
<security_group_rules>20</security_group_rules> <security_group_rules>20</security_group_rules>
<security_groups>10</security_groups> <security_groups>10</security_groups>
</quota_set> </quota_set>