From 25325153ae0172082369ea03dfbeddc4c35e473b Mon Sep 17 00:00:00 2001 From: Yolanda Robla 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 --- .../force-delete-post-req.json.tpl | 3 +++ .../force-delete-post-req.xml.tpl | 2 ++ .../os-deferred-delete/restore-post-req.json.tpl | 3 +++ .../os-deferred-delete/restore-post-req.xml.tpl | 2 ++ .../os-deferred-delete/server-post-req.json.tpl | 16 +++++++++++ .../os-deferred-delete/server-post-req.xml.tpl | 19 +++++++++++++ .../os-deferred-delete/server-post-resp.json.tpl | 16 +++++++++++ .../os-deferred-delete/server-post-resp.xml.tpl | 6 +++++ nova/tests/integrated/test_api_samples.py | 31 ++++++++++++++++++++++ 9 files changed, 98 insertions(+) create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl (limited to 'nova') diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl new file mode 100644 index 000000000..d3562d390 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.json.tpl @@ -0,0 +1,3 @@ +{ + "forceDelete": null +} diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl new file mode 100644 index 000000000..31928207e --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/force-delete-post-req.xml.tpl @@ -0,0 +1,2 @@ + + diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl new file mode 100644 index 000000000..d38291fe0 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.json.tpl @@ -0,0 +1,3 @@ +{ + "restore": null +} diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl new file mode 100644 index 000000000..8a95b4fcc --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/restore-post-req.xml.tpl @@ -0,0 +1,2 @@ + + diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl new file mode 100644 index 000000000..d3916d1aa --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.json.tpl @@ -0,0 +1,16 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "%(host)s/openstack/images/%(image_id)s", + "flavorRef" : "%(host)s/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl new file mode 100644 index 000000000..f92614984 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-req.xml.tpl @@ -0,0 +1,19 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl new file mode 100644 index 000000000..d5f030c87 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.json.tpl @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "%(password)s", + "id": "%(id)s", + "links": [ + { + "href": "%(host)s/v2/openstack/servers/%(uuid)s", + "rel": "self" + }, + { + "href": "%(host)s/openstack/servers/%(uuid)s", + "rel": "bookmark" + } + ] + } +} diff --git a/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl new file mode 100644 index 000000000..3bb13e69b --- /dev/null +++ b/nova/tests/integrated/api_samples/os-deferred-delete/server-post-resp.xml.tpl @@ -0,0 +1,6 @@ + + + + + + diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 841faeb00..2f64c8ee4 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -1662,3 +1662,34 @@ class ConsolesSampleJsonTests(ServersSampleBase): class ConsoleOutputSampleXmlTests(ConsoleOutputSampleJsonTest): ctype = 'xml' + + +class DeferredDeleteSampleJsonTests(ServersSampleBase): + extension_name = ("nova.api.openstack.compute.contrib" + ".deferred_delete.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' -- cgit