Merge "Adds V3 API samples for remote consoles, deferred delete"

1 files changed, 47 insertions, 0 deletions

diff --git a/nova/tests/integrated/v3/test_deferred_delete.py b/nova/tests/integrated/v3/test_deferred_delete.py
new file mode 100644
index 0000000000..39ff0cfcf2
--- /dev/null
+++ b/nova/tests/integrated/v3/test_deferred_delete.py
@@ -0,0 +1,47 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+# Copyright 2012 Nebula, Inc.
+# Copyright 2013 IBM Corp.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+from nova.tests.integrated.v3 import test_servers
+
+
+class DeferredDeleteSampleJsonTests(test_servers.ServersSampleBase):
+    extension_name = "os-deferred-delete"
+
+    def setUp(self):
+        super(DeferredDeleteSampleJsonTests, self).setUp()
+        self.flags(reclaim_instance_interval=1)
+
+    def test_restore(self):
+        uuid = self._post_server()
+        response = self._do_delete('servers/%s' % uuid)
+
+        response = self._do_post('servers/%s/action' % uuid,
+                                 'restore-post-req', {})
+        self.assertEqual(response.status, 202)
+        self.assertEqual(response.read(), '')
+
+    def test_force_delete(self):
+        uuid = self._post_server()
+        response = self._do_delete('servers/%s' % uuid)
+
+        response = self._do_post('servers/%s/action' % uuid,
+                                 'force-delete-post-req', {})
+        self.assertEqual(response.status, 202)
+        self.assertEqual(response.read(), '')
+
+
+class DeferredDeleteSampleXmlTests(DeferredDeleteSampleJsonTests):
+        ctype = 'xml'