diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-04 01:50:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-04 01:50:33 +0000 |
| commit | 7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2 (patch) | |
| tree | d1b34b646f95d8378760cff6cc642d247251b8fc | |
| parent | dae70c8f446aa04d76051716a0730a5a520fc463 (diff) | |
| parent | b957a3553e9274043e6ad55a92ceb91c22ca2265 (diff) | |
| download | nova-7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2.tar.gz nova-7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2.tar.xz nova-7c4584e6f50bc9d2a3c97c8767a6a2b584098ff2.zip | |
Merge "Add API samples to images api"
57 files changed, 2198 insertions, 3 deletions
diff --git a/nova/api/openstack/compute/image_metadata.py b/nova/api/openstack/compute/image_metadata.py index 516b25d88..4273e40cd 100644 --- a/nova/api/openstack/compute/image_metadata.py +++ b/nova/api/openstack/compute/image_metadata.py @@ -66,7 +66,7 @@ class Controller(object): image['properties'][key] = value common.check_img_metadata_properties_quota(context, image['properties']) - self.image_service.update(context, image_id, image, None) + image = self.image_service.update(context, image_id, image, None) return dict(metadata=image['properties']) @wsgi.serializers(xml=common.MetaItemTemplate) diff --git a/nova/api/openstack/compute/views/images.py b/nova/api/openstack/compute/views/images.py index 5d16ac1de..c0ea71385 100644 --- a/nova/api/openstack/compute/views/images.py +++ b/nova/api/openstack/compute/views/images.py @@ -120,7 +120,7 @@ class ViewBuilder(common.ViewBuilder): }] def _get_alternate_link(self, request, identifier): - """Create an alternate link for a specific flavor id.""" + """Create an alternate link for a specific image id.""" glance_url = utils.generate_glance_url() glance_url = self._update_link_prefix(glance_url, FLAGS.osapi_glance_link_prefix) diff --git a/nova/tests/integrated/api_samples/image-get-resp.json b/nova/tests/integrated/api_samples/image-get-resp.json new file mode 100644 index 000000000..da419650d --- /dev/null +++ b/nova/tests/integrated/api_samples/image-get-resp.json @@ -0,0 +1,33 @@ +{ + "image": { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-get-resp.json.tpl b/nova/tests/integrated/api_samples/image-get-resp.json.tpl new file mode 100644 index 000000000..fdfb5d5da --- /dev/null +++ b/nova/tests/integrated/api_samples/image-get-resp.json.tpl @@ -0,0 +1,33 @@ +{ + "image": { + "created": "2011-01-01T01:02:03Z", + "id": "%(image_id)s", + "links": [ + { + "href": "%(host)s/v2/openstack/images/%(image_id)s", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/%(image_id)s", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/%(image_id)s", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "%(timestamp)s" + } +} diff --git a/nova/tests/integrated/api_samples/image-get-resp.xml b/nova/tests/integrated/api_samples/image-get-resp.xml new file mode 100644 index 000000000..77fa67bb1 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-get-resp.xml @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<image xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> +</image>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-get-resp.xml.tpl b/nova/tests/integrated/api_samples/image-get-resp.xml.tpl new file mode 100644 index 000000000..7e5bd4d0e --- /dev/null +++ b/nova/tests/integrated/api_samples/image-get-resp.xml.tpl @@ -0,0 +1,12 @@ +<?xml version='1.0' encoding='UTF-8'?> +<image xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(image_id)s"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/%(image_id)s" rel="self"/> + <atom:link href="%(host)s/openstack/images/%(image_id)s" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/%(image_id)s" type="application/vnd.openstack.image" rel="alternate"/> +</image> diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.json b/nova/tests/integrated/api_samples/image-meta-key-get.json new file mode 100644 index 000000000..6d022eb97 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-get.json @@ -0,0 +1,5 @@ +{ + "meta": { + "kernel_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.json.tpl b/nova/tests/integrated/api_samples/image-meta-key-get.json.tpl new file mode 100644 index 000000000..6d022eb97 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-get.json.tpl @@ -0,0 +1,5 @@ +{ + "meta": { + "kernel_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.xml b/nova/tests/integrated/api_samples/image-meta-key-get.xml new file mode 100644 index 000000000..1de6b4078 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-get.xml @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="kernel_id">nokernel</meta>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-get.xml.tpl b/nova/tests/integrated/api_samples/image-meta-key-get.xml.tpl new file mode 100644 index 000000000..1de6b4078 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-get.xml.tpl @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="kernel_id">nokernel</meta>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.json b/nova/tests/integrated/api_samples/image-meta-key-put-req.json new file mode 100644 index 000000000..8dec6767d --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-req.json @@ -0,0 +1,5 @@ +{ + "meta" : { + "auto_disk_config" : "False" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.json.tpl b/nova/tests/integrated/api_samples/image-meta-key-put-req.json.tpl new file mode 100644 index 000000000..7d8ab69a5 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-req.json.tpl @@ -0,0 +1,5 @@ +{ + "meta" : { + "auto_disk_config" : "False" + } +} diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.xml b/nova/tests/integrated/api_samples/image-meta-key-put-req.xml new file mode 100644 index 000000000..23a6f4718 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-req.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<meta + xmlns="http://docs.openstack.org/compute/api/v1.1" + key="auto_disk_config">False</meta>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-req.xml.tpl b/nova/tests/integrated/api_samples/image-meta-key-put-req.xml.tpl new file mode 100644 index 000000000..319e075ee --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-req.xml.tpl @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="UTF-8"?> +<meta + xmlns="http://docs.openstack.org/compute/api/v1.1" + key="auto_disk_config">False</meta> diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.json b/nova/tests/integrated/api_samples/image-meta-key-put-resp.json new file mode 100644 index 000000000..3db563ec1 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-resp.json @@ -0,0 +1,5 @@ +{ + "meta": { + "auto_disk_config": "False" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.json.tpl b/nova/tests/integrated/api_samples/image-meta-key-put-resp.json.tpl new file mode 100644 index 000000000..3db563ec1 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-resp.json.tpl @@ -0,0 +1,5 @@ +{ + "meta": { + "auto_disk_config": "False" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml b/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml new file mode 100644 index 000000000..c989c38a2 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="auto_disk_config">False</meta>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml.tpl b/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml.tpl new file mode 100644 index 000000000..c989c38a2 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-meta-key-put-resp.xml.tpl @@ -0,0 +1,2 @@ +<?xml version='1.0' encoding='UTF-8'?> +<meta xmlns="http://docs.openstack.org/compute/api/v1.1" key="auto_disk_config">False</meta>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.json b/nova/tests/integrated/api_samples/image-metadata-get-resp.json new file mode 100644 index 000000000..588f688d5 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-get-resp.json @@ -0,0 +1,8 @@ +{ + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.json.tpl b/nova/tests/integrated/api_samples/image-metadata-get-resp.json.tpl new file mode 100644 index 000000000..588f688d5 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-get-resp.json.tpl @@ -0,0 +1,8 @@ +{ + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.xml b/nova/tests/integrated/api_samples/image-metadata-get-resp.xml new file mode 100644 index 000000000..8409016bf --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-get-resp.xml @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='UTF-8'?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-get-resp.xml.tpl b/nova/tests/integrated/api_samples/image-metadata-get-resp.xml.tpl new file mode 100644 index 000000000..8409016bf --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-get-resp.xml.tpl @@ -0,0 +1,7 @@ +<?xml version='1.0' encoding='UTF-8'?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.json b/nova/tests/integrated/api_samples/image-metadata-post-req.json new file mode 100644 index 000000000..8447c3dec --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-req.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "False", + "Label": "UpdatedImage" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.json.tpl b/nova/tests/integrated/api_samples/image-metadata-post-req.json.tpl new file mode 100644 index 000000000..b51e5f00f --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-req.json.tpl @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "False", + "Label": "UpdatedImage" + } +} diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.xml b/nova/tests/integrated/api_samples/image-metadata-post-req.xml new file mode 100644 index 000000000..db1b74572 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-req.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="kernel_id">False</meta> + <meta key="Label">UpdatedImage</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-post-req.xml.tpl b/nova/tests/integrated/api_samples/image-metadata-post-req.xml.tpl new file mode 100644 index 000000000..6170aab5a --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-req.xml.tpl @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="kernel_id">False</meta> + <meta key="Label">UpdatedImage</meta> +</metadata> diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.json b/nova/tests/integrated/api_samples/image-metadata-post-resp.json new file mode 100644 index 000000000..9479bb339 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-resp.json @@ -0,0 +1,9 @@ +{ + "metadata": { + "Label": "UpdatedImage", + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "False", + "ramdisk_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.json.tpl b/nova/tests/integrated/api_samples/image-metadata-post-resp.json.tpl new file mode 100644 index 000000000..9479bb339 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-resp.json.tpl @@ -0,0 +1,9 @@ +{ + "metadata": { + "Label": "UpdatedImage", + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "False", + "ramdisk_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.xml b/nova/tests/integrated/api_samples/image-metadata-post-resp.xml new file mode 100644 index 000000000..1d96bd9af --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-resp.xml @@ -0,0 +1,8 @@ +<?xml version='1.0' encoding='UTF-8'?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="kernel_id">False</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="Label">UpdatedImage</meta> + <meta key="architecture">x86_64</meta> + <meta key="auto_disk_config">True</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-post-resp.xml.tpl b/nova/tests/integrated/api_samples/image-metadata-post-resp.xml.tpl new file mode 100644 index 000000000..1d96bd9af --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-post-resp.xml.tpl @@ -0,0 +1,8 @@ +<?xml version='1.0' encoding='UTF-8'?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="kernel_id">False</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="Label">UpdatedImage</meta> + <meta key="architecture">x86_64</meta> + <meta key="auto_disk_config">True</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.json b/nova/tests/integrated/api_samples/image-metadata-put-req.json new file mode 100644 index 000000000..36fbc003d --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-req.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "auto_disk_config": "True", + "Label": "Changed" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.json.tpl b/nova/tests/integrated/api_samples/image-metadata-put-req.json.tpl new file mode 100644 index 000000000..eec6152d7 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-req.json.tpl @@ -0,0 +1,6 @@ +{ + "metadata": { + "auto_disk_config": "True", + "Label": "Changed" + } +} diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.xml b/nova/tests/integrated/api_samples/image-metadata-put-req.xml new file mode 100644 index 000000000..454d9294f --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-req.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="auto_disk_config">True</meta> + <meta key="Label">Changed</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-put-req.xml.tpl b/nova/tests/integrated/api_samples/image-metadata-put-req.xml.tpl new file mode 100644 index 000000000..e5f5d8991 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-req.xml.tpl @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="auto_disk_config">True</meta> + <meta key="Label">Changed</meta> +</metadata> diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.json b/nova/tests/integrated/api_samples/image-metadata-put-resp.json new file mode 100644 index 000000000..c8c5ee9c4 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-resp.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "Label": "Changed", + "auto_disk_config": "True" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.json.tpl b/nova/tests/integrated/api_samples/image-metadata-put-resp.json.tpl new file mode 100644 index 000000000..c8c5ee9c4 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-resp.json.tpl @@ -0,0 +1,6 @@ +{ + "metadata": { + "Label": "Changed", + "auto_disk_config": "True" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.xml b/nova/tests/integrated/api_samples/image-metadata-put-resp.xml new file mode 100644 index 000000000..7011871cc --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-resp.xml @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='UTF-8'?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="auto_disk_config">True</meta> + <meta key="Label">Changed</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-put-resp.xml.tpl b/nova/tests/integrated/api_samples/image-metadata-put-resp.xml.tpl new file mode 100644 index 000000000..7011871cc --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-put-resp.xml.tpl @@ -0,0 +1,5 @@ +<?xml version='1.0' encoding='UTF-8'?> +<metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> + <meta key="auto_disk_config">True</meta> + <meta key="Label">Changed</meta> +</metadata>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-resp.json b/nova/tests/integrated/api_samples/image-metadata-resp.json new file mode 100644 index 000000000..657f0b197 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-resp.json @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/image-metadata-resp.json.tpl b/nova/tests/integrated/api_samples/image-metadata-resp.json.tpl new file mode 100644 index 000000000..657f0b197 --- /dev/null +++ b/nova/tests/integrated/api_samples/image-metadata-resp.json.tpl @@ -0,0 +1,6 @@ +{ + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + } +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.json b/nova/tests/integrated/api_samples/images-details-get-resp.json new file mode 100644 index 000000000..44a0e1d77 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-get-resp.json @@ -0,0 +1,212 @@ +{ + "images": [ + { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "False", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage6", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "ramdisk_id": null + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } + ] +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl b/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl new file mode 100644 index 000000000..5cd76d6c6 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-get-resp.json.tpl @@ -0,0 +1,212 @@ +{ + "images": [ + { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "False", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage6", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "ramdisk_id": null + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } + ] +} diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.xml b/nova/tests/integrated/api_samples/images-details-get-resp.xml new file mode 100644 index 000000000..654251a33 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-get-resp.xml @@ -0,0 +1,71 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">False</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <metadata> + <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta> + <meta key="ramdisk_id">None</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl b/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl new file mode 100644 index 000000000..aa1d973b9 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-get-resp.xml.tpl @@ -0,0 +1,71 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">False</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <metadata> + <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta> + <meta key="ramdisk_id">None</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images> diff --git a/nova/tests/integrated/api_samples/images-details-resp.json b/nova/tests/integrated/api_samples/images-details-resp.json new file mode 100644 index 000000000..44a0e1d77 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-resp.json @@ -0,0 +1,212 @@ +{ + "images": [ + { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "False", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage6", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "ramdisk_id": null + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } + ] +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-details-resp.json.tpl b/nova/tests/integrated/api_samples/images-details-resp.json.tpl new file mode 100644 index 000000000..5cd76d6c6 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-resp.json.tpl @@ -0,0 +1,212 @@ +{ + "images": [ + { + "created": "2011-01-01T01:02:03Z", + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "True", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage7", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "architecture": "x86_64", + "auto_disk_config": "False", + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage6", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "ramdisk_id": null + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + }, + { + "created": "2011-01-01T01:02:03Z", + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "metadata": { + "kernel_id": "nokernel", + "ramdisk_id": "nokernel" + }, + "minDisk": 0, + "minRam": 0, + "name": "fakeimage123456", + "progress": 100, + "status": "ACTIVE", + "updated": "2011-01-01T01:02:03Z" + } + ] +} diff --git a/nova/tests/integrated/api_samples/images-details-resp.xml b/nova/tests/integrated/api_samples/images-details-resp.xml new file mode 100644 index 000000000..654251a33 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-resp.xml @@ -0,0 +1,71 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">False</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <metadata> + <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta> + <meta key="ramdisk_id">None</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-details-resp.xml.tpl b/nova/tests/integrated/api_samples/images-details-resp.xml.tpl new file mode 100644 index 000000000..aa1d973b9 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-details-resp.xml.tpl @@ -0,0 +1,71 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">True</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="auto_disk_config">False</meta> + <meta key="ramdisk_id">nokernel</meta> + <meta key="architecture">x86_64</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <metadata> + <meta key="kernel_id">155d900f-4e14-4e4c-a73d-069cbf4541e6</meta> + <meta key="ramdisk_id">None</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="cedef40a-ed67-4d10-800e-17455edce175"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <metadata> + <meta key="kernel_id">nokernel</meta> + <meta key="ramdisk_id">nokernel</meta> + </metadata> + <atom:link href="%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images> diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.json b/nova/tests/integrated/api_samples/images-list-get-resp.json new file mode 100644 index 000000000..eb14ed3c7 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-get-resp.json @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage7" + }, + { + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage6" + }, + { + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl b/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl new file mode 100644 index 000000000..6ed161677 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-get-resp.json.tpl @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage7" + }, + { + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage6" + }, + { + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +} diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.xml b/nova/tests/integrated/api_samples/images-list-get-resp.xml new file mode 100644 index 000000000..0674afb09 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-get-resp.xml @@ -0,0 +1,38 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175"> + <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl b/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl new file mode 100644 index 000000000..701e95892 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-get-resp.xml.tpl @@ -0,0 +1,38 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <atom:link href="%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <atom:link href="%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <atom:link href="%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <atom:link href="%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <atom:link href="%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175"> + <atom:link href="%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <atom:link href="%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images> diff --git a/nova/tests/integrated/api_samples/images-list-resp.json b/nova/tests/integrated/api_samples/images-list-resp.json new file mode 100644 index 000000000..eb14ed3c7 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-resp.json @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage7" + }, + { + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage6" + }, + { + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +}
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-list-resp.json.tpl b/nova/tests/integrated/api_samples/images-list-resp.json.tpl new file mode 100644 index 000000000..6ed161677 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-resp.json.tpl @@ -0,0 +1,137 @@ +{ + "images": [ + { + "id": "70a599e0-31e7-49b7-b260-868f441e862b", + "links": [ + { + "href": "%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage7" + }, + { + "id": "155d900f-4e14-4e4c-a73d-069cbf4541e6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a2459075-d96c-40d5-893e-577ff92e721c", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "a440c04b-79fa-479c-bed1-0b816eaec379", + "links": [ + { + "href": "%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage6" + }, + { + "id": "c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "links": [ + { + "href": "%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "cedef40a-ed67-4d10-800e-17455edce175", + "links": [ + { + "href": "%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + }, + { + "id": "76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "links": [ + { + "href": "%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "self" + }, + { + "href": "%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "bookmark" + }, + { + "href": "%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6", + "rel": "alternate", + "type": "application/vnd.openstack.image" + } + ], + "name": "fakeimage123456" + } + ] +} diff --git a/nova/tests/integrated/api_samples/images-list-resp.xml b/nova/tests/integrated/api_samples/images-list-resp.xml new file mode 100644 index 000000000..0674afb09 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-resp.xml @@ -0,0 +1,38 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <atom:link href="http://openstack.example.com/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <atom:link href="http://openstack.example.com/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <atom:link href="http://openstack.example.com/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <atom:link href="http://openstack.example.com/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <atom:link href="http://openstack.example.com/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175"> + <atom:link href="http://openstack.example.com/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <atom:link href="http://openstack.example.com/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="http://openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="http://glance.openstack.example.com/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images>
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/images-list-resp.xml.tpl b/nova/tests/integrated/api_samples/images-list-resp.xml.tpl new file mode 100644 index 000000000..701e95892 --- /dev/null +++ b/nova/tests/integrated/api_samples/images-list-resp.xml.tpl @@ -0,0 +1,38 @@ +<?xml version='1.0' encoding='UTF-8'?> +<images xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> + <image name="fakeimage7" id="70a599e0-31e7-49b7-b260-868f441e862b"> + <atom:link href="%(host)s/v2/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="self"/> + <atom:link href="%(host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="155d900f-4e14-4e4c-a73d-069cbf4541e6"> + <atom:link href="%(host)s/v2/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="self"/> + <atom:link href="%(host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/155d900f-4e14-4e4c-a73d-069cbf4541e6" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="a2459075-d96c-40d5-893e-577ff92e721c"> + <atom:link href="%(host)s/v2/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="self"/> + <atom:link href="%(host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a2459075-d96c-40d5-893e-577ff92e721c" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage6" id="a440c04b-79fa-479c-bed1-0b816eaec379"> + <atom:link href="%(host)s/v2/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="self"/> + <atom:link href="%(host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/a440c04b-79fa-479c-bed1-0b816eaec379" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="c905cedb-7281-47e4-8a62-f26bc5fc4c77"> + <atom:link href="%(host)s/v2/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="self"/> + <atom:link href="%(host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/c905cedb-7281-47e4-8a62-f26bc5fc4c77" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="cedef40a-ed67-4d10-800e-17455edce175"> + <atom:link href="%(host)s/v2/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="self"/> + <atom:link href="%(host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/cedef40a-ed67-4d10-800e-17455edce175" type="application/vnd.openstack.image" rel="alternate"/> + </image> + <image name="fakeimage123456" id="76fa36fc-c930-4bf3-8c8a-ea2a2420deb6"> + <atom:link href="%(host)s/v2/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="self"/> + <atom:link href="%(host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" rel="bookmark"/> + <atom:link href="%(glance_host)s/openstack/images/76fa36fc-c930-4bf3-8c8a-ea2a2420deb6" type="application/vnd.openstack.image" rel="alternate"/> + </image> +</images> diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py index 6aac58e88..08a602867 100644 --- a/nova/tests/integrated/test_api_samples.py +++ b/nova/tests/integrated/test_api_samples.py @@ -41,7 +41,8 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): def setUp(self): self.flags(use_ipv6=False, - osapi_compute_link_prefix=self._get_host()) + osapi_compute_link_prefix=self._get_host(), + osapi_glance_link_prefix=self._get_glance_host()) if not self.all_extensions: ext = [self.extension_name] if self.extension_name else [] self.flags(osapi_compute_extension=ext) @@ -61,6 +62,8 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): return '\n'.join(line.rstrip() for line in data.split('\n')).strip() def _objectify(self, data): + if not data: + return {} if self.ctype == 'json': return jsonutils.loads(data) else: @@ -158,6 +161,9 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): def _get_host(self): return 'http://openstack.example.com' + def _get_glance_host(self): + return 'http://glance.openstack.example.com' + def _get_regexes(self): if self.ctype == 'json': text = r'(\\"|[^"])*' @@ -174,6 +180,7 @@ class ApiSampleTestBase(integrated_helpers._IntegratedTestBase): 'uuid': '[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}' '-[0-9a-f]{4}-[0-9a-f]{12}', 'host': self._get_host(), + 'glance_host': self._get_glance_host(), 'compute_host': self.compute.host, 'text': text, } @@ -276,3 +283,79 @@ class FlavorsSampleAllExtensionJsonTest(FlavorsSampleJsonTest): class FlavorsSampleAllExtensionXmlTest(FlavorsSampleXmlTest): all_extensions = True + + +class ImagesSampleJsonTest(ApiSampleTestBase): + def test_images_list(self): + """Get api sample of images get list request""" + response = self._do_get('images') + subs = self._get_regexes() + return self._verify_response('images-list-get-resp', subs, response) + + def test_image_get(self): + """Get api sample of one single image details request""" + image_id = fake.get_valid_image_id() + response = self._do_get('images/%s' % image_id) + self.assertEqual(response.status, 200) + subs = self._get_regexes() + subs['image_id'] = image_id + return self._verify_response('image-get-resp', subs, response) + + def test_images_details(self): + """Get api sample of all images details request""" + response = self._do_get('images/detail') + subs = self._get_regexes() + return self._verify_response('images-details-get-resp', subs, response) + + def test_image_metadata_get(self): + """Get api sample of a image metadata request""" + image_id = fake.get_valid_image_id() + response = self._do_get('images/%s/metadata' % image_id) + subs = self._get_regexes() + subs['image_id'] = image_id + return self._verify_response('image-metadata-get-resp', subs, response) + + def test_image_metadata_post(self): + """Get api sample to update metadata of an image metadata request""" + image_id = fake.get_valid_image_id() + response = self._do_post( + 'images/%s/metadata' % image_id, + 'image-metadata-post-req', {}) + self.assertEqual(response.status, 200) + subs = self._get_regexes() + return self._verify_response('image-metadata-post-resp', + subs, response) + + def test_image_metadata_put(self): + """Get api sample of image metadata put request""" + image_id = fake.get_valid_image_id() + response = self._do_put('images/%s/metadata' % image_id, + 'image-metadata-put-req', {}) + self.assertEqual(response.status, 200) + subs = self._get_regexes() + return self._verify_response('image-metadata-put-resp', + subs, response) + + def test_image_meta_key_get(self): + """Get api sample of a image metadata key request""" + image_id = fake.get_valid_image_id() + key = "kernel_id" + response = self._do_get('images/%s/metadata/%s' % (image_id, key)) + subs = self._get_regexes() + return self._verify_response('image-meta-key-get', subs, response) + + def test_image_meta_key_put(self): + """Get api sample of image metadata key put request""" + image_id = fake.get_valid_image_id() + key = "auto_disk_config" + response = self._do_put('images/%s/metadata/%s' % (image_id, key), + 'image-meta-key-put-req', {}) + self.assertEqual(response.status, 200) + subs = self._get_regexes() + return self._verify_response('image-meta-key-put-resp', + subs, + response) + + +class ImagesSampleXmlTest(ImagesSampleJsonTest): + ctype = 'xml' |