X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/8e3065a039b08d9c37d183f8cc3bb8ae5dcd4410..5886f568337cad55facff1132344374553bd8b1f:/image_creator/kamaki_wrapper.py

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 5be0c33..e3c249e 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -37,12 +37,35 @@ 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, progress
+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
+        progressbar.fill = '#'
+        progressbar.bar_prefix = ' ['
+        progressbar.bar_suffix = '] '
+
+        for _ in range(n):
+            yield
+            progressbar.next()
+        output("\r%s...\033[K" % message, False)
+        success("done")
+        yield
+    return progress_gen
+
+
 class Kamaki:
     def __init__(self, account, token):
         self.account = account
@@ -60,30 +83,33 @@ class Kamaki:
 
         self.uploaded_object = None
 
-    def upload(self, filename, size=None, remote_path=None):
-
+    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)
 
-        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:
+        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))
+                                                    (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, metadata):
-        pass
+    def register(self, name, location, metadata):
+        """Register an image to ~okeanos"""
+        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
+# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :