Fix a bug introduced in 4e58b51b

[snf-image-creator] / image_creator / os_type / __init__.py

diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 1383807..6fe1336 100644 (file)
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -31,12 +31,27 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
-from image_creator.util import output, FatalError
+from image_creator.util import FatalError
 
 import textwrap
 import re
 
 
+def os_cls(distro, osfamily):
+    module = None
+    classname = None
+    try:
+        module = __import__("image_creator.os_type.%s"
+            % distro, fromlist=['image_creator.os_type'])
+        classname = distro.capitalize()
+    except ImportError:
+        module = __import__("image_creator.os_type.%s"
+            % osfamily, fromlist=['image_creator.os_type'])
+        classname = osfamily.capitalize()
+
+    return getattr(module, classname)
+
+
 def add_prefix(target):
     def wrapper(self, *args):
         prefix = args[0]
@@ -55,9 +70,17 @@ def sysprep(enabled=True):
 class OSBase(object):
     """Basic operating system class"""
 
-    def __init__(self, rootdev, ghandler):
+    def __init__(self, rootdev, ghandler, output):
         self.root = rootdev
         self.g = ghandler
+        self.out = output
+
+        # Collect metadata about the OS
+        self.meta = {}
+        self.meta['ROOT_PARTITION'] = "%d" % self.g.part_to_partnum(self.root)
+        self.meta['OSFAMILY'] = self.g.inspect_get_type(self.root)
+        self.meta['OS'] = self.g.inspect_get_distro(self.root)
+        self.meta['DESCRIPTION'] = self.g.inspect_get_product_name(self.root)
 
     def _is_sysprep(self, obj):
         return getattr(obj, 'sysprep', False) and callable(obj)
@@ -105,24 +128,25 @@ class OSBase(object):
         wrapper = textwrap.TextWrapper()
         wrapper.subsequent_indent = '\t'
         wrapper.initial_indent = '\t'
+        wrapper.width = 72
 
-        output("Enabled system preperation operations:")
+        self.out.output("Enabled system preperation operations:")
         if len(enabled) == 0:
-            output("(none)")
+            self.out.output("(none)")
         else:
             for sysprep in enabled:
                 name = sysprep.__name__.replace('_', '-')
-                descr = wrapper.fill(sysprep.__doc__)
-                output('    %s:\n%s\n' % (name, descr))
+                descr = wrapper.fill(textwrap.dedent(sysprep.__doc__))
+                self.out.output('    %s:\n%s\n' % (name, descr))
 
-        output("Disabled system preperation operations:")
+        self.out.output("Disabled system preperation operations:")
         if len(disabled) == 0:
-            output("(none)")
+            self.out.output("(none)")
         else:
             for sysprep in disabled:
                 name = sysprep.__name__.replace('_', '-')
-                descr = wrapper.fill(sysprep.__doc__)
-                output('    %s:\n%s\n' % (name, descr))
+                descr = wrapper.fill(textwrap.dedent(sysprep.__doc__))
+                self.out.output('    %s:\n%s\n' % (name, descr))
 
     @add_prefix
     def ls(self, directory):
@@ -176,28 +200,18 @@ class OSBase(object):
             if has_ftype(f, ftype):
                 action(full_path)
 
-    def get_metadata(self):
-        """Returns some descriptive metadata about the OS."""
-        meta = {}
-        meta['ROOT_PARTITION'] = "%d" % self.g.part_to_partnum(self.root)
-        meta['OSFAMILY'] = self.g.inspect_get_type(self.root)
-        meta['OS'] = self.g.inspect_get_distro(self.root)
-        meta['DESCRIPTION'] = self.g.inspect_get_product_name(self.root)
-
-        return meta
-
     def do_sysprep(self):
         """Prepere system for image creation."""
 
-        output('Preparing system for image creation:')
+        self.out.output('Preparing system for image creation:')
 
-        tasks, _ = self.list_sysprep()
+        tasks, _ = self.list_syspreps()
         size = len(tasks)
         cnt = 0
         for task in tasks:
             cnt += 1
-            output(('(%d/%d)' % (cnt, size)).ljust(7), False)
+            self.out.output(('(%d/%d)' % (cnt, size)).ljust(7), False)
             task()
-        output()
+        self.out.output()
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :