all_extensions api_samples testing for server actions

server actions sometimes return servers objects, which means
their output is different when extensions are enabled. This
adds api samples for those cases to give a more realistic view
to the user of what they might expect.

Change-Id: Iaa9a4c3a373dee41931c5dc4f1b805f09a05299f

17 files changed, 208 insertions, 0 deletions

diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl
new file mode 100644
index 000000000..da615718f
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.json.tpl
@@ -0,0 +1,5 @@
+{
+    "changePassword" : {
+        "adminPass" : "%(password)s"
+    }
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl
new file mode 100644
index 000000000..6c343024e
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-changepassword.xml.tpl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<changePassword
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    adminPass="%(password)s"/>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl
new file mode 100644
index 000000000..432f6126e
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.json.tpl
@@ -0,0 +1,3 @@
+{
+    "confirmResize" : null
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl
new file mode 100644
index 000000000..18f07bd67
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-confirmresize.xml.tpl
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<confirmResize
+    xmlns="http://docs.openstack.org/compute/api/v1.1"/>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.json.tpl
new file mode 100644
index 000000000..0b9e39ffb
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.json.tpl
@@ -0,0 +1,9 @@
+{
+    "createImage" : {
+        "name" : "%(name)s",
+        "metadata": {
+            "%(meta_var)s": "%(meta_val)s"
+        }
+    }
+}
+
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl
new file mode 100644
index 000000000..aa1eccf8a
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-createimage.xml.tpl
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<createImage
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    name="%(name)s">
+    <metadata>
+        <meta key="%(meta_var)s">%(meta_val)s</meta>
+    </metadata>
+</createImage>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl
new file mode 100644
index 000000000..4c018975e
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.json.tpl
@@ -0,0 +1,5 @@
+{
+    "reboot" : {
+        "type" : "%(type)s" 
+    }
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl
new file mode 100644
index 000000000..d4cfe198c
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-reboot.xml.tpl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<reboot
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    type="%(type)s"/>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
new file mode 100644
index 000000000..884be7549
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl
@@ -0,0 +1,56 @@
+{
+    "server": {
+        "OS-DCF:diskConfig": "AUTO",
+        "accessIPv4": "%(ip)s",
+        "accessIPv6": "%(ip6)s",
+        "addresses": {
+            "private": [
+                {
+                    "addr": "%(ip)s",
+                    "version": 4
+                }
+            ]
+        },
+        "adminPass": "%(password)s",
+        "created": "%(timestamp)s",
+        "flavor": {
+            "id": "1",
+            "links": [
+                {
+                    "href": "%(host)s/openstack/flavors/1",
+                    "rel": "bookmark"
+                }
+            ]
+        },
+        "hostId": "%(hostid)s",
+        "id": "%(uuid)s",
+        "image": {
+            "id": "%(uuid)s",
+            "links": [
+                {
+                    "href": "%(host)s/openstack/images/%(uuid)s",
+                    "rel": "bookmark"
+                }
+            ]
+        },
+        "links": [
+            {
+                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
+                "rel": "self"
+            },
+            {
+                "href": "%(host)s/openstack/servers/%(uuid)s",
+                "rel": "bookmark"
+            }
+        ],
+        "metadata": {
+            "meta var": "meta val"
+        },
+        "name": "%(name)s",
+        "progress": 0,
+        "status": "ACTIVE",
+        "tenant_id": "openstack",
+        "updated": "%(timestamp)s",
+        "user_id": "fake"
+    }
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl
new file mode 100644
index 000000000..105e19fdd
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
+        xmlns="http://docs.openstack.org/compute/api/v1.1"
+        xmlns:atom="http://www.w3.org/2005/Atom"
+        id="%(uuid)s"
+        tenantId="openstack" userId="fake"
+        name="%(name)s"
+        hostId="%(hostid)s" progress="0"
+        status="ACTIVE" adminPass="%(password)s"
+        created="%(timestamp)s"
+	updated="%(timestamp)s"
+        accessIPv4="%(ip)s"
+        accessIPv6="%(ip6)s"
+        OS-DCF:diskConfig="AUTO">
+  <image id="%(uuid)s">
+      <atom:link
+          rel="bookmark"
+          href="%(host)s/openstack/images/%(uuid)s"/>
+      <atom:link
+          rel="self"
+          href="%(host)s/openstack/images/%(uuid)s"/>
+  </image>
+  <flavor id="1">
+      <atom:link
+          rel="bookmark"
+          href="%(host)s/openstack/flavors/1"/>
+      <atom:link
+          rel="self"
+          href="%(host)s/openstack/flavors/1"/>
+  </flavor>
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <addresses>
+    <network id="private">
+      <ip version="4" addr="%(ip)s"/>
+    </network>
+  </addresses>
+  <atom:link
+      rel="self"
+      href="%(host)s/v2/openstack/servers/%(uuid)s"/>
+  <atom:link
+      rel="bookmark"
+      href="%(host)s/openstack/servers/%(uuid)s"/>
+</server>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl
new file mode 100644
index 000000000..273906a34
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.json.tpl
@@ -0,0 +1,18 @@
+{
+    "rebuild" : {
+        "imageRef" : "%(host)s/v2/32278/images/%(uuid)s",
+        "name" : "%(name)s",
+        "adminPass" : "%(pass)s",
+        "accessIPv4" : "%(ip)s",
+        "accessIPv6" : "%(ip6)s",
+        "metadata" : {
+            "meta var" : "meta val"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
+    }
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl
new file mode 100644
index 000000000..84f0b9896
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild.xml.tpl
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<rebuild 
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    name="%(name)s"
+    imageRef="%(host)s/v1.1/32278/images/%(uuid)s"
+    accessIPv4="%(ip)s"
+    accessIPv6="%(ip6)s"
+    adminPass="%(pass)s">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</rebuild>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-resize.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-resize.json.tpl
new file mode 100644
index 000000000..468a88da2
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-resize.json.tpl
@@ -0,0 +1,5 @@
+{
+    "resize" : {
+        "flavorRef" : "%(id)s"
+    }
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-resize.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-resize.xml.tpl
new file mode 100644
index 000000000..cbe49ea59
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-resize.xml.tpl
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resize
+    xmlns="http://docs.openstack.org/compute/api/v1.1"
+    flavorRef="%(id)s"/>
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl
new file mode 100644
index 000000000..2ddf6e5ab
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.json.tpl
@@ -0,0 +1,3 @@
+{
+    "revertResize" : null
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl
new file mode 100644
index 000000000..5c13bbdc0
--- /dev/null
+++ b/nova/tests/integrated/api_samples/all_extensions/server-action-revertresize.xml.tpl
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<revertResize
+    xmlns="http://docs.openstack.org/compute/api/v1.1"/>
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index c9d0fddd7..60ea9009c 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -573,6 +573,14 @@ class ServersActionsXmlTest(ServersActionsJsonTest):
     ctype = 'xml'
 
 
+class ServersActionsAllJsonTest(ServersActionsJsonTest):
+    all_extensions = True
+
+
+class ServersActionsAllXmlTest(ServersActionsXmlTest):
+    all_extensions = True
+
+
 class ServerStartStopJsonTest(ServersSampleBase):
     extension_name = "nova.api.openstack.compute.contrib" + \
         ".server_start_stop.Server_start_stop"