diff options
17 files changed, 161 insertions, 59 deletions
diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json index ad3bcab5d..ad3bcab5d 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json +++ b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml index 4b42c3586..4b42c3586 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml +++ b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json index db3de77f4..db3de77f4 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json +++ b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml index 8179a3bf9..8179a3bf9 100644 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml +++ b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml diff --git a/doc/api_samples/OS-EXT-STS/server-get-resp.json b/doc/api_samples/OS-EXT-STS/server-get-resp.json new file mode 100644 index 000000000..763426bb1 --- /dev/null +++ b/doc/api_samples/OS-EXT-STS/server-get-resp.json @@ -0,0 +1,57 @@ +{ + "server": { + "OS-EXT-STS:power_state": 1, + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2013-02-07T19:35:09Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "570eff4776ab310707d11d181037337197086998a8b3305c90bf87c8", + "id": "ecb5e433-fa75-4db2-af3d-a29ae8618edc", + "image": { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/ecb5e433-fa75-4db2-af3d-a29ae8618edc", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/ecb5e433-fa75-4db2-af3d-a29ae8618edc", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2013-02-07T19:35:10Z", + "user_id": "fake" + } +}
\ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/server-get-resp.xml b/doc/api_samples/OS-EXT-STS/server-get-resp.xml new file mode 100644 index 000000000..53363a224 --- /dev/null +++ b/doc/api_samples/OS-EXT-STS/server-get-resp.xml @@ -0,0 +1,19 @@ +<?xml version='1.0' encoding='UTF-8'?> +<server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-02-07T19:35:10Z" hostId="372afb648339fb6f22faa0b75fdd8834e2382fe02b352af8d7ee0b84" name="new-server-test" created="2013-02-07T19:35:09Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="68647408-85a7-4d9b-85e7-7f1e238983ad" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1"> + <image id="70a599e0-31e7-49b7-b260-868f441e862b"> + <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + </image> + <flavor id="1"> + <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/> + </flavor> + <metadata> + <meta key="My Server Name">Apache1</meta> + </metadata> + <addresses> + <network id="private"> + <ip version="4" addr="192.168.0.3"/> + </network> + </addresses> + <atom:link href="http://openstack.example.com/v2/openstack/servers/68647408-85a7-4d9b-85e7-7f1e238983ad" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/servers/68647408-85a7-4d9b-85e7-7f1e238983ad" rel="bookmark"/> +</server>
\ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/servers-list-resp.json b/doc/api_samples/OS-EXT-STS/servers-list-resp.json deleted file mode 100644 index d0309cc1f..000000000 --- a/doc/api_samples/OS-EXT-STS/servers-list-resp.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "servers": [ - { - "id": "a5dd5b16-552c-441c-8a03-f19c4da9e6f5", - "links": [ - { - "href": "http://openstack.example.com/v2/openstack/servers/a5dd5b16-552c-441c-8a03-f19c4da9e6f5", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/a5dd5b16-552c-441c-8a03-f19c4da9e6f5", - "rel": "bookmark" - } - ], - "name": "new-server-test" - } - ] -}
\ No newline at end of file diff --git a/doc/api_samples/OS-EXT-STS/servers-list-resp.xml b/doc/api_samples/OS-EXT-STS/servers-list-resp.xml deleted file mode 100644 index f1c3cabf4..000000000 --- a/doc/api_samples/OS-EXT-STS/servers-list-resp.xml +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server name="new-server-test" id="7128d3b9-1993-402c-91ca-ed59a0193ffa"> - <atom:link href="http://openstack.example.com/v2/openstack/servers/7128d3b9-1993-402c-91ca-ed59a0193ffa" rel="self"/> - <atom:link href="http://openstack.example.com/openstack/servers/7128d3b9-1993-402c-91ca-ed59a0193ffa" rel="bookmark"/> - </server> -</servers>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl index c70192949..c70192949 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl index beec3a12a..beec3a12a 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl index 1fb8e1a47..1fb8e1a47 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl index 1811882a2..1811882a2 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl new file mode 100644 index 000000000..7ac35024b --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl @@ -0,0 +1,57 @@ +{ + "server": { + "OS-EXT-STS:task_state": null, + "OS-EXT-STS:vm_state": "active", + "OS-EXT-STS:power_state": 1, + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "%(ip)s", + "version": 4 + } + ] + }, + "created": "%(timestamp)s", + "flavor": { + "id": "1", + "links": [ + { + "href": "%(host)s/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "%(hostid)s", + "id": "%(id)s", + "image": { + "id": "%(uuid)s", + "links": [ + { + "href": "%(host)s/openstack/images/%(uuid)s", + "rel": "bookmark" + } + ] + }, + "links": [ + { + "href": "%(host)s/v2/openstack/servers/%(id)s", + "rel": "self" + }, + { + "href": "%(host)s/openstack/servers/%(id)s", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "%(timestamp)s", + "user_id": "fake" + } +} diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl new file mode 100644 index 000000000..f594be120 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl @@ -0,0 +1,19 @@ +<?xml version='1.0' encoding='UTF-8'?> +<server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1"> + <image id="%(uuid)s"> + <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> + </image> + <flavor id="1"> + <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/> + </flavor> + <metadata> + <meta key="My Server Name">Apache1</meta> + </metadata> + <addresses> + <network id="private"> + <ip version="4" addr="%(ip)s"/> + </network> + </addresses> + <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/> + <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/> +</server> diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.json.tpl deleted file mode 100644 index 8b97dc28d..000000000 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.json.tpl +++ /dev/null @@ -1,18 +0,0 @@ -{ - "servers": [ - { - "id": "%(id)s", - "links": [ - { - "href": "%(host)s/v2/openstack/servers/%(id)s", - "rel": "self" - }, - { - "href": "%(host)s/openstack/servers/%(id)s", - "rel": "bookmark" - } - ], - "name": "new-server-test" - } - ] -} diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.xml.tpl deleted file mode 100644 index 03bee03a6..000000000 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.xml.tpl +++ /dev/null @@ -1,7 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server name="new-server-test" id="%(id)s"> - <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/> - <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/> - </server> -</servers> diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index d688d900d..666d91ae4 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -1175,7 +1175,7 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase): ".extended_server_attributes" + \ ".Extended_server_attributes" - def test_extended_server_attrs_get(self): + def test_show(self): uuid = self._post_server() response = self._do_get('servers/%s' % uuid) @@ -1184,10 +1184,10 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase): subs['id'] = uuid subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' - return self._verify_response('extended-server-attrs-get', + return self._verify_response('server-get-resp', subs, response) - def test_extended_server_attrs_list(self): + def test_detail(self): uuid = self._post_server() response = self._do_get('servers/detail') @@ -1196,7 +1196,7 @@ class ExtendedServerAttributesJsonTest(ServersSampleBase): subs['id'] = uuid subs['instance_name'] = 'instance-\d{8}' subs['hypervisor_hostname'] = r'[\w\.\-]+' - return self._verify_response('extended-server-attrs-list', + return self._verify_response('servers-detail-resp', subs, response) @@ -2220,15 +2220,15 @@ class QuotasSampleXmlTests(QuotasSampleJsonTests): class ExtendedStatusSampleJsonTests(ServersSampleBase): extension_name = ("nova.api.openstack.compute.contrib" - ".extended_status.Extended_status") + ".extended_status.Extended_status") def test_show(self): uuid = self._post_server() - response = self._do_get('servers') + response = self._do_get('servers/%s' % uuid) self.assertEqual(response.status, 200) subs = self._get_regexes() - subs['id'] = uuid - return self._verify_response('servers-list-resp', subs, response) + subs['hostid'] = '[a-f0-9]+' + return self._verify_response('server-get-resp', subs, response) def test_detail(self): uuid = self._post_server() @@ -2862,7 +2862,7 @@ class ExtendedAvailabilityZoneJsonTests(ServersSampleBase): ".extended_availability_zone" ".Extended_availability_zone") - def test_get(self): + def test_show(self): uuid = self._post_server() response = self._do_get('servers/%s' % uuid) self.assertEqual(response.status, 200) |