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

8 files changed, 143 insertions, 0 deletions

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 0000000000..dc2698fec3
--- /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 0000000000..c769c8ec17
--- /dev/null
+++ b/doc/api_samples/all_extensions/servers-details-resp.xml
@@ -0,0 +1,24 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<servers xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" 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">
+  <server status="ACTIVE" updated="2012-09-12T17:16:23Z" hostId="95bc84e46706592751395e8651c7d28cb0c86722ae372fe97fb27f35" name="new-server-test" created="2012-09-12T17:16:23Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="2e6a40cf-4abb-44ba-8a1c-fdb666110b42" config_drive="" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="530cfd748f4b4a24b3dc7015d5a0a02e" OS-EXT-SRV-ATTR:hypervisor_hostname="None" OS-DCF:diskConfig="AUTO">
+    <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/2e6a40cf-4abb-44ba-8a1c-fdb666110b42" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/servers/2e6a40cf-4abb-44ba-8a1c-fdb666110b42" rel="bookmark"/>
+    <security_groups>
+      <security_group name="default"/>
+    </security_groups>
+  </server>
+</servers>
\ 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 0000000000..99b9b1dcce
--- /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 0000000000..34e7d90f82
--- /dev/null
+++ b/doc/api_samples/all_extensions/servers-list-resp.xml
@@ -0,0 +1,7 @@
+<?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="b28017c2-7909-4318-bc47-ba1419f17709">
+    <atom:link href="http://openstack.example.com/v2/openstack/servers/b28017c2-7909-4318-bc47-ba1419f17709" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/servers/b28017c2-7909-4318-bc47-ba1419f17709" rel="bookmark"/>
+  </server>
+</servers>
\ No newline at end of file
diff --git a/doc/api_samples/server-detail-get-resp.json b/doc/api_samples/servers-details-resp.json
index 3ea61531e5..3ea61531e5 100644
--- a/doc/api_samples/server-detail-get-resp.json
+++ b/doc/api_samples/servers-details-resp.json
diff --git a/doc/api_samples/server-detail-get-resp.xml b/doc/api_samples/servers-details-resp.xml
index 83bcf0f79b..83bcf0f79b 100644
--- a/doc/api_samples/server-detail-get-resp.xml
+++ b/doc/api_samples/servers-details-resp.xml
diff --git a/doc/api_samples/servers-list-resp.json b/doc/api_samples/servers-list-resp.json
new file mode 100644
index 0000000000..2cc75eef19
--- /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 0000000000..cbd7892e73
--- /dev/null
+++ b/doc/api_samples/servers-list-resp.xml
@@ -0,0 +1,7 @@
+<?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="b626796d-d585-4874-b178-78c65289bba4">
+    <atom:link href="http://openstack.example.com/v2/openstack/servers/b626796d-d585-4874-b178-78c65289bba4" rel="self"/>
+    <atom:link href="http://openstack.example.com/openstack/servers/b626796d-d585-4874-b178-78c65289bba4" rel="bookmark"/>
+  </server>
+</servers>
\ No newline at end of file