From 50a4a771caabf392cd63988d026e8e60e6875c38 Mon Sep 17 00:00:00 2001 From: Charles Neill Date: Wed, 14 Sep 2016 19:22:45 -0500 Subject: [PATCH] Glance template tweaks Use a random UUID in the post_image template so that we don't always have conflicts/409s on image creation. Use a real image ID for query string filtering using the "marker" param Change-Id: Ie509747dc62ef082fdfe14b747f55c77da50390e --- .../templates/glance/get_images_all_full_querystring.template | 2 +- examples/templates/glance/post_image.template | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/templates/glance/get_images_all_full_querystring.template b/examples/templates/glance/get_images_all_full_querystring.template index 6cf4b6e2..a5eb06cb 100644 --- a/examples/templates/glance/get_images_all_full_querystring.template +++ b/examples/templates/glance/get_images_all_full_querystring.template @@ -1,3 +1,3 @@ -GET /v2/images?limit=9999&marker=3349cf08-a20f-42de-a605-340059523b71&name=testing&owner=testing&status=in:queued,saving,active,killed,deleted,pending_delete,deactivated&tag=testing&visibility=public&member_status=accepted&size_min=0&size_max=999999&created_at=gt:2014-04-18T21:38:54Z&updated_at=gt:2014-04-18T21:38:54Z&sort_dir=desc&sort_key=name HTTP/1.1 +GET /v2/images?limit=9999&marker=CALL_EXTERNAL|syntribos.extensions.glance.client:get_image_id:[]|&name=testing&owner=testing&status=in:queued,saving,active,killed,deleted,pending_delete,deactivated&tag=testing&visibility=public&member_status=accepted&size_min=0&size_max=999999&created_at=gt:2014-04-18T21:38:54Z&updated_at=gt:2014-04-18T21:38:54Z&sort_dir=desc&sort_key=name HTTP/1.1 Accept: application/json X-Auth-Token: CALL_EXTERNAL|syntribos.extensions.identity.client:get_scoped_token_v3:["user"]| diff --git a/examples/templates/glance/post_image.template b/examples/templates/glance/post_image.template index 169197ad..59f4c32c 100644 --- a/examples/templates/glance/post_image.template +++ b/examples/templates/glance/post_image.template @@ -7,8 +7,8 @@ X-Auth-Token: CALL_EXTERNAL|syntribos.extensions.identity.client:get_scoped_toke "container_format": "bare", "disk_format": "raw", "name": "Ubuntu", - "id": "3349cf08-a20f-42de-a605-340059523b71", + "id": "CALL_EXTERNAL|syntribos.extensions.random_data.client:get_uuid:[]|", "protected": false, "tags": ["testing"], - "visibility": "public" + "visibility": "private" }