Fix a bug in image shrinking code

[snf-image-creator] / image_creator / kamaki_wrapper.py

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 5be0c33..bac2968 100644 (file)
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -33,57 +33,84 @@
 
 from os.path import basename
 
 
 from os.path import basename
 

-from kamaki.config import Config
+from kamaki.cli.config import Config

 from kamaki.clients import ClientError
 from kamaki.clients.image import ImageClient
 from kamaki.clients.pithos import PithosClient
 
 from kamaki.clients import ClientError
 from kamaki.clients.image import ImageClient
 from kamaki.clients.pithos import PithosClient
 

-from image_creator.util import FatalError, progress
+from image_creator.util import FatalError

 
 CONTAINER = "images"
 
 
 
 CONTAINER = "images"
 
 

-class Kamaki:
-    def __init__(self, account, token):
+class Kamaki(object):
+
+    @staticmethod
+    def get_account():
+        config = Config()
+        return config.get('store', 'account') or \
+            config.get('global', 'account')
+
+    @staticmethod
+    def get_token():
+        config = Config()
+        return config.get('global', 'token')
+
+    @staticmethod
+    def save_account(account):
+        config = Config()
+        config.set('store', 'account', account)
+        config.write()
+
+    @staticmethod
+    def save_token(token):
+        config = Config()
+        config.set('global', 'token', token)
+        config.write()
+
+    def __init__(self, account, token, output):

         self.account = account
         self.token = token
         self.account = account
         self.token = token

+        self.out = output

 
         config = Config()
 
 
         config = Config()
 

-        pithos_url = config.get('storage', 'url')
+        pithos_url = config.get('store', 'url')

         self.container = CONTAINER
         self.container = CONTAINER

-        self.pithos_client = PithosClient(pithos_url, token, self.account,
-                                                                self.container)
+        self.pithos_client = PithosClient(pithos_url, self.token, self.account,
+                                          self.container)

 
         image_url = config.get('image', 'url')
 
         image_url = config.get('image', 'url')

-        self.image_client = ImageClient(image_url, token)
-
-        self.uploaded_object = None
-
-    def upload(self, filename, size=None, remote_path=None):
-
-        if remote_path is None:
-            remote_path = basename(filename)
-
-        with open(filename) as f:
-            try:
-                self.pithos_client.create_container(self.container)
-            except ClientError as e:
-                if e.status != 202:  # Ignore container already exists errors
-                    raise FatalError("Pithos client: %d %s" % \
-                                                        (e.status, e.message))
-            try:
-               hash_progress = progress("(1/2)  Calculating block hashes:")
-               upload_progress = progress("(2/2)  Uploading missing blocks:")
-                self.pithos_client.create_object(remote_path, f, size,
-                                               hash_progress, upload_progress)
-                self.uploaded_object = "pithos://%s/%s/%s" % \
-                                (self.account, self.container, remote_path)
-            except ClientError as e:
-                raise FatalError("Pithos client: %d %s" % \
-                                                        (e.status, e.message))
-
-    def register(self, metadata):
-        pass
-
-# vim: set sta sts=4 shiftwidth=4 sw=4 et ai
+        self.image_client = ImageClient(image_url, self.token)
+
+    def upload(self, file_obj, size=None, remote_path=None, hp=None, up=None):
+        """Upload a file to pithos"""
+
+        path = basename(file_obj.name) if remote_path is None else remote_path
+
+        try:
+            self.pithos_client.create_container(self.container)
+        except ClientError as e:
+            if e.status != 202:  # Ignore container already exists errors
+                raise e
+
+        hash_cb = self.out.progress_generator(hp) if hp is not None else None
+        upload_cb = self.out.progress_generator(up) if up is not None else None
+
+        self.pithos_client.upload_object(path, file_obj, size, hash_cb,
+                                         upload_cb)
+
+        return "pithos://%s/%s/%s" % (self.account, self.container, path)
+
+    def register(self, name, location, metadata):
+        """Register an image to ~okeanos"""
+
+        # Convert all metadata to strings
+        str_metadata = {}
+        for (key, value) in metadata.iteritems():
+            str_metadata[str(key)] = str(value)
+
+        params = {'is_public': 'true', 'disk_format': 'diskdump'}
+        self.image_client.register(name, location, params, str_metadata)
+
+# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :