diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-30 07:34:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-30 07:34:30 +0000 |
| commit | cf9d5de2ce92c7f3267190f991c8f8ecb726f01f (patch) | |
| tree | 6635c78dd614255178c786bafff1ca321410be2d /nova | |
| parent | 81ef1db7b0a85719dc53b773bcb576e03221bdf0 (diff) | |
| parent | e788d7694dbe360f78b99b718107f94049c45dbf (diff) | |
| download | nova-cf9d5de2ce92c7f3267190f991c8f8ecb726f01f.tar.gz nova-cf9d5de2ce92c7f3267190f991c8f8ecb726f01f.tar.xz nova-cf9d5de2ce92c7f3267190f991c8f8ecb726f01f.zip | |
Merge "Add servers/ips api_samples tests"
Diffstat (limited to 'nova')
5 files changed, 48 insertions, 0 deletions
diff --git a/nova/tests/integrated/api_samples/server-ips-network-resp.json.tpl b/nova/tests/integrated/api_samples/server-ips-network-resp.json.tpl new file mode 100644 index 000000000..29d2370a7 --- /dev/null +++ b/nova/tests/integrated/api_samples/server-ips-network-resp.json.tpl @@ -0,0 +1,8 @@ +{ + "private": [ + { + "addr": "%(ip)s", + "version": 4 + } + ] +} diff --git a/nova/tests/integrated/api_samples/server-ips-network-resp.xml.tpl b/nova/tests/integrated/api_samples/server-ips-network-resp.xml.tpl new file mode 100644 index 000000000..153dca9b5 --- /dev/null +++ b/nova/tests/integrated/api_samples/server-ips-network-resp.xml.tpl @@ -0,0 +1,4 @@ +<?xml version='1.0' encoding='UTF-8'?> +<network xmlns="http://docs.openstack.org/compute/api/v1.1" id="private"> + <ip version="4" addr="%(ip)s"/> +</network> diff --git a/nova/tests/integrated/api_samples/server-ips-resp.json.tpl b/nova/tests/integrated/api_samples/server-ips-resp.json.tpl new file mode 100644 index 000000000..259eabea7 --- /dev/null +++ b/nova/tests/integrated/api_samples/server-ips-resp.json.tpl @@ -0,0 +1,10 @@ +{ + "addresses": { + "private": [ + { + "addr": "%(ip)s", + "version": 4 + } + ] + } +} diff --git a/nova/tests/integrated/api_samples/server-ips-resp.xml.tpl b/nova/tests/integrated/api_samples/server-ips-resp.xml.tpl new file mode 100644 index 000000000..62d804b2a --- /dev/null +++ b/nova/tests/integrated/api_samples/server-ips-resp.xml.tpl @@ -0,0 +1,6 @@ +<?xml version='1.0' encoding='UTF-8'?> +<addresses xmlns="http://docs.openstack.org/compute/api/v1.1"> + <network id="private"> + <ip version="4" addr="%(ip)s"/> + </network> +</addresses> diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index d89173d99..a59b62ead 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -382,6 +382,26 @@ class ServersMetadataXmlTest(ServersMetadataJsonTest): ctype = 'xml' +class ServersIpsJsonTest(ServersSampleBase): + def test_get(self): + """Test getting a server's IP information""" + uuid = self._post_server() + response = self._do_get('servers/%s/ips' % uuid) + subs = self._get_regexes() + return self._verify_response('server-ips-resp', subs, response) + + def test_get_by_network(self): + """Test getting a server's IP information by network id""" + uuid = self._post_server() + response = self._do_get('servers/%s/ips/private' % uuid) + subs = self._get_regexes() + return self._verify_response('server-ips-network-resp', subs, response) + + +class ServersIpsXmlTest(ServersIpsJsonTest): + ctype = 'xml' + + class ExtensionsSampleJsonTest(ApiSampleTestBase): all_extensions = True |