From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 7 May 2014 03:43:14 +0000 (-0400)
Subject: use python-glanceclient intead of glance.client to upload image
X-Git-Url: http://git.onelab.eu/?p=plstackapi.git;a=commitdiff_plain;h=8b85d9af33f007af1637e66326b77835d13977e4

use python-glanceclient intead of glance.client to upload image
---

diff --git a/planetstack/observer/steps/sync_image_deployments.py b/planetstack/observer/steps/sync_image_deployments.py
index e611044..a52b9ca 100644
--- a/planetstack/observer/steps/sync_image_deployments.py
+++ b/planetstack/observer/steps/sync_image_deployments.py
@@ -32,13 +32,22 @@ class SyncImageDeployments(OpenStackSyncStep):
                       
     def sync_record(self, image_deployment):
         driver = self.driver.admin_driver(deployment=image_deployment.deployment.name)
-        image = {
-            'name': image_deployment.image.name,
-            'is_public': True,
-            'disk_format': 'raw', 
-            'container_format': 'bare',
-            'file': image_deployment.image.path, 
-        }  
-        glance_image = driver.shell.glance.add_image(image)  
-        image_deployment.glance_image_id = glance_image['id']
+        images = driver.shell.glance.get_images()
+        glance_image = None
+        for image in images:
+            if image['name'] == image_deployment.image.name:
+                glance_image = image
+                break
+        if glance_image:
+            image_deployment.glance_image_id = glance_image['id']
+        elif image_deployment.image.path:
+            glance_image = driver.shell.glanceclient.images.create(name=image_deployment.image.name,
+                                                                   is_public=True,
+                                                                   disk_format='raw',
+                                                                   container_format='bare')
+            glance_image.update(data=open(image_deployment.image.path, 'rb'))
+ 
+            if not glance_image or not glance_image.get('id'): 
+                raise Exception, "Add image failed at deployment %s" % image_deployment.deployment.name
+            image_deployment.glance_image_id = glance_image['id']
         image_deployment.save()