X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/3b7d3fc77471e64af3d892097dec1fde83c575fa..6ca928ac8e5d26fe49b22ed3b7406d240193b9ad:/image_creator/kamaki_wrapper.py?ds=sidebyside

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index 66bb940..3e34095 100644
--- a/image_creator/kamaki_wrapper.py
+++ b/image_creator/kamaki_wrapper.py
@@ -44,6 +44,29 @@ CONTAINER = "images"
 
 
 class Kamaki(object):
+
+    @staticmethod
+    def get_account():
+        config = Config()
+        return config.get('storage', 'account')
+
+    @staticmethod
+    def get_token():
+        config = Config()
+        return config.get('global', 'token')
+
+    @staticmethod
+    def save_account(account):
+        config = Config()
+        config.set('storage', '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
@@ -53,13 +76,11 @@ class Kamaki(object):
 
         pithos_url = config.get('storage', '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"""
@@ -83,7 +104,12 @@ class Kamaki(object):
     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, metadata)
+        self.image_client.register(name, location, params, str_metadata)
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :