Add the media source in the background title

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

diff --git a/image_creator/kamaki_wrapper.py b/image_creator/kamaki_wrapper.py
index b88f1da..3e34095 100644 (file)
--- 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"""
@@ -86,7 +107,7 @@ class Kamaki(object):
         # Convert all metadata to strings
         str_metadata = {}
         for (key, value) in metadata.iteritems():
-            str_metadata[str(key)]=str(value)
+            str_metadata[str(key)] = str(value)
 
         params = {'is_public': 'true', 'disk_format': 'diskdump'}
         self.image_client.register(name, location, params, str_metadata)