X-Git-Url: https://code.grnet.gr/git/snf-image-creator/blobdiff_plain/37d581b868919aaee6cc8c14aa7e99dccb465a79..bf3a282cb4ca85db501f8a925cd604a1600f25cc:/image_creator/main.py diff --git a/image_creator/main.py b/image_creator/main.py index 6d46ae3..10fc0b5 100644 --- a/image_creator/main.py +++ b/image_creator/main.py @@ -34,12 +34,10 @@ # 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, \ OutputWthProgress -from image_creator.os_type import os_cls from image_creator.kamaki_wrapper import Kamaki, ClientError import sys import os @@ -64,9 +62,6 @@ def parse_options(input_args): usage = "Usage: %prog [options] " parser = optparse.OptionParser(version=version, usage=usage) - 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", @@ -95,8 +90,8 @@ def parse_options(input_args): action="append", metavar="KEY=VALUE") parser.add_option("-t", "--token", dest="token", type="string", - default=token, help="use this authentication 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 " @@ -119,7 +114,7 @@ def parse_options(input_args): help="don't shrink any partition", action="store_false") parser.add_option("--public", dest="public", default=False, - help="register image to cyclades as public", + help="register image with cyclades as public", action="store_true") parser.add_option("--tmpdir", dest="tmp", type="string", default=None, @@ -186,17 +181,33 @@ def image_creator(): for extension in ('', '.meta', '.md5sum'): filename = "%s%s" % (options.outfile, extension) if os.path.exists(filename): - raise FatalError("Output file %s exists " - "(use --force to overwrite it)" % filename) + raise FatalError("Output file `%s' exists " + "(use --force to overwrite it)." % filename) # Check if the authentication token is valid. The earlier the better - 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)) + 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!") + else: + kamaki = Kamaki(account, out) + except ClientError as e: + raise FatalError("Astakos client: %d %s" % (e.status, e.message)) + + if options.upload and not options.force: + if kamaki.object_exists(options.upload): + raise FatalError("Remote pithos object `%s' exists " + "(use --force to overwrite it)." % options.upload) + if kamaki.object_exists("%s.md5sum" % options.upload): + raise FatalError("Remote pithos object `%s.md5sum' exists " + "(use --force to overwrite it)." % options.upload) + + if options.register and not options.force: + if kamaki.object_exists("%s.meta" % options.upload): + raise FatalError("Remote pithos object `%s.meta' exists " + "(use --force to overwrite it)." % options.upload) disk = Disk(options.source, out, options.tmp) @@ -208,51 +219,54 @@ def image_creator(): try: snapshot = disk.snapshot() - dev = disk.get_device(snapshot) - - # If no customization is to be applied, the image should be mounted ro - readonly = (not (options.sysprep or options.shrink) or - options.print_sysprep) - dev.mount(readonly) - - cls = os_cls(dev.distro, dev.ostype) - image_os = cls(dev.root, dev.g, out) - out.output() + image = disk.get_image(snapshot) - for sysprep in options.disabled_syspreps: - image_os.disable_sysprep(image_os.get_sysprep_by_name(sysprep)) + # If no customization is to be done, the image should be mounted ro + ro = (not (options.sysprep or options.shrink) or options.print_sysprep) + image.mount(ro) + try: + for sysprep in options.disabled_syspreps: + image.os.disable_sysprep(image.os.get_sysprep_by_name(sysprep)) - for sysprep in options.enabled_syspreps: - image_os.enable_sysprep(image_os.get_sysprep_by_name(sysprep)) + for sysprep in options.enabled_syspreps: + image.os.enable_sysprep(image.os.get_sysprep_by_name(sysprep)) - if options.print_sysprep: - image_os.print_syspreps() - out.output() + if options.print_sysprep: + image.os.print_syspreps() + out.output() - if options.outfile is None and not options.upload: - return 0 + if options.outfile is None and not options.upload: + return 0 - if options.sysprep: - image_os.do_sysprep() + if options.sysprep: + err_msg = "Unable to perform the system preparation tasks. " \ + "Couldn't mount the media%s. Use --no-sysprep if you " \ + "don't won't to perform any system preparation task." + if not image.mounted: + raise FatalError(err_msg % "") + elif image.mounted_ro: + raise FatalError(err_msg % " read-write") + image.os.do_sysprep() - metadata = image_os.meta - dev.umount() + metadata = image.os.meta + finally: + image.umount() - size = options.shrink and dev.shrink() or dev.size - metadata.update(dev.meta) + size = options.shrink and image.shrink() or image.size + metadata.update(image.meta) # Add command line metadata to the collected ones... metadata.update(options.metadata) md5 = MD5(out) - checksum = md5.compute(snapshot, size) + checksum = md5.compute(image.device, size) metastring = '\n'.join( ['%s=%s' % (key, value) for (key, value) in metadata.items()]) metastring += '\n' if options.outfile is not None: - dev.dump(options.outfile) + image.dump(options.outfile) out.output('Dumping metadata file ...', False) with open('%s.%s' % (options.outfile, 'meta'), 'w') as f: @@ -265,27 +279,20 @@ def image_creator(): os.path.basename(options.outfile))) out.success('done') - # Destroy the device. We only need the snapshot from now on - disk.destroy_device(dev) + # Destroy the image instance. We only need the snapshot from now on + disk.destroy_image(image) out.output() try: uploaded_obj = "" if options.upload: out.output("Uploading image to pithos:") - 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") - - 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) + "(1/3) Calculating block hashes", + "(2/3) Uploading missing blocks") + out.output("(3/3) Uploading md5sum file ...", False) md5sumstr = '%s %s\n' % (checksum, os.path.basename(options.upload)) kamaki.upload(StringIO.StringIO(md5sumstr), @@ -301,6 +308,19 @@ def image_creator(): kamaki.register(options.register, uploaded_obj, metadata, options.public) out.success('done') + out.output("Uploading metadata file ...", False) + kamaki.upload(StringIO.StringIO(metastring), + size=len(metastring), + remote_path="%s.%s" % (options.upload, 'meta')) + out.success('done') + if options.public: + out.output("Sharing md5sum file ...", False) + kamaki.share("%s.md5sum" % options.upload) + out.success('done') + out.output("Sharing metadata file ...", False) + kamaki.share("%s.meta" % options.upload) + out.success('done') + out.output() except ClientError as e: raise FatalError("Pithos client: %d %s" % (e.status, e.message))