openstack/nova
Code Issues Proposed changes

sample api testing for os-floating-ips extension

Browse Source 
API testing for negative error codes now removed so this
is only sample api testing

Change-Id: I144a6b69498b86be56ceecb680c5be2a51acdbb8
This commit is contained in:
Sean Dague 2012-09-17 16:23:46 -04:00 committed by Vishvananda Ishaya
parent 516d510a6c
commit 1861cb557e
23 changed files with 195 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.json Normal file
View File

0
doc/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml Normal file
View File

3
doc/api_samples/os-floating-ips/floating-ips-create-req.json Normal file
View File

@ -0,0 +1,3 @@
{
"pool": "nova"
}

2
doc/api_samples/os-floating-ips/floating-ips-create-req.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<pool>nova</pool>

9
doc/api_samples/os-floating-ips/floating-ips-create-resp.json Normal file
View File

@ -0,0 +1,9 @@
{
"floating_ip": {
"fixed_ip": null,
"id": 1,
"instance_id": null,
"ip": "10.10.10.1",
"pool": "nova"
}
}

2
doc/api_samples/os-floating-ips/floating-ips-create-resp.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>

3
doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.json Normal file
View File

@ -0,0 +1,3 @@
{
"floating_ips": []
}

2
doc/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ips/>

18
doc/api_samples/os-floating-ips/floating-ips-list-resp.json Normal file
View File

@ -0,0 +1,18 @@
{
"floating_ips": [
{
"fixed_ip": null,
"id": 1,
"instance_id": null,
"ip": "10.10.10.1",
"pool": "nova"
},
{
"fixed_ip": null,
"id": 2,
"instance_id": null,
"ip": "10.10.10.2",
"pool": "nova"
}
]
}

5
doc/api_samples/os-floating-ips/floating-ips-list-resp.xml Normal file
View File

@ -0,0 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ips>
<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>
<floating_ip instance_id="None" ip="10.10.10.2" fixed_ip="None" id="2" pool="nova"/>
</floating_ips>

0
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.json.tpl Normal file
View File

0
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-nopool-req.xml.tpl Normal file
View File

3
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-req.json.tpl Normal file
View File

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

2
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-req.xml.tpl Normal file
View File

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

9
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-resp.json.tpl Normal file
View File

@ -0,0 +1,9 @@
{
"floating_ip": {
"fixed_ip": null,
"id": 1,
"instance_id": null,
"ip": "10.10.10.1",
"pool": "nova"
}
}

2
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-create-resp.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>

9
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-get-resp.json.tpl Normal file
View File

@ -0,0 +1,9 @@
{
"floating_ip": {
"fixed_ip": null,
"id": 1,
"instance_id": null,
"ip": "10.10.10.1",
"pool": "nova"
}
}

2
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-get-resp.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>

3
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.json.tpl Normal file
View File

@ -0,0 +1,3 @@
{
"floating_ips": []
}

2
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-empty-resp.xml.tpl Normal file
View File

@ -0,0 +1,2 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ips/>

19
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-resp.json.tpl Normal file
View File

@ -0,0 +1,19 @@
{
"floating_ips": [
{
"fixed_ip": null,
"id": 1,
"instance_id": null,
"ip": "10.10.10.1",
"pool": "nova"
},
{
"fixed_ip": null,
"id": 2,
"instance_id": null,
"ip": "10.10.10.2",
"pool": "nova"
}
]
}

5
nova/tests/integrated/api_samples/os-floating-ips/floating-ips-list-resp.xml.tpl Normal file
View File

@ -0,0 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<floating_ips>
<floating_ip instance_id="None" ip="10.10.10.1" fixed_ip="None" id="1" pool="nova"/>
<floating_ip instance_id="None" ip="10.10.10.2" fixed_ip="None" id="2" pool="nova"/>
</floating_ips>

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

@ -19,6 +19,7 @@ import uuid
from lxml import etree
from nova import context
from nova import flags
from nova.openstack.common import importutils
from nova.openstack.common import jsonutils
@ -741,3 +742,97 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase):
class ExtendedServerAttributesXmlTest(ExtendedServerAttributesJsonTest):
ctype = 'xml'
class FloatingIpsJsonTest(ApiSampleTestBase):
extension_name = "nova.api.openstack.compute.contrib." \
"floating_ips.Floating_ips"
def setUp(self):
super(FloatingIpsJsonTest, self).setUp()
pool = FLAGS.default_floating_pool
interface = FLAGS.public_interface
self.ip_pool = [
{
'address': "10.10.10.1",
'pool': pool,
'interface': interface
},
{
'address': "10.10.10.2",
'pool': pool,
'interface': interface
},
{
'address': "10.10.10.3",
'pool': pool,
'interface': interface
},
]
self.compute.db.floating_ip_bulk_create(
context.get_admin_context(), self.ip_pool)
def tearDown(self):
self.compute.db.floating_ip_bulk_destroy(
context.get_admin_context(), self.ip_pool)
super(FloatingIpsJsonTest, self).tearDown()
def test_floating_ips_list_empty(self):
response = self._do_get('os-floating-ips')
self.assertEqual(response.status, 200)
subs = self._get_regexes()
return self._verify_response('floating-ips-list-empty-resp',
subs, response)
def test_floating_ips_list(self):
self._do_post('os-floating-ips',
'floating-ips-create-nopool-req',
{})
self._do_post('os-floating-ips',
'floating-ips-create-nopool-req',
{})
response = self._do_get('os-floating-ips')
self.assertEqual(response.status, 200)
subs = self._get_regexes()
return self._verify_response('floating-ips-list-resp',
subs, response)
def test_floating_ips_create_nopool(self):
response = self._do_post('os-floating-ips',
'floating-ips-create-nopool-req',
{})
self.assertEqual(response.status, 200)
subs = self._get_regexes()
self._verify_response('floating-ips-create-resp',
subs, response)
def test_floating_ips_create(self):
response = self._do_post('os-floating-ips',
'floating-ips-create-req',
{"pool": FLAGS.default_floating_pool})
self.assertEqual(response.status, 200)
subs = self._get_regexes()
self._verify_response('floating-ips-create-resp',
subs, response)
def test_floating_ips_get(self):
self.test_floating_ips_create()
# NOTE(sdague): the first floating ip will always have 1 as an id,
# but it would be better if we could get this from the create
response = self._do_get('os-floating-ips/%d' % 1)
self.assertEqual(response.status, 200)
subs = self._get_regexes()
self._verify_response('floating-ips-create-resp',
subs, response)
def test_floating_ips_delete(self):
self.test_floating_ips_create()
response = self._do_delete('os-floating-ips/%d' % 1)
self.assertEqual(response.status, 202)
class FloatingIpsXmlTest(FloatingIpsJsonTest):
ctype = 'xml'