Merge pull request #468 from 01org/sameo/topic/storage

ciao-image: Fix service UploadImage

ciao-image/service/service.go

@@ -102,8 +102,16 @@ func (is ImageService) ListImages() ([]image.CreateImageResponse, error) {
 }
 
 // UploadImage will upload a raw image data and update its status.
-func (is ImageService) UploadImage(imageID string, body io.Reader) error {
-	return nil
+func (is ImageService) UploadImage(imageID string, body io.Reader) (image.UploadImageResponse, error) {
+	var response image.UploadImageResponse
+
+	err := is.ds.UploadImage(imageID, body)
+	if err != nil {
+		return response, err
+	}
+
+	response.ImageID = imageID
+	return response, nil
 }
 
 // Config is required to setup the API context for the image service.

openstack/image/api.go

@@ -201,7 +201,7 @@ type APIConfig struct {
 // information needed to implement the image endpoints.
 type Service interface {
 	CreateImage(CreateImageRequest) (CreateImageResponse, error)
-	UploadImage(imageID string, body io.Reader) error
+	UploadImage(string, io.Reader) (UploadImageResponse, error)
 	ListImages() ([]CreateImageResponse, error)
 }
 
@@ -339,15 +339,11 @@ func uploadImage(context *Context, w http.ResponseWriter, r *http.Request) (APIR
 
 	defer r.Body.Close()
 
-	err := context.UploadImage(imageID, r.Body)
+	resp, err := context.UploadImage(imageID, r.Body)
 	if err != nil {
 		return errorResponse(err), err
 	}
 
-	resp := UploadImageResponse{
-		ImageID: imageID,
-	}
-
 	return APIResponse{http.StatusOK, resp}, nil
 }