Make snf-image-creator compatible with kamaki 0.6

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

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index e3c249e..131e204 100644 (file)
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -37,79 +37,80 @@ from kamaki.config import Config
 from kamaki.clients import ClientError
 from kamaki.clients.image import ImageClient
 from kamaki.clients.pithos import PithosClient
-from progress.bar import Bar
 
-from image_creator.util import FatalError, output, success
+from image_creator.util import FatalError
 
 CONTAINER = "images"
 
 
-def progress(message):
+class Kamaki(object):
 
-    MSG_LENGTH = 30
-
-    def progress_gen(n):
-        msg = "%s:" % message
+    @staticmethod
+    def get_account():
+        config = Config()
+        return config.get('store', 'account') or \
+            config.get('global', 'account')
 
-        progressbar = Bar(msg.ljust(MSG_LENGTH))
-        progressbar.max = n
-        progressbar.fill = '#'
-        progressbar.bar_prefix = ' ['
-        progressbar.bar_suffix = '] '
+    @staticmethod
+    def get_token():
+        config = Config()
+        return config.get('global', 'token')
 
-        for _ in range(n):
-            yield
-            progressbar.next()
-        output("\r%s...\033[K" % message, False)
-        success("done")
-        yield
-    return progress_gen
+    @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()
 
-class Kamaki:
-    def __init__(self, account, token):
+    def __init__(self, account, token, output):
         self.account = account
         self.token = token
+        self.out = output
 
         config = Config()
 
-        pithos_url = config.get('storage', 'url')
+        pithos_url = config.get('store', 'url')
         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')
-        self.image_client = ImageClient(image_url, token)
-
-        self.uploaded_object = None
+        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"""
-        if remote_path is None:
-            remote_path = basename(filename)
+
+        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 FatalError("Pithos client: %d %s" % \
-                                                    (e.status, e.message))
-        try:
-            hash_cb = progress(hp) if hp is not None else None
-            upload_cb = progress(up) if up is not None else None
-            self.pithos_client.create_object(remote_path, file_obj, size,
-                                                            hash_cb, upload_cb)
-            return "pithos://%s/%s/%s" % \
-                            (self.account, self.container, remote_path)
-        except ClientError as e:
-            raise FatalError("Pithos client: %d %s" % (e.status, e.message))
+                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'}
-        try:
-            self.image_client.register(name, location, params, metadata)
-        except ClientError as e:
-            raise FatalError("Image client: %d %s" % (e.status, e.message))
+        self.image_client.register(name, location, params, str_metadata)
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :