From 7fbe9ad5979c202bc4c8e57ba02b343b5c4947bf Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Tue, 2 Oct 2012 13:15:35 -0400 Subject: Add availability zone extension to API samples test. Change-Id: I43e64d6637ef850119475c5d470cc54e7168c388 Signed-off-by: Matthew Treinish --- .../availability-zone-post-req.json | 17 ++++++++++++++++ .../availability-zone-post-req.xml | 23 ++++++++++++++++++++++ .../availability-zone-post-resp.json | 16 +++++++++++++++ .../availability-zone-post-resp.xml | 6 ++++++ .../availability-zone-post-req.json.tpl | 17 ++++++++++++++++ .../availability-zone-post-req.xml.tpl | 23 ++++++++++++++++++++++ .../availability-zone-post-resp.json.tpl | 16 +++++++++++++++ .../availability-zone-post-resp.xml.tpl | 8 ++++++++ nova/tests/integrated/test_api_samples.py | 21 ++++++++++++++++++++ 9 files changed, 147 insertions(+) create mode 100644 doc/api_samples/os-availability-zone/availability-zone-post-req.json create mode 100644 doc/api_samples/os-availability-zone/availability-zone-post-req.xml create mode 100644 doc/api_samples/os-availability-zone/availability-zone-post-resp.json create mode 100644 doc/api_samples/os-availability-zone/availability-zone-post-resp.xml create mode 100644 nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl create mode 100644 nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl create mode 100644 nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl create mode 100644 nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-req.json b/doc/api_samples/os-availability-zone/availability-zone-post-req.json new file mode 100644 index 000000000..67d50e2f2 --- /dev/null +++ b/doc/api_samples/os-availability-zone/availability-zone-post-req.json @@ -0,0 +1,17 @@ +{ + "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" + }, + "availability_zone": "nova", + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} \ No newline at end of file diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-req.xml b/doc/api_samples/os-availability-zone/availability-zone-post-req.xml new file mode 100644 index 000000000..cbecd3522 --- /dev/null +++ b/doc/api_samples/os-availability-zone/availability-zone-post-req.xml @@ -0,0 +1,23 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + \ No newline at end of file diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-resp.json b/doc/api_samples/os-availability-zone/availability-zone-post-resp.json new file mode 100644 index 000000000..4c713a793 --- /dev/null +++ b/doc/api_samples/os-availability-zone/availability-zone-post-resp.json @@ -0,0 +1,16 @@ +{ + "server": { + "adminPass": "k4pKvTfcA4gY", + "id": "3e45fa2a-5204-466f-a684-c2a8e1c82d7f", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/servers/3e45fa2a-5204-466f-a684-c2a8e1c82d7f", + "rel": "bookmark" + } + ] + } +} \ No newline at end of file diff --git a/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml b/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml new file mode 100644 index 000000000..e89bd74eb --- /dev/null +++ b/doc/api_samples/os-availability-zone/availability-zone-post-resp.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl new file mode 100644 index 000000000..f013ba079 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.json.tpl @@ -0,0 +1,17 @@ +{ + "server" : { + "name" : "new-server-test", + "imageRef" : "%(host)s/openstack/images/%(image_id)s", + "flavorRef" : "%(host)s/openstack/flavors/1", + "metadata" : { + "My Server Name" : "Apache1" + }, + "availability_zone": "%(availability_zone)s", + "personality" : [ + { + "path" : "/etc/banner.txt", + "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" + } + ] + } +} diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl new file mode 100644 index 000000000..9c55b49cb --- /dev/null +++ b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-req.xml.tpl @@ -0,0 +1,23 @@ + + + + Apache1 + + + + ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp + dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k + IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs + c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g + QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo + ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv + dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy + c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 + b25zLiINCg0KLVJpY2hhcmQgQmFjaA== + + + diff --git a/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.json.tpl new file mode 100644 index 000000000..d5f030c87 --- /dev/null +++ b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-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-availability-zone/availability-zone-post-resp.xml.tpl b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl new file mode 100644 index 000000000..2ad5c102b --- /dev/null +++ b/nova/tests/integrated/api_samples/os-availability-zone/availability-zone-post-resp.xml.tpl @@ -0,0 +1,8 @@ + + + + + + diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 792384ed6..f2ccbc22c 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -1286,3 +1286,24 @@ class ServerDiagnosticsSamplesJsonTest(ServersSampleBase): class ServerDiagnosticsSamplesXmlTest(ServerDiagnosticsSamplesJsonTest): ctype = "xml" + + +class AvailabilityZoneJsonTest(ServersSampleBase): + extension_name = ("nova.api.openstack.compute.contrib.availability_zone." + "Availability_zone") + + def test_create_availability_zone(self): + subs = { + 'image_id': fake.get_valid_image_id(), + 'host': self._get_host(), + "availability_zone": "nova" + } + response = self._do_post('servers', 'availability-zone-post-req', subs) + self.assertEqual(response.status, 202) + subs.update(self._get_regexes()) + return self._verify_response('availability-zone-post-resp', + subs, response) + + +class AvailabilityZoneXmlTest(AvailabilityZoneJsonTest): + ctype = 'xml' -- cgit