Add get_sysprep_by_name method in os_type classes

[snf-image-creator] / image_creator / main.py

diff --git a/image_creator/main.py b/image_creator/main.py
index 319fbf3..fde3b7d 100644 (file)
--- a/image_creator/main.py
+++ b/image_creator/main.py
@@ -39,8 +39,8 @@ from image_creator.disk import Disk
 from image_creator.util import get_command, FatalError, MD5
 from image_creator.output.cli import SilentOutput, SimpleOutput, \
                                      OutputWthProgress
-from image_creator.os_type import get_os_class
-from image_creator.kamaki_wrapper import Kamaki
+from image_creator.os_type import os_cls
+from image_creator.kamaki_wrapper import Kamaki, ClientError
 import sys
 import os
 import optparse
@@ -185,17 +185,20 @@ def image_creator():
         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, out)
+        # 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()
@@ -241,33 +244,37 @@ def image_creator():
         disk.destroy_device(dev)
 
         out.output()
-
-        uploaded_obj = ""
-        if options.upload:
-            out.output("Uploading image to pithos:")
-            kamaki = Kamaki(options.account, options.token, out)
-            with open(snapshot) 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()
+        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:
         out.output('cleaning up...')
@@ -283,13 +290,10 @@ def main():
         ret = image_creator()
         sys.exit(ret)
     except FatalError as e:
-        if sys.stdout.isatty():
-            error(e)
-        else:
-            error(e, True, False)
+        colored = sys.stderr.isatty()
+        SimpleOutput(colored).error(e)
         sys.exit(1)
 
-
 if __name__ == '__main__':
     main()