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

13 files changed, 172 insertions, 24 deletions

diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
index c4e2ecf78..2c44cdfc0 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl
@@ -29,7 +29,7 @@
             ]
         },
         "hostId": "%(hostid)s",
-        "id": "%(uuid)s",
+        "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
@@ -42,11 +42,11 @@
         "key_name": null,
         "links": [
             {
-                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
+                "href": "%(host)s/v2/openstack/servers/%(id)s",
                 "rel": "self"
             },
             {
-                "href": "%(host)s/openstack/servers/%(uuid)s",
+                "href": "%(host)s/openstack/servers/%(id)s",
                 "rel": "bookmark"
             }
         ],
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
index 8211a3e0a..d910a7e23 100644
--- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl
@@ -14,8 +14,8 @@
       <ip version="4" addr="%(ip)s"/>
     </network>
   </addresses>
-  <atom:link href="%(host)s/v2/openstack/servers/%(uuid)s" rel="self"/>
-  <atom:link href="%(host)s/openstack/servers/%(uuid)s" rel="bookmark"/>
+  <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/>
+  <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/>
   <security_groups>
     <security_group name="default"/>
   </security_groups>
diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl
new file mode 100644
index 000000000..21185c5d5
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl
@@ -0,0 +1,70 @@
+{
+    "servers": [
+        {
+            "OS-DCF:diskConfig": "AUTO",
+            "OS-EXT-SRV-ATTR:host": "%(compute_host)s",
+            "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": "%(ip)s",
+                        "version": 4
+                    }
+                ]
+            },
+            "config_drive": "",
+            "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"
+                    }
+                ]
+            },
+            "key_name": null,
+            "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,
+            "security_groups": [
+                {
+                    "name": "default"
+                }
+            ],
+            "status": "ACTIVE",
+            "tenant_id": "openstack",
+            "updated": "%(timestamp)s",
+            "user_id": "fake"
+        }
+    ]
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl
new file mode 100644
index 000000000..eb7bed92d
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl
@@ -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 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" 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" key_name="None" 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="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="None" OS-DCF:diskConfig="AUTO">
+    <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"/>
+    <security_groups>
+      <security_group name="default"/>
+    </security_groups>
+  </server>
+</servers>
diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.json.tpl
new file mode 100644
index 000000000..8b97dc28d
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.json.tpl
@@ -0,0 +1,18 @@
+{
+    "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/all_extensions/servers-list-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl
new file mode 100644
index 000000000..03bee03a6
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/servers-list-resp.xml.tpl
@@ -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="%(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/api_samples/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/server-get-resp.json.tpl
index 76907e6c3..86e39aedc 100644
--- a/nova/tests/integrated/api_samples/server-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/server-get-resp.json.tpl
@@ -21,7 +21,7 @@
             ]
         },
         "hostId": "%(hostid)s",
-        "id": "%(uuid)s",
+        "id": "%(id)s",
         "image": {
             "id": "%(uuid)s",
             "links": [
@@ -33,11 +33,11 @@
         },
         "links": [
             {
-                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
+                "href": "%(host)s/v2/openstack/servers/%(id)s",
                 "rel": "self"
             },
             {
-                "href": "%(host)s/openstack/servers/%(uuid)s",
+                "href": "%(host)s/openstack/servers/%(id)s",
                 "rel": "bookmark"
             }
         ],
diff --git a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/server-get-resp.xml.tpl
index f3e4b4bd0..adc8a5c1b 100644
--- a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/server-get-resp.xml.tpl
@@ -14,6 +14,6 @@
       <ip version="4" addr="%(ip)s"/>
     </network>
   </addresses>
-  <atom:link href="%(host)s/v2/openstack/servers/%(uuid)s" rel="self"/>
-  <atom:link href="%(host)s/openstack/servers/%(uuid)s" rel="bookmark"/>
+  <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/server-detail-get-resp.json.tpl b/nova/tests/integrated/api_samples/servers-details-resp.json.tpl
index 921bfdf88..e244ea0df 100644
--- a/nova/tests/integrated/api_samples/server-detail-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/servers-details-resp.json.tpl
@@ -22,7 +22,7 @@
                 ]
             },
             "hostId": "%(hostid)s",
-            "id": "%(uuid)s",
+            "id": "%(id)s",
             "image": {
                 "id": "%(uuid)s",
                 "links": [
@@ -34,11 +34,11 @@
             },
             "links": [
                 {
-                    "href": "%(host)s/v2/openstack/servers/%(uuid)s",
+                    "href": "%(host)s/v2/openstack/servers/%(id)s",
                     "rel": "self"
                 },
                 {
-                    "href": "%(host)s/openstack/servers/%(uuid)s",
+                    "href": "%(host)s/openstack/servers/%(id)s",
                     "rel": "bookmark"
                 }
             ],
diff --git a/nova/tests/integrated/api_samples/server-detail-get-resp.xml.tpl b/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl
index 4465f68d7..568807ecb 100644
--- a/nova/tests/integrated/api_samples/server-detail-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl
@@ -15,7 +15,7 @@
         <ip version="4" addr="%(ip)s"/>
       </network>
     </addresses>
-    <atom:link href="%(host)s/v2/openstack/servers/%(uuid)s" rel="self"/>
-    <atom:link href="%(host)s/openstack/servers/%(uuid)s" rel="bookmark"/>
+    <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/api_samples/servers-list-resp.json.tpl b/nova/tests/integrated/api_samples/servers-list-resp.json.tpl
new file mode 100644
index 000000000..8b97dc28d
--- /dev/null
+++ b/nova/tests/integrated/api_samples/servers-list-resp.json.tpl
@@ -0,0 +1,18 @@
+{
+    "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/servers-list-resp.xml.tpl b/nova/tests/integrated/api_samples/servers-list-resp.xml.tpl
new file mode 100644
index 000000000..03bee03a6
--- /dev/null
+++ b/nova/tests/integrated/api_samples/servers-list-resp.xml.tpl
@@ -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="%(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 0c1bfdd3f..c03d7d8a3 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -236,7 +236,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase):
 
 
 class VersionsSampleJsonTest(ApiSampleTestBase):
-    def test_servers_get(self):
+    def test_versions_get(self):
         response = self._do_get('', strip_version=True)
         subs = self._get_regexes()
         return self._verify_response('versions-get-resp', subs, response)
@@ -267,24 +267,28 @@ class ServersSampleJsonTest(ServersSampleBase):
         response = self._do_get('servers/%s' % uuid)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
+        subs['id'] = uuid
         return self._verify_response('server-get-resp', subs, response)
 
+    def test_servers_list(self):
+        uuid = self._post_server()
+        response = self._do_get('servers')
+        self.assertEqual(response.status, 200)
+        subs = self._get_regexes()
+        subs['id'] = uuid
+        return self._verify_response('servers-list-resp', subs, response)
 
-class ServersSampleXmlTest(ServersSampleJsonTest):
-    ctype = 'xml'
-
-
-class ServersDetailJsonTest(ServersSampleBase):
-    def test_servers_detail_get(self):
+    def test_servers_details(self):
         uuid = self._post_server()
         response = self._do_get('servers/detail')
         self.assertEqual(response.status, 200)
         subs = self._get_regexes()
         subs['hostid'] = '[a-f0-9]+'
-        return self._verify_response('server-detail-get-resp', subs, response)
+        subs['id'] = uuid
+        return self._verify_response('servers-details-resp', subs, response)
 
 
-class ServersDetailXmlTest(ServersDetailJsonTest):
+class ServersSampleXmlTest(ServersSampleJsonTest):
     ctype = 'xml'