glance: image download should use the GET method

simon3z · simon3z · commit 1fbce985d62c · 2013-06-06T20:02:00.000+02:00
In order to properly download an image the http method HEAD has been
replaced with GET.

Signed-off-by: Federico Simoncelli &lt;fsimonce@redhat.com&gt;
diff --git a/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java b/glance-client/src/main/java/com/woorea/openstack/glance/ImagesResource.java
@@ -147,7 +147,7 @@ public Upload(ImageUpload imageUpload) {
 	public class Download extends OpenStackRequest<ImageDownload> {
 		
 		public Download(String id) {
-			super(CLIENT, HttpMethod.HEAD, new StringBuilder("/images/").append(id).toString(), null, ImageDownload.class);
+			super(CLIENT, HttpMethod.GET, new StringBuilder("/images/").append(id).toString(), null, ImageDownload.class);
 			header("Accept", "application/octet-stream");
 		}
 
diff --git a/openstack-examples/src/main/java/com/woorea/openstack/examples/glance/GlanceListImages.java b/openstack-examples/src/main/java/com/woorea/openstack/examples/glance/GlanceListImages.java
@@ -1,5 +1,6 @@
 package com.woorea.openstack.examples.glance;
 
+import com.woorea.openstack.glance.model.ImageDownload;
 import com.woorea.openstack.glance.model.ImageUpload;
 import com.woorea.openstack.keystone.utils.KeystoneTokenProvider;
 
@@ -12,6 +13,7 @@
 import com.woorea.openstack.keystone.model.Access.Service.Endpoint;
 
 import java.io.ByteArrayInputStream;
+import java.io.IOException;
 
 public class GlanceListImages {
 
@@ -58,6 +60,16 @@ public static void main(String[] args) {
 			uploadImage.setInputStream(new ByteArrayInputStream(IMAGE_CONTENT.getBytes()));
 			glance.images().upload(newImage.getId(), uploadImage).execute();
 
+			// Downloading the image and displaying the image content
+			try {
+				byte[] imgContent = new byte[IMAGE_CONTENT.length()];
+				ImageDownload downloadImage = glance.images().download(newImage.getId()).execute();
+				downloadImage.getInputStream().read(imgContent, 0, imgContent.length);
+				System.out.println(new String(imgContent));
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+
 			Images images = glance.images().list(false).execute();
 
 			for (Image image : images) {

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,7 @@ public Upload(ImageUpload imageUpload) {`
`147`	`147`	`public class Download extends OpenStackRequest<ImageDownload> {`
`148`	`148`
`149`	`149`	`public Download(String id) {`
`150`		`- super(CLIENT, HttpMethod.HEAD, new StringBuilder("/images/").append(id).toString(), null, ImageDownload.class);`
	`150`	`+ super(CLIENT, HttpMethod.GET, new StringBuilder("/images/").append(id).toString(), null, ImageDownload.class);`
`151`	`151`	`header("Accept", "application/octet-stream");`
`152`	`152`	`}`
`153`	`153`