Fix typos in var names

[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 b9fd4e0..fc06ff9 100644 (file)
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -31,8 +31,10 @@
 # interpreted as representing official policies, either expressed
 # or implied, of GRNET S.A.
 
+from image_creator.util import output, FatalError
+
+import textwrap
 import re
-from clint.textui import indent, puts
 
 
 def add_prefix(target):
@@ -42,12 +44,86 @@ def add_prefix(target):
     return wrapper
 
 
+def sysprep(enabled=True):
+    def wrapper(func):
+        func.sysprep = True
+        func.enabled = enabled
+        return func
+    return wrapper
+
+
 class OSBase(object):
     """Basic operating system class"""
+
     def __init__(self, rootdev, ghandler):
         self.root = rootdev
         self.g = ghandler
 
+    def _is_sysprep(self, obj):
+        return getattr(obj, 'sysprep', False) and callable(obj)
+
+    def list_syspreps(self):
+
+        objs = [getattr(self, name) for name in dir(self) \
+            if not name.startswith('_')]
+
+        enabled = [x for x in objs if self._is_sysprep(x) and x.enabled]
+        disabled = [x for x in objs if self._is_sysprep(x) and not x.enabled]
+
+        return enabled, disabled
+
+    def _sysprep_change_status(self, name, status):
+
+        error_msg = "Syprep operation %s does not exist for %s" % \
+                (name, self.__class__.__name__)
+
+        method_name = name.replace('-', '_')
+        method = None
+        try:
+            method = getattr(self, method_name)
+        except AttributeError:
+            raise FatalError(error_msg)
+
+        if not self._is_sysprep(method):
+            raise FatalError(error_msg)
+
+        setattr(method.im_func, 'enabled', status)
+
+    def enable_sysprep(self, name):
+        """Enable a system preperation operation"""
+        self._sysprep_change_status(name, True)
+
+    def disable_sysprep(self, name):
+        """Disable a system preperation operation"""
+        self._sysprep_change_status(name, False)
+
+    def print_syspreps(self):
+        """Print enabled and disabled system preperation operations."""
+
+        enabled, disabled = self.list_syspreps()
+
+        wrapper = textwrap.TextWrapper()
+        wrapper.subsequent_indent = '\t'
+        wrapper.initial_indent = '\t'
+
+        output("Enabled system preperation operations:")
+        if len(enabled) == 0:
+            output("(none)")
+        else:
+            for sysprep in enabled:
+                name = sysprep.__name__.replace('_', '-')
+                descr = wrapper.fill(sysprep.__doc__)
+                output('    %s:\n%s\n' % (name, descr))
+
+        output("Disabled system preperation operations:")
+        if len(disabled) == 0:
+            output("(none)")
+        else:
+            for sysprep in disabled:
+                name = sysprep.__name__.replace('_', '-')
+                descr = wrapper.fill(sysprep.__doc__)
+                output('    %s:\n%s\n' % (name, descr))
+
     @add_prefix
     def ls(self, directory):
         """List the name of all files under a directory"""
@@ -110,36 +186,18 @@ class OSBase(object):
 
         return meta
 
-    def data_cleanup(self):
-        """Cleanup sensitive data out of the OS image."""
-
-        puts('Cleaning up sensitive data out of the OS image:')
-
-        is_cleanup = lambda x: x.startswith('data_cleanup_') and \
-                                                    callable(getattr(self, x))
-        tasks = [getattr(self, x) for x in dir(self) if is_cleanup(x)]
-        size = len(tasks)
-        cnt = 0
-        for task in tasks:
-            cnt += 1
-            puts(('(%d/%d)' % (cnt, size)).ljust(7), False)
-            task()
-        puts()
-
-    def sysprep(self):
+    def do_sysprep(self):
         """Prepere system for image creation."""
 
-        puts('Preparing system for image creation:')
+        output('Preparing system for image creation:')
 
-        is_sysprep = lambda x: x.startswith('sysprep_') and \
-                                                    callable(getattr(self, x))
-        tasks = [getattr(self, x) for x in dir(self) if is_sysprep(x)]
+        tasks, _ = self.list_syspreps()
         size = len(tasks)
         cnt = 0
         for task in tasks:
             cnt += 1
-            puts(('(%d/%d)' % (cnt, size)).ljust(7), False)
+            output(('(%d/%d)' % (cnt, size)).ljust(7), False)
             task()
-        puts()
+        output()
 
 # vim: set sta sts=4 shiftwidth=4 sw=4 et ai :