openstack
/
nova
Code Issues Proposed changes

Added sample tests to FlavorExtraSpecs API 

Partially implements blueprint nova-api-samples
Fixes bug 1097131

Change-Id: I38a51e656cc9474e331d8f568d9e7fb6ba62ef42
This commit is contained in:
Giampaolo Lauria 2013-01-25 16:31:13 -05:00
parent ef35e9dee0
commit df81f0d3cf
25 changed files with 151 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json Normal file
View File

@ -0,0 +1,6 @@
{
"extra_specs": {
"key1": "value1",
"key2": "value2"
}
}

5
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<extra_specs>
<key1>value1</key1>
<key2>value2</key2>
</extra_specs>

6
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json Normal file
View File

@ -0,0 +1,6 @@
{
"extra_specs": {
"key1": "value1",
"key2": "value2"
}
}

5
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_specs>
<key2>value2</key2>
<key1>value1</key1>
</extra_specs>

3
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json Normal file
View File

@ -0,0 +1,3 @@
{
"key1": "value1"
}

2
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_spec key="key1">value1</extra_spec>

6
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json Normal file
View File

@ -0,0 +1,6 @@
{
"extra_specs": {
"key1": "value1",
"key2": "value2"
}
}

5
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_specs>
<key2>value2</key2>
<key1>value1</key1>
</extra_specs>

3
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json Normal file
View File

@ -0,0 +1,3 @@
{
"key1": "new_value1"
}

2
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<key1>new_value1</key1>

3
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json Normal file
View File

@ -0,0 +1,3 @@
{
"key1": "new_value1"
}

2
doc/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_spec key="key1">new_value1</extra_spec>

6
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.json.tpl Normal file
View File

@ -0,0 +1,6 @@
{
"extra_specs": {
"key1": "%(value1)s",
"key2": "%(value2)s"
}
}

5
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-req.xml.tpl Normal file
View File

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
<extra_specs>
<key1>%(value1)s</key1>
<key2>%(value2)s</key2>
</extra_specs>

6
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.json.tpl Normal file
View File

@ -0,0 +1,6 @@
{
"extra_specs": {
"key1": "%(value1)s",
"key2": "%(value2)s"
}
}

5
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-create-resp.xml.tpl Normal file
View File

@ -0,0 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_specs>
<key2>%(value2)s</key2>
<key1>%(value1)s</key1>
</extra_specs>

3
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.json.tpl Normal file
View File

@ -0,0 +1,3 @@
{
"key1": "%(value1)s"
}

2
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-get-resp.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_spec key="key1">%(value1)s</extra_spec>

6
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.json.tpl Normal file
View File

@ -0,0 +1,6 @@
{
"extra_specs": {
"key1": "%(value1)s",
"key2": "%(value2)s"
}
}

5
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-list-resp.xml.tpl Normal file
View File

@ -0,0 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_specs>
<key2>%(value2)s</key2>
<key1>%(value1)s</key1>
</extra_specs>

3
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.json.tpl Normal file
View File

@ -0,0 +1,3 @@
{
"key1": "%(value1)s"
}

2
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-req.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<key1>%(value1)s</key1>

3
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.json.tpl Normal file
View File

@ -0,0 +1,3 @@
{
"key1": "%(value1)s"
}

2
nova/tests/integrated/api_samples/os-flavor-extra-specs/flavor-extra-specs-update-resp.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<extra_spec key="key1">%(value1)s</extra_spec>

56
nova/tests/integrated/test_api_samples.py
View File

@ -377,7 +377,6 @@ class ApiSamplesTrap(ApiSampleTestBase):
do_not_approve_additions.append('os-config-drive')
do_not_approve_additions.append('os-create-server-ext')
do_not_approve_additions.append('os-flavor-access')
do_not_approve_additions.append('os-flavor-extra-specs')
do_not_approve_additions.append('os-floating-ip-dns')
do_not_approve_additions.append('os-fping')
do_not_approve_additions.append('os-hypervisors')
@ -2712,4 +2711,59 @@ class InstanceUsageAuditLogJsonTest(ApiSampleTestBase):
class InstanceUsageAuditLogXmlTest(InstanceUsageAuditLogJsonTest):
ctype = "xml"
class FlavorExtraSpecsSampleJsonTests(ApiSampleTestBase):
extension_name = ("nova.api.openstack.compute.contrib.flavorextraspecs."
"Flavorextraspecs")
def _flavor_extra_specs_create(self):
subs = {'value1': 'value1',
'value2': 'value2'
}
response = self._do_post('flavors/1/os-extra_specs',
'flavor-extra-specs-create-req', subs)
self.assertEqual(response.status, 200)
return self._verify_response('flavor-extra-specs-create-resp',
subs, response)
def test_flavor_extra_specs_get(self):
subs = {'value1': 'value1'}
self._flavor_extra_specs_create()
response = self._do_get('flavors/1/os-extra_specs/key1')
self.assertEqual(response.status, 200)
return self._verify_response('flavor-extra-specs-get-resp',
subs, response)
def test_flavor_extra_specs_list(self):
subs = {'value1': 'value1',
'value2': 'value2'
}
self._flavor_extra_specs_create()
response = self._do_get('flavors/1/os-extra_specs')
self.assertEqual(response.status, 200)
return self._verify_response('flavor-extra-specs-list-resp',
subs, response)
def test_flavor_extra_specs_create(self):
return self._flavor_extra_specs_create()
def test_flavor_extra_specs_update(self):
subs = {'value1': 'new_value1'}
self._flavor_extra_specs_create()
response = self._do_put('flavors/1/os-extra_specs/key1',
'flavor-extra-specs-update-req', subs)
self.assertEqual(response.status, 200)
return self._verify_response('flavor-extra-specs-update-resp',
subs, response)
def test_flavor_extra_specs_delete(self):
self._flavor_extra_specs_create()
response = self._do_delete('flavors/1/os-extra_specs/key1')
self.assertEqual(response.status, 200)
self.assertEqual(response.read(), '')
class FlavorExtraSpecsSampleXmlTests(FlavorExtraSpecsSampleJsonTests):
ctype = 'xml'