Skip to content

Commit

Permalink
Added sample tests to QuotaClasses API.
Browse files Browse the repository at this point in the history 
Partially implements blueprint nova-api-samples
Fixes bug 1070171

Change-Id: I504a9120a0980a727bda21ca2ac76a5d06477e66
  • Loading branch information
@openstack-gerrit
Giampaolo Lauria authored and openstack-gerrit committed Jan 7, 2013
1 parent e1c7b18 commit d9b6904
Show file tree
Hide file tree
Showing 13 changed files with 203 additions and 1 deletion.
16 changes: 16 additions & 0 deletions doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"quota_class_set": {
"cores": 20,
"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,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10
}
}
14 changes: 14 additions & 0 deletions doc/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<quota_class_set id="test_class">
<cores>20</cores>
<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>
15 changes: 15 additions & 0 deletions doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"quota_class_set": {
"instances": 50,
"cores": 50,
"ram": 51200,
"floating_ips": 10,
"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
}
}
14 changes: 14 additions & 0 deletions doc/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<quota_class_set>
<cores>50</cores>
<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>
15 changes: 15 additions & 0 deletions doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"quota_class_set": {
"cores": 50,
"floating_ips": 10,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 50,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10
}
}
14 changes: 14 additions & 0 deletions doc/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<quota_class_set>
<cores>50</cores>
<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>
16 changes: 16 additions & 0 deletions nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.json.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"quota_class_set": {
"cores": 20,
"floating_ips": 10,
"id": "%(set_id)s",
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 10,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10
}
}
14 changes: 14 additions & 0 deletions nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-show-get-resp.xml.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<quota_class_set id="%(set_id)s">
<cores>20</cores>
<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>
15 changes: 15 additions & 0 deletions nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.json.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"quota_class_set": {
"instances": 50,
"cores": 50,
"ram": 51200,
"floating_ips": 10,
"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
}
}
14 changes: 14 additions & 0 deletions nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-req.xml.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<quota_class_set>
<cores>50</cores>
<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>
15 changes: 15 additions & 0 deletions .../tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.json.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"quota_class_set": {
"cores": 50,
"floating_ips": 10,
"injected_file_content_bytes": 10240,
"injected_file_path_bytes": 255,
"injected_files": 5,
"instances": 50,
"key_pairs": 100,
"metadata_items": 128,
"ram": 51200,
"security_group_rules": 20,
"security_groups": 10
}
}
14 changes: 14 additions & 0 deletions nova/tests/integrated/api_samples/os-quota-class-sets/quota-classes-update-post-resp.xml.tpl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<quota_class_set>
<cores>50</cores>
<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>
28 changes: 27 additions & 1 deletion nova/tests/integrated/test_api_samples.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ def test_all_extensions_have_samples(self):
do_not_approve_additions.append('os-hypervisors')
do_not_approve_additions.append('os-instance_usage_audit_log')
do_not_approve_additions.append('os-networks')
do_not_approve_additions.append('os-quota-class-sets')
do_not_approve_additions.append('os-services')
do_not_approve_additions.append('os-volumes')

Expand Down Expand Up @@ -2305,3 +2304,30 @@ def test_detail_flavor(self):

class FlavorDisabledSampleXmlTests(FlavorDisabledSampleJsonTests):
ctype = "xml"


class QuotaClassesSampleJsonTests(ApiSampleTestBase):
extension_name = ("nova.api.openstack.compute.contrib.quota_classes."
"Quota_classes")
set_id = 'test_class'

def test_show_quota_classes(self):
"""Get api sample to show quota classes"""
response = self._do_get('os-quota-class-sets/%s' % self.set_id)
self.assertEqual(response.status, 200)
subs = {'set_id': self.set_id}
return self._verify_response('quota-classes-show-get-resp', subs,
response)

def test_update_quota_classes(self):
"""Get api sample to update quota classes"""
response = self._do_put('os-quota-class-sets/%s' % self.set_id,
'quota-classes-update-post-req',
{})
self.assertEqual(response.status, 200)
return self._verify_response('quota-classes-update-post-resp',
{}, response)


class QuotaClassesSampleXmlTests(QuotaClassesSampleJsonTests):
ctype = "xml"

0 comments on commit d9b6904

Please sign in to comment.