# or implied, of GRNET S.A.
from image_creator import __version__ as version
-from image_creator import util
from image_creator.disk import Disk
from image_creator.util import FatalError, MD5
from image_creator.output.cli import SilentOutput, SimpleOutput, \
usage = "Usage: %prog [options] <input_media>"
parser = optparse.OptionParser(version=version, usage=usage)
- account = os.environ["OKEANOS_USER"] if "OKEANOS_USER" in os.environ \
- else None
- token = os.environ["OKEANOS_TOKEN"] if "OKEANOS_TOKEN" in os.environ \
- else None
-
parser.add_option("-o", "--outfile", type="string", dest="outfile",
default=None, action="callback",
callback=check_writable_dir, help="dump image to FILE",
help="register the image with ~okeanos as IMAGENAME",
metavar="IMAGENAME")
- parser.add_option("-a", "--account", dest="account", type="string",
- default=account, help="use this ACCOUNT when "
- "uploading/registering images [Default: %s]" % account)
-
parser.add_option("-m", "--metadata", dest="metadata", default=[],
help="add custom KEY=VALUE metadata to the image",
action="append", metavar="KEY=VALUE")
parser.add_option("-t", "--token", dest="token", type="string",
- default=token, help="use this token when "
- "uploading/registering images [Default: %s]" % token)
+ default=None, help="use this authentication token when "
+ "uploading/registering images")
parser.add_option("--print-sysprep", dest="print_sysprep", default=False,
help="print the enabled and disabled system preparation "
parser.add_option("--no-shrink", dest="shrink", default=True,
help="don't shrink any partition", action="store_false")
+ parser.add_option("--public", dest="public", default=False,
+ help="register image with cyclades as public",
+ action="store_true")
+
parser.add_option("--tmpdir", dest="tmp", type="string", default=None,
help="create large temporary image files under DIR",
metavar="DIR")
if options.register and not options.upload:
raise FatalError("You also need to set -u when -r option is set")
- if options.upload and options.account is None:
- raise FatalError("Image uploading cannot be performed. No ~okeanos "
- "account name is specified. Use -a to set an account "
- "name.")
-
if options.upload and options.token is None:
- raise FatalError("Image uploading cannot be performed. No ~okeanos "
- "token is specified. User -t to set a token.")
+ raise FatalError(
+ "Image uploading cannot be performed. "
+ "No authentication token is specified. Use -t to set a token")
if options.tmp is not None and not os.path.isdir(options.tmp):
raise FatalError("The directory `%s' specified with --tmpdir is not "
- "valid." % options.tmp)
+ "valid" % options.tmp)
meta = {}
for m in options.metadata:
try:
key, value = m.split('=', 1)
except ValueError:
- raise FatalError("Metadata option: `%s' is not in "
- "KEY=VALUE format." % m)
+ raise FatalError("Metadata option: `%s' is not in KEY=VALUE "
+ "format." % m)
meta[key] = value
options.metadata = meta
filename = "%s%s" % (options.outfile, extension)
if os.path.exists(filename):
raise FatalError("Output file %s exists "
- "(use --force to overwrite it)." % filename)
+ "(use --force to overwrite it)" % filename)
+
+ # Check if the authentication token is valid. The earlier the better
+ if options.token is not None:
+ try:
+ account = Kamaki.get_account(options.token)
+ if account is None:
+ raise FatalError("The authentication token you provided is not"
+ " valid!")
+ except ClientError as e:
+ raise FatalError("Astakos client: %d %s" % (e.status, e.message))
disk = Disk(options.source, out, options.tmp)
uploaded_obj = ""
if options.upload:
out.output("Uploading image to pithos:")
- kamaki = Kamaki(options.account, options.token, out)
+ kamaki = Kamaki(account, out)
with open(snapshot, 'rb') as f:
- uploaded_obj = kamaki.upload(f, size, options.upload,
- "(1/4) Calculating block "
- "hashes",
- "(2/4) Uploading missing "
- "blocks")
+ uploaded_obj = kamaki.upload(
+ f, size, options.upload,
+ "(1/4) Calculating block hashes",
+ "(2/4) Uploading missing blocks")
- out.output("(3/4) Uploading metadata file...", False)
+ out.output("(3/4) Uploading metadata file ...", False)
kamaki.upload(StringIO.StringIO(metastring),
size=len(metastring),
remote_path="%s.%s" % (options.upload, 'meta'))
out.output()
if options.register:
- out.output('Registering image with ~okeanos ...', False)
- kamaki.register(options.register, uploaded_obj, metadata)
+ img_type = 'public' if options.public else 'private'
+ out.output('Registering %s image with ~okeanos ...' % img_type,
+ False)
+ kamaki.register(options.register, uploaded_obj, metadata,
+ options.public)
out.success('done')
out.output()
except ClientError as e:
raise FatalError("Pithos client: %d %s" % (e.status, e.message))
finally:
- out.output('cleaning up...')
+ out.output('cleaning up ...')
disk.cleanup()
out.success("snf-image-creator exited without errors")