X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/e8b1b48bd7b8a7057b6af698b6dfdb36f13c75b8..9afc4b89f252e5d239058a3bfeb761ab5627bfd1:/image_creator/main.py diff --git a/image_creator/main.py b/image_creator/main.py index a18d6c7..fde3b7d 100644 --- a/image_creator/main.py +++ b/image_creator/main.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2011 GRNET S.A. All rights reserved. +# Copyright 2012 GRNET S.A. All rights reserved. # # Redistribution and use in source and binary forms, with or # without modification, are permitted provided that the following @@ -36,10 +36,11 @@ from image_creator import __version__ as version from image_creator import util from image_creator.disk import Disk -from image_creator.util import get_command, error, success, output, \ - FatalError, progress, md5 -from image_creator.os_type import get_os_class -from image_creator.kamaki_wrapper import Kamaki +from image_creator.util import get_command, FatalError, MD5 +from image_creator.output.cli import SilentOutput, SimpleOutput, \ + OutputWthProgress +from image_creator.os_type import os_cls +from image_creator.kamaki_wrapper import Kamaki, ClientError import sys import os import optparse @@ -90,6 +91,10 @@ def parse_options(input_args): help="Use this ACCOUNT when uploading/registring 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/registring images [Default: %s]"\ @@ -117,6 +122,7 @@ def parse_options(input_args): if len(args) != 1: parser.error('Wrong number of arguments') + options.source = args[0] if not os.path.exists(options.source): raise FatalError("Input media `%s' is not accessible" % options.source) @@ -132,23 +138,36 @@ def parse_options(input_args): raise FatalError("Image uploading cannot be performed. No ~okeanos " "token is specified. User -t to set a token.") + 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) + meta[key] = value + options.metadata = meta + return options def image_creator(): options = parse_options(sys.argv[1:]) - if options.silent: - util.silent = True - if options.outfile is None and not options.upload \ and not options.print_sysprep: raise FatalError("At least one of `-o', `-u' or `--print-sysprep' " \ "must be set") + if options.silent: + out = SilentOutput() + else: + out = OutputWthProgress(True) if sys.stderr.isatty() else \ + SimpleOutput(False) + title = 'snf-image-creator %s' % version - output(title) - output('=' * len(title)) + out.output(title) + out.output('=' * len(title)) if os.geteuid() != 0: raise FatalError("You must run %s as root" \ @@ -161,27 +180,29 @@ def image_creator(): raise FatalError("Output file %s exists " "(use --force to overwrite it)." % filename) - disk = Disk(options.source) + disk = Disk(options.source, out) try: snapshot = disk.snapshot() dev = disk.get_device(snapshot) - dev.mount() - osclass = get_os_class(dev.distro, dev.ostype) - image_os = osclass(dev.root, dev.g) - metadata = image_os.get_metadata() - output() + # If no customization is to be applied, the image should be mounted ro + readonly = not (options.sysprep or options.shrink) + dev.mount(readonly) + + cls = os_cls(dev.distro, dev.ostype) + image_os = cls(dev.root, dev.g, out) + out.output() for sysprep in options.disabled_syspreps: - image_os.disable_sysprep(sysprep) + image_os.disable_sysprep(image_os.get_sysprep_by_name(sysprep)) for sysprep in options.enabled_syspreps: - image_os.enable_sysprep(sysprep) + image_os.enable_sysprep(image_os.get_sysprep_by_name(sysprep)) if options.print_sysprep: image_os.print_syspreps() - output() + out.output() if options.outfile is None and not options.upload: return 0 @@ -189,12 +210,17 @@ def image_creator(): if options.sysprep: image_os.do_sysprep() + metadata = image_os.meta dev.umount() - size = options.shrink and dev.shrink() or dev.size + size = options.shrink and dev.shrink() or dev.meta['SIZE'] metadata.update(dev.meta) - checksum = md5(snapshot, size) + # Add command line metadata to the collected ones... + metadata.update(options.metadata) + + md5 = MD5(out) + checksum = md5.compute(snapshot, size) metastring = '\n'.join( ['%s=%s' % (key, value) for (key, value) in metadata.items()]) @@ -203,54 +229,58 @@ def image_creator(): if options.outfile is not None: dev.dump(options.outfile) - output('Dumping metadata file...', False) + out.output('Dumping metadata file...', False) with open('%s.%s' % (options.outfile, 'meta'), 'w') as f: f.write(metastring) - success('done') + out.success('done') - output('Dumping md5sum file...', False) + out.output('Dumping md5sum file...', False) with open('%s.%s' % (options.outfile, 'md5sum'), 'w') as f: f.write('%s %s\n' % (checksum, \ os.path.basename(options.outfile))) - success('done') + out.success('done') # Destroy the device. We only need the snapshot from now on disk.destroy_device(dev) - output() - - uploaded_obj = "" - if options.upload: - output("Uploading image to pithos:") - kamaki = Kamaki(options.account, options.token) - with open(snapshot) as f: - uploaded_obj = kamaki.upload(f, size, options.upload, - "(1/4) Calculating block hashes", - "(2/4) Uploading missing blocks") - - output("(3/4) Uploading metadata file...", False) - kamaki.upload(StringIO.StringIO(metastring), size=len(metastring), - remote_path="%s.%s" % (options.upload, 'meta')) - success('done') - output("(4/4) Uploading md5sum file...", False) - md5sumstr = '%s %s\n' % ( - checksum, os.path.basename(options.upload)) - kamaki.upload(StringIO.StringIO(md5sumstr), size=len(md5sumstr), - remote_path="%s.%s" % (options.upload, 'md5sum')) - success('done') - output() - - if options.register: - output('Registring image to ~okeanos...', False) - kamaki.register(options.register, uploaded_obj, metadata) - success('done') - output() + out.output() + try: + uploaded_obj = "" + if options.upload: + out.output("Uploading image to pithos:") + kamaki = Kamaki(options.account, options.token, 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") + + out.output("(3/4) Uploading metadata file...", False) + kamaki.upload(StringIO.StringIO(metastring), + size=len(metastring), + remote_path="%s.%s" % (options.upload, 'meta')) + out.success('done') + out.output("(4/4) Uploading md5sum file...", False) + md5sumstr = '%s %s\n' % ( + checksum, os.path.basename(options.upload)) + kamaki.upload(StringIO.StringIO(md5sumstr), + size=len(md5sumstr), + remote_path="%s.%s" % (options.upload, 'md5sum')) + out.success('done') + out.output() + + if options.register: + out.output('Registring image to ~okeanos...', False) + kamaki.register(options.register, uploaded_obj, metadata) + out.success('done') + out.output() + except ClientError as e: + raise FatalError("Pithos client: %d %s" % (e.status, e.message)) finally: - output('cleaning up...') + out.output('cleaning up...') disk.cleanup() - success("snf-image-creator exited without errors") + out.success("snf-image-creator exited without errors") return 0 @@ -260,10 +290,10 @@ def main(): ret = image_creator() sys.exit(ret) except FatalError as e: - error(e) + colored = sys.stderr.isatty() + SimpleOutput(colored).error(e) sys.exit(1) - if __name__ == '__main__': main()