glance: image creation should use metadata headers

simon3z · simon3z · commit ace98de5fb78 · 2013-06-06T20:02:00.000+02:00
In the image creation API the metadata is passed as headers (same as the
upload API).

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
@@ -2,6 +2,7 @@
 
 import java.util.Calendar;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.Map;
 
 import org.codehaus.jackson.annotate.JsonProperty;
@@ -81,7 +82,10 @@ public List(boolean detail) {
 	public class Create extends OpenStackRequest<Image> {
 
 		public Create(Image image) {
-			super(CLIENT, HttpMethod.POST, "/images", Entity.json(image), Image.class);
+			super(CLIENT, HttpMethod.POST, "/images", null, Image.class);
+			for (Map.Entry<String, String> entry : compose(image).entrySet()) {
+				header(entry.getKey(), entry.getValue());
+			}
 		}
 		
 	}
@@ -120,19 +124,13 @@ public class Upload extends OpenStackRequest<Image> {
 		
 		public Upload(ImageUpload imageUpload) {
 			super(CLIENT, HttpMethod.POST, "/images", Entity.stream(imageUpload.getInputStream()), Image.class);
-			header("x-image-meta-name", imageUpload.getImage().getName());
-			header("x-image-meta-disk_format", imageUpload.getImage().getDiskFormat());
-			header("x-image-meta-container_format", imageUpload.getImage().getContainerFormat());
-			header("x-image-meta-id", imageUpload.getImage().getId());
+
+			for (Map.Entry<String, String> entry : compose(imageUpload.getImage()).entrySet()) {
+				header(entry.getKey(), entry.getValue());
+			}
+
 			//file,s3,swift
 			header("x-image-meta-store", imageUpload.getStore());
-			header("x-image-meta-size", imageUpload.getImage().getSize());
-			header("x-image-meta-checksum", imageUpload.getImage().getChecksum());
-			header("x-image-meta-is-public", imageUpload.getImage().isPublic());
-			header("x-image-meta-owner", imageUpload.getImage().getOwner());
-			for(String key : imageUpload.getProperties().keySet()) {
-				imageUpload.getProperties().put("x-image-meta-property-" + key, imageUpload.getProperties().get(key));
-			}
 		}
 
 	}
@@ -187,7 +185,26 @@ public RemoveMember(String id, String tenantId) {
 		}
 
 	}
-	
+
+	public static Map<String, String> compose(Image image) {
+		Map<String, String> headers = new HashMap<String, String>();
+
+		headers.put("X-Image-Meta-Name", image.getName());
+		headers.put("X-Image-Meta-Disk_format", image.getDiskFormat());
+		headers.put("X-Image-Meta-Container_format", image.getContainerFormat());
+		headers.put("X-Image-Meta-Id", image.getId());
+		headers.put("X-Image-Meta-Size", (image.getSize() != null) ? image.getSize().toString() : null);
+		headers.put("X-Image-Meta-Checksum", image.getChecksum());
+		headers.put("X-Image-Meta-Is_public", String.valueOf(image.isPublic()));
+		headers.put("X-Image-Meta-Owner", image.getOwner());
+
+		for(String key : image.getProperties().keySet()) {
+			image.getProperties().put("x-image-meta-property-" + key, image.getProperties().get(key));
+		}
+
+		return headers;
+	}
+
 	public static Image parse(Map<String, String> headers) {
 		Image image = new Image();
 		image.setId(headers.get("X-Image-Meta-Id"));
diff --git a/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java b/openstack-client/src/main/java/com/woorea/openstack/base/client/OpenStackRequest.java
@@ -62,9 +62,9 @@ public String path() {
 		return path.toString();
 	}
 
-	public OpenStackRequest<R> header(String name, Object... values) {
-		if(values != null) {
-			headers.put(name, Arrays.asList(values));
+	public OpenStackRequest<R> header(String name, Object value) {
+		if(value != null) {
+			headers.put(name, Arrays.asList(value));
 		}
 		return this;
 	}
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
@@ -41,11 +41,20 @@ public static void main(String[] args) {
 			glance.setTokenProvider(keystone
 					.getProviderByTenant(ExamplesConfiguration.TENANT_NAME));
 
+			// Creating a new image
+			Image newImage = new Image();
+			newImage.setDiskFormat("raw");
+			newImage.setContainerFormat("bare");
+			newImage.setName("os-java-glance-test");
+			newImage = glance.images().create(newImage).execute();
+
 			Images images = glance.images().list(false).execute();
 
 			for (Image image : images) {
 				System.out.println(glance.images().show(image.getId()).execute());
 			}
+
+			glance.images().delete(newImage.getId()).execute();
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -62,9 +62,9 @@ public String path() {`
`62`	`62`	`return path.toString();`
`63`	`63`	`}`
`64`	`64`
`65`		`- public OpenStackRequest<R> header(String name, Object... values) {`
`66`		`- if(values != null) {`
`67`		`- headers.put(name, Arrays.asList(values));`
	`65`	`+ public OpenStackRequest<R> header(String name, Object value) {`
	`66`	`+ if(value != null) {`
	`67`	`+ headers.put(name, Arrays.asList(value));`
`68`	`68`	`}`
`69`	`69`	`return this;`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,11 +41,20 @@ public static void main(String[] args) {`
`41`	`41`	`glance.setTokenProvider(keystone`
`42`	`42`	`.getProviderByTenant(ExamplesConfiguration.TENANT_NAME));`
`43`	`43`
	`44`	`+ // Creating a new image`
	`45`	`+ Image newImage = new Image();`
	`46`	`+ newImage.setDiskFormat("raw");`
	`47`	`+ newImage.setContainerFormat("bare");`
	`48`	`+ newImage.setName("os-java-glance-test");`
	`49`	`+ newImage = glance.images().create(newImage).execute();`
	`50`	`+`
`44`	`51`	`Images images = glance.images().list(false).execute();`
`45`	`52`
`46`	`53`	`for (Image image : images) {`
`47`	`54`	`System.out.println(glance.images().show(image.getId()).execute());`
`48`	`55`	`}`
	`56`	`+`
	`57`	`+ glance.images().delete(newImage.getId()).execute();`
`49`	`58`	`}`
`50`	`59`	`}`
`51`	`60`