From 1ea366be7021da05c332cf0035a531924ba3f6b3 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Thu, 7 Feb 2013 11:35:49 -0800 Subject: Clean up extended server output samples The extended status extension was testing list instead of get and the extended server attribute extension was misnaming its sample files. This makes the names of the samples consistent. Change-Id: I5b6f8d00c85d7817775c190b2a7645a47f8085db DocImpact: The api sample site may need to be updated as well --- .../OS-EXT-SRV-ATTR/extended-server-attrs-get.json | 57 --------------------- .../OS-EXT-SRV-ATTR/extended-server-attrs-get.xml | 19 ------- .../extended-server-attrs-list.json | 59 ---------------------- .../OS-EXT-SRV-ATTR/extended-server-attrs-list.xml | 21 -------- .../OS-EXT-SRV-ATTR/server-get-resp.json | 57 +++++++++++++++++++++ .../OS-EXT-SRV-ATTR/server-get-resp.xml | 19 +++++++ .../OS-EXT-SRV-ATTR/servers-detail-resp.json | 59 ++++++++++++++++++++++ .../OS-EXT-SRV-ATTR/servers-detail-resp.xml | 21 ++++++++ doc/api_samples/OS-EXT-STS/server-get-resp.json | 57 +++++++++++++++++++++ doc/api_samples/OS-EXT-STS/server-get-resp.xml | 19 +++++++ doc/api_samples/OS-EXT-STS/servers-list-resp.json | 18 ------- doc/api_samples/OS-EXT-STS/servers-list-resp.xml | 7 --- .../extended-server-attrs-get.json.tpl | 57 --------------------- .../extended-server-attrs-get.xml.tpl | 19 ------- .../extended-server-attrs-list.json.tpl | 59 ---------------------- .../extended-server-attrs-list.xml.tpl | 21 -------- .../OS-EXT-SRV-ATTR/server-get-resp.json.tpl | 57 +++++++++++++++++++++ .../OS-EXT-SRV-ATTR/server-get-resp.xml.tpl | 19 +++++++ .../OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl | 59 ++++++++++++++++++++++ .../OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl | 21 ++++++++ .../OS-EXT-STS/server-get-resp.json.tpl | 57 +++++++++++++++++++++ .../api_samples/OS-EXT-STS/server-get-resp.xml.tpl | 19 +++++++ .../OS-EXT-STS/servers-list-resp.json.tpl | 18 ------- .../OS-EXT-STS/servers-list-resp.xml.tpl | 7 --- nova/tests/integrated/test_api_samples.py | 18 +++---- 25 files changed, 473 insertions(+), 371 deletions(-) delete mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json delete mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml delete mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json delete mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml create mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json create mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml create mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json create mode 100644 doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml create mode 100644 doc/api_samples/OS-EXT-STS/server-get-resp.json create mode 100644 doc/api_samples/OS-EXT-STS/server-get-resp.xml delete mode 100644 doc/api_samples/OS-EXT-STS/servers-list-resp.json delete mode 100644 doc/api_samples/OS-EXT-STS/servers-list-resp.xml delete mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json.tpl delete mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml.tpl delete mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json.tpl delete mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl delete mode 100644 nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.json.tpl delete mode 100644 nova/tests/integrated/api_samples/OS-EXT-STS/servers-list-resp.xml.tpl diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json deleted file mode 100644 index ad3bcab5d..000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "server": { - "OS-EXT-SRV-ATTR:host": "1169a68456af48238da47b1d5957a714", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "created": "2012-11-15T19:27:04Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "2dfce43c41dd288cfac3a5b4251742b3bd2b37c12eb5927e757d9b4c", - "id": "1fc2392e-5727-46af-bc21-317a4a3eb04c", - "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/1fc2392e-5727-46af-bc21-317a4a3eb04c", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/1fc2392e-5727-46af-bc21-317a4a3eb04c", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-11-15T19:27:04Z", - "user_id": "fake" - } -} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml deleted file mode 100644 index 4b42c3586..000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json deleted file mode 100644 index db3de77f4..000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json +++ /dev/null @@ -1,59 +0,0 @@ -{ - "servers": [ - { - "OS-EXT-SRV-ATTR:host": "dd99797793774612b081a8be19bf721a", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", - "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "created": "2012-11-15T19:27:05Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "146245c049213a54b8c2352751518fcb4c2befd1b942b45a5a705d35", - "id": "e0c3563a-84ef-4d0b-bb80-23392cd23882", - "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/e0c3563a-84ef-4d0b-bb80-23392cd23882", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/e0c3563a-84ef-4d0b-bb80-23392cd23882", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-11-15T19:27:05Z", - "user_id": "fake" - } - ] -} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml b/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml deleted file mode 100644 index 8179a3bf9..000000000 --- a/doc/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json new file mode 100644 index 000000000..ad3bcab5d --- /dev/null +++ b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json @@ -0,0 +1,57 @@ +{ + "server": { + "OS-EXT-SRV-ATTR:host": "1169a68456af48238da47b1d5957a714", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-11-15T19:27:04Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "2dfce43c41dd288cfac3a5b4251742b3bd2b37c12eb5927e757d9b4c", + "id": "1fc2392e-5727-46af-bc21-317a4a3eb04c", + "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/1fc2392e-5727-46af-bc21-317a4a3eb04c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/1fc2392e-5727-46af-bc21-317a4a3eb04c", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-11-15T19:27:04Z", + "user_id": "fake" + } +} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml new file mode 100644 index 000000000..4b42c3586 --- /dev/null +++ b/doc/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json new file mode 100644 index 000000000..db3de77f4 --- /dev/null +++ b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json @@ -0,0 +1,59 @@ +{ + "servers": [ + { + "OS-EXT-SRV-ATTR:host": "dd99797793774612b081a8be19bf721a", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini", + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-11-15T19:27:05Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "146245c049213a54b8c2352751518fcb4c2befd1b942b45a5a705d35", + "id": "e0c3563a-84ef-4d0b-bb80-23392cd23882", + "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/e0c3563a-84ef-4d0b-bb80-23392cd23882", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/e0c3563a-84ef-4d0b-bb80-23392cd23882", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-11-15T19:27:05Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml new file mode 100644 index 000000000..8179a3bf9 --- /dev/null +++ b/doc/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file 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 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ 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 @@ - - - - - - - \ 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/extended-server-attrs-get.json.tpl deleted file mode 100644 index c70192949..000000000 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.json.tpl +++ /dev/null @@ -1,57 +0,0 @@ -{ - "server": { - "OS-EXT-SRV-ATTR:host": "%(compute_host)s", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", - "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", - "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" - } -} \ No newline at end of file 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/extended-server-attrs-get.xml.tpl deleted file mode 100644 index beec3a12a..000000000 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-get.xml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - Apache1 - - - - - - - - - \ No newline at end of file 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/extended-server-attrs-list.json.tpl deleted file mode 100644 index 1fb8e1a47..000000000 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.json.tpl +++ /dev/null @@ -1,59 +0,0 @@ -{ - "servers": [ - { - "OS-EXT-SRV-ATTR:host": "%(compute_host)s", - "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", - "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", - "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" - } - ] -} \ No newline at end of file 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/extended-server-attrs-list.xml.tpl deleted file mode 100644 index 1811882a2..000000000 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/extended-server-attrs-list.xml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl new file mode 100644 index 000000000..c70192949 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl @@ -0,0 +1,57 @@ +{ + "server": { + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "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" + } +} \ No newline at end of file diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl new file mode 100644 index 000000000..beec3a12a --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl @@ -0,0 +1,19 @@ + + + + + + + + + + Apache1 + + + + + + + + + \ No newline at end of file diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl new file mode 100644 index 000000000..1fb8e1a47 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl @@ -0,0 +1,59 @@ +{ + "servers": [ + { + "OS-EXT-SRV-ATTR:host": "%(compute_host)s", + "OS-EXT-SRV-ATTR:hypervisor_hostname": "%(hypervisor_hostname)s", + "OS-EXT-SRV-ATTR:instance_name": "%(instance_name)s", + "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" + } + ] +} \ No newline at end of file diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl new file mode 100644 index 000000000..1811882a2 --- /dev/null +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file 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 @@ + + + + + + + + + + Apache1 + + + + + + + + + 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 @@ - - - - - - - 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) -- cgit