From 25325153ae0172082369ea03dfbeddc4c35e473b Mon Sep 17 00:00:00 2001
From: Yolanda Robla <yolanda.robla@canonical.com>
Date: Thu, 22 Nov 2012 09:22:34 +0000
Subject: Added sample tests to deferred delete API.

Partially implements blueprint nova-api-samples
Fixes bug 1070157

Change-Id: Icd6c743b842a7986bbc0a21c5dc62fbceda488bf
---
 .../os-deferred-delete/force-delete-post-req.json     |  3 +++
 .../os-deferred-delete/force-delete-post-req.xml      |  2 ++
 .../os-deferred-delete/restore-post-req.json          |  3 +++
 .../os-deferred-delete/restore-post-req.xml           |  2 ++
 .../os-deferred-delete/server-post-req.json           | 16 ++++++++++++++++
 .../os-deferred-delete/server-post-req.xml            | 19 +++++++++++++++++++
 .../os-deferred-delete/server-post-resp.json          | 16 ++++++++++++++++
 .../os-deferred-delete/server-post-resp.xml           |  6 ++++++
 8 files changed, 67 insertions(+)
 create mode 100644 doc/api_samples/os-deferred-delete/force-delete-post-req.json
 create mode 100644 doc/api_samples/os-deferred-delete/force-delete-post-req.xml
 create mode 100644 doc/api_samples/os-deferred-delete/restore-post-req.json
 create mode 100644 doc/api_samples/os-deferred-delete/restore-post-req.xml
 create mode 100644 doc/api_samples/os-deferred-delete/server-post-req.json
 create mode 100644 doc/api_samples/os-deferred-delete/server-post-req.xml
 create mode 100644 doc/api_samples/os-deferred-delete/server-post-resp.json
 create mode 100644 doc/api_samples/os-deferred-delete/server-post-resp.xml

(limited to 'doc')

diff --git a/doc/api_samples/os-deferred-delete/force-delete-post-req.json b/doc/api_samples/os-deferred-delete/force-delete-post-req.json
new file mode 100644
index 000000000..3f1abb676
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/force-delete-post-req.json
@@ -0,0 +1,3 @@
+{
+    "forceDelete": null
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/force-delete-post-req.xml b/doc/api_samples/os-deferred-delete/force-delete-post-req.xml
new file mode 100644
index 000000000..ab3477c9c
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/force-delete-post-req.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<forceDelete />
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/restore-post-req.json b/doc/api_samples/os-deferred-delete/restore-post-req.json
new file mode 100644
index 000000000..0e526ff64
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/restore-post-req.json
@@ -0,0 +1,3 @@
+{
+    "restore": null
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/restore-post-req.xml b/doc/api_samples/os-deferred-delete/restore-post-req.xml
new file mode 100644
index 000000000..a43bef2f5
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/restore-post-req.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<restore />
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/server-post-req.json b/doc/api_samples/os-deferred-delete/server-post-req.json
new file mode 100644
index 000000000..d88eb4122
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/server-post-req.json
@@ -0,0 +1,16 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "metadata" : {
+            "My Server Name" : "Apache1"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/server-post-req.xml b/doc/api_samples/os-deferred-delete/server-post-req.xml
new file mode 100644
index 000000000..0a3c8bb53
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/server-post-req.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+  <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>
+</server>
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/server-post-resp.json b/doc/api_samples/os-deferred-delete/server-post-resp.json
new file mode 100644
index 000000000..a81b795e1
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "adminPass": "jDje6SdBHGfQ",
+        "id": "e08e6d34-fcc1-480e-b11e-24a675b479f8",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/e08e6d34-fcc1-480e-b11e-24a675b479f8",
+                "rel": "bookmark"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/os-deferred-delete/server-post-resp.xml b/doc/api_samples/os-deferred-delete/server-post-resp.xml
new file mode 100644
index 000000000..1562cf716
--- /dev/null
+++ b/doc/api_samples/os-deferred-delete/server-post-resp.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="43008037-cd16-436e-948d-e084d17c37eb" adminPass="eDu5JojvmLQC">
+  <metadata/>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/43008037-cd16-436e-948d-e084d17c37eb" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/43008037-cd16-436e-948d-e084d17c37eb" rel="bookmark"/>
+</server>
\ No newline at end of file
-- 
cgit