Use progress for progress bar & implement register

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

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index ca830fc..f325be0 100644 (file)
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -34,22 +34,41 @@
 from os.path import basename
 
 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
+from image_creator.util import FatalError, output, success
 
 CONTAINER = "images"
 
 
+def progress(message):
+
+    MSG_LENGTH = 30
+
+    def progress_gen(n):
+        msg = "%s:" % message
+
+        progressbar = Bar(msg.ljust(MSG_LENGTH))
+        progressbar.max = n
+        for _ in range(n):
+            yield
+            progressbar.next()
+        output("\r%s...\033[K" % message, False)
+        success("done")
+        yield
+    return progress_gen
+
 class Kamaki:
-    __init__(self, account, token):
-        self.username = username
+    def __init__(self, account, token):
+        self.account = account
         self.token = token
 
         config = Config()
 
         pithos_url = config.get('storage', 'url')
-        self.account = config.get('storage', 'account')
         self.container = CONTAINER
         self.pithos_client = PithosClient(pithos_url, token, self.account,
                                                                 self.container)
@@ -59,21 +78,32 @@ class Kamaki:
 
         self.uploaded_object = None
 
-    set_container(self, container):
-        self.pithos_client.container = container
-
-    upload(self, filename, size=None, remote_path=None):
+    def upload(self, file_obj, size=None, remote_path=None, hp=None, up=None):
 
         if remote_path is None:
             remote_path = basename(filename)
 
-        with open(filename) as f:
-            # TODO: create container if necessary
-            self.pithos_client.create_object(remote_path, f, size)
-            self.uploaded_object = "pithos://%s/%s/%s" % \
-                                    (self.account, self.container, remote_path)
-
-    register(self, metadata):
-        pass
-
-# vim: set sta sts=4 shiftwidth=4 sw=4 et ai
+        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))
+
+    def register(self, name, location, metadata):
+        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))
+
+# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :