From 8c168dd4fd55aed89b62eec5a0506299dd0d0438 Mon Sep 17 00:00:00 2001 From: Vishvananda Ishaya Date: Wed, 12 Sep 2012 10:37:22 -0700 Subject: Adds more servers list and servers details samples This moves the servers detail test into the base servers test so it runs with all_extensions as well. It also renames the results to be consistent with the other tests. Finally it adds test for servers-list both with and without extensions. Change-Id: I6eed3932fa594f1a39faa55453461680781e6a9f --- .../all_extensions/servers-details-resp.json | 69 ++++++++++++++++++++++ .../all_extensions/servers-details-resp.xml | 24 ++++++++ .../all_extensions/servers-list-resp.json | 18 ++++++ .../all_extensions/servers-list-resp.xml | 7 +++ doc/api_samples/server-detail-get-resp.json | 56 ------------------ doc/api_samples/server-detail-get-resp.xml | 21 ------- doc/api_samples/servers-details-resp.json | 56 ++++++++++++++++++ doc/api_samples/servers-details-resp.xml | 21 +++++++ doc/api_samples/servers-list-resp.json | 18 ++++++ doc/api_samples/servers-list-resp.xml | 7 +++ 10 files changed, 220 insertions(+), 77 deletions(-) create mode 100644 doc/api_samples/all_extensions/servers-details-resp.json create mode 100644 doc/api_samples/all_extensions/servers-details-resp.xml create mode 100644 doc/api_samples/all_extensions/servers-list-resp.json create mode 100644 doc/api_samples/all_extensions/servers-list-resp.xml delete mode 100644 doc/api_samples/server-detail-get-resp.json delete mode 100644 doc/api_samples/server-detail-get-resp.xml create mode 100644 doc/api_samples/servers-details-resp.json create mode 100644 doc/api_samples/servers-details-resp.xml create mode 100644 doc/api_samples/servers-list-resp.json create mode 100644 doc/api_samples/servers-list-resp.xml (limited to 'doc') diff --git a/doc/api_samples/all_extensions/servers-details-resp.json b/doc/api_samples/all_extensions/servers-details-resp.json new file mode 100644 index 000000000..dc2698fec --- /dev/null +++ b/doc/api_samples/all_extensions/servers-details-resp.json @@ -0,0 +1,69 @@ +{ + "servers": [ + { + "OS-DCF:diskConfig": "AUTO", + "OS-EXT-SRV-ATTR:host": "1ed961df12f5434a8e54e0efd1049fa5", + "OS-EXT-SRV-ATTR:hypervisor_hostname": null, + "OS-EXT-SRV-ATTR:instance_name": "instance-00000001", + "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 + } + ] + }, + "config_drive": "", + "created": "2012-09-12T17:16:15Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "c161a6e3edcd047317a6cfbe599d7711850fd871210b62fdd2f6479e", + "id": "1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "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/1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/1d0f60bc-8c90-425d-8c64-cdaa49cd2303", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "security_groups": [ + { + "name": "default" + } + ], + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-12T17:16:15Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-details-resp.xml b/doc/api_samples/all_extensions/servers-details-resp.xml new file mode 100644 index 000000000..c769c8ec1 --- /dev/null +++ b/doc/api_samples/all_extensions/servers-details-resp.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-list-resp.json b/doc/api_samples/all_extensions/servers-list-resp.json new file mode 100644 index 000000000..99b9b1dcc --- /dev/null +++ b/doc/api_samples/all_extensions/servers-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "eb51f4a9-8192-4cd0-be78-d8e2c834dbc4", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/eb51f4a9-8192-4cd0-be78-d8e2c834dbc4", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/eb51f4a9-8192-4cd0-be78-d8e2c834dbc4", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/all_extensions/servers-list-resp.xml b/doc/api_samples/all_extensions/servers-list-resp.xml new file mode 100644 index 000000000..34e7d90f8 --- /dev/null +++ b/doc/api_samples/all_extensions/servers-list-resp.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/server-detail-get-resp.json b/doc/api_samples/server-detail-get-resp.json deleted file mode 100644 index 3ea61531e..000000000 --- a/doc/api_samples/server-detail-get-resp.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "servers": [ - { - "accessIPv4": "", - "accessIPv6": "", - "addresses": { - "private": [ - { - "addr": "192.168.0.3", - "version": 4 - } - ] - }, - "created": "2012-09-07T16:56:37Z", - "flavor": { - "id": "1", - "links": [ - { - "href": "http://openstack.example.com/openstack/flavors/1", - "rel": "bookmark" - } - ] - }, - "hostId": "16d193736a5cfdb60c697ca27ad071d6126fa13baeb670fc9d10645e", - "id": "05184ba3-00ba-4fbc-b7a2-03b62b884931", - "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/05184ba3-00ba-4fbc-b7a2-03b62b884931", - "rel": "self" - }, - { - "href": "http://openstack.example.com/openstack/servers/05184ba3-00ba-4fbc-b7a2-03b62b884931", - "rel": "bookmark" - } - ], - "metadata": { - "My Server Name": "Apache1" - }, - "name": "new-server-test", - "progress": 0, - "status": "ACTIVE", - "tenant_id": "openstack", - "updated": "2012-09-07T16:56:37Z", - "user_id": "fake" - } - ] -} \ No newline at end of file diff --git a/doc/api_samples/server-detail-get-resp.xml b/doc/api_samples/server-detail-get-resp.xml deleted file mode 100644 index 83bcf0f79..000000000 --- a/doc/api_samples/server-detail-get-resp.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - Apache1 - - - - - - - - - - \ No newline at end of file diff --git a/doc/api_samples/servers-details-resp.json b/doc/api_samples/servers-details-resp.json new file mode 100644 index 000000000..3ea61531e --- /dev/null +++ b/doc/api_samples/servers-details-resp.json @@ -0,0 +1,56 @@ +{ + "servers": [ + { + "accessIPv4": "", + "accessIPv6": "", + "addresses": { + "private": [ + { + "addr": "192.168.0.3", + "version": 4 + } + ] + }, + "created": "2012-09-07T16:56:37Z", + "flavor": { + "id": "1", + "links": [ + { + "href": "http://openstack.example.com/openstack/flavors/1", + "rel": "bookmark" + } + ] + }, + "hostId": "16d193736a5cfdb60c697ca27ad071d6126fa13baeb670fc9d10645e", + "id": "05184ba3-00ba-4fbc-b7a2-03b62b884931", + "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/05184ba3-00ba-4fbc-b7a2-03b62b884931", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/05184ba3-00ba-4fbc-b7a2-03b62b884931", + "rel": "bookmark" + } + ], + "metadata": { + "My Server Name": "Apache1" + }, + "name": "new-server-test", + "progress": 0, + "status": "ACTIVE", + "tenant_id": "openstack", + "updated": "2012-09-07T16:56:37Z", + "user_id": "fake" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/servers-details-resp.xml b/doc/api_samples/servers-details-resp.xml new file mode 100644 index 000000000..83bcf0f79 --- /dev/null +++ b/doc/api_samples/servers-details-resp.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + Apache1 + + + + + + + + + + \ No newline at end of file diff --git a/doc/api_samples/servers-list-resp.json b/doc/api_samples/servers-list-resp.json new file mode 100644 index 000000000..2cc75eef1 --- /dev/null +++ b/doc/api_samples/servers-list-resp.json @@ -0,0 +1,18 @@ +{ + "servers": [ + { + "id": "616fb98f-46ca-475e-917e-2563e5a8cd19", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/616fb98f-46ca-475e-917e-2563e5a8cd19", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/616fb98f-46ca-475e-917e-2563e5a8cd19", + "rel": "bookmark" + } + ], + "name": "new-server-test" + } + ] +} \ No newline at end of file diff --git a/doc/api_samples/servers-list-resp.xml b/doc/api_samples/servers-list-resp.xml new file mode 100644 index 000000000..cbd7892e7 --- /dev/null +++ b/doc/api_samples/servers-list-resp.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file -- cgit