projects
/
snf-image-creator
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix minor issues in output messages
[snf-image-creator]
/
image_creator
/
kamaki_wrapper.py
diff --git
a/image_creator/kamaki_wrapper.py
b/image_creator/kamaki_wrapper.py
index
768e6b3
..
bac2968
100644
(file)
--- a/
image_creator/kamaki_wrapper.py
+++ b/
image_creator/kamaki_wrapper.py
@@
-33,7
+33,7
@@
from os.path import basename
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
from kamaki.clients import ClientError
from kamaki.clients.image import ImageClient
from kamaki.clients.pithos import PithosClient
@@
-46,17
+46,20
@@
CONTAINER = "images"
class Kamaki(object):
@staticmethod
class Kamaki(object):
@staticmethod
- def saved_credentials():
+ def get_account():
config = Config()
config = Config()
- account = config.get('storage', 'account')
- token = config.get('global', 'token')
+ return config.get('store', 'account') or \
+ config.get('global', 'account')
- return (account, token)
+ @staticmethod
+ def get_token():
+ config = Config()
+ return config.get('global', 'token')
@staticmethod
def save_account(account):
config = Config()
@staticmethod
def save_account(account):
config = Config()
- config.set('storage', 'account', account)
+ config.set('store', 'account', account)
config.write()
@staticmethod
config.write()
@staticmethod
@@
-72,7
+75,7
@@
class Kamaki(object):
config = Config()
config = Config()
- pithos_url = config.get('storage', 'url')
+ pithos_url = config.get('store', 'url')
self.container = CONTAINER
self.pithos_client = PithosClient(pithos_url, self.token, self.account,
self.container)
self.container = CONTAINER
self.pithos_client = PithosClient(pithos_url, self.token, self.account,
self.container)
@@
-94,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
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)
upload_cb)
return "pithos://%s/%s/%s" % (self.account, self.container, path)