X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/f99fe99d6f3beaf5b282267f30c1ca288be92e40..6d0788a9f374b49c8c0b987021d61f13c03230e5:/image_creator/kamaki_wrapper.py

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 6b05142..bac2968 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -33,7 +33,7 @@
 
 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
@@ -44,6 +44,30 @@ CONTAINER = "images"
 
 
 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
@@ -51,15 +75,13 @@ class Kamaki(object):
 
         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.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"""
@@ -75,7 +97,7 @@ class Kamaki(object):
         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.create_object(path, file_obj, size, hash_cb,
+        self.pithos_client.upload_object(path, file_obj, size, hash_cb,
                                          upload_cb)
 
         return "pithos://%s/%s/%s" % (self.account, self.container, path)