from os.path import basename
from kamaki.config import Config
+from kamaki.clients import ClientError
from kamaki.clients.image import ImageClient
+from kamaki.clients.pithos import PithosClient
from image_creator.util import FatalError
CONTAINER = "images"
-class Kamaki:
- __init__(self, account, token):
- self.username = username
+class Kamaki(object):
+ def __init__(self, account, token, output):
+ self.account = account
self.token = token
+ self.out = output
config = Config()
pithos_url = config.get('storage', 'url')
- self.account = config.get('storage', 'account')
self.container = CONTAINER
self.pithos_client = PithosClient(pithos_url, token, self.account,
self.container)
self.uploaded_object = None
- set_container(self, container):
- self.pithos_client.container = container
+ def upload(self, file_obj, size=None, remote_path=None, hp=None, up=None):
+ """Upload a file to pithos"""
- upload(self, filename, size=None, remote_path=None):
+ path = basename(file_obj.name) if remote_path is None else remote_path
- if remote_path is None:
- remote_path = basename(filename)
+ try:
+ self.pithos_client.create_container(self.container)
+ except ClientError as e:
+ if e.status != 202: # Ignore container already exists errors
+ raise e
- with open(filename) as f:
- # TODO: create container if necessary
- self.pithos_client.create_object(remote_path, f, size)
- self.uploaded_object = "pithos://%s/%s/%s" % \
- (self.account, self.container, remote_path)
+ 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
- register(self, metadata):
- pass
+ self.pithos_client.create_object(path, file_obj, size, hash_cb,
+ upload_cb)
-# vim: set sta sts=4 shiftwidth=4 sw=4 et ai
+ return "pithos://%s/%s/%s" % (self.account, self.container, path)
+
+ 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, str_metadata)
+
+# vim: set sta sts=4 shiftwidth=4 sw=4 et ai :