diff --git a/image_creator/bundle_volume.py b/image_creator/bundle_volume.py
index 215afb27f92969ffbce9974452512b94712d3614..772e5043d070abea089f0c92f21ac54c480c6444 100644
--- a/image_creator/bundle_volume.py
+++ b/image_creator/bundle_volume.py
@@ -304,7 +304,7 @@ class BundleVolume(object):
mpoints = []
for entry in self._read_fstable('/proc/mounts'):
if entry.mpoint.startswith(os.path.abspath(target)):
- mpoints.append(entry.mpoint)
+ mpoints.append(entry.mpoint)
mpoints.sort()
for mpoint in reversed(mpoints):
@@ -336,10 +336,9 @@ class BundleVolume(object):
continue
dirname = mpoint
- basename = ''
found_ancestor = False
while dirname != '/':
- (dirname, basename) = os.path.split(dirname)
+ (dirname, _) = os.path.split(dirname)
if dirname in excluded:
found_ancestor = True
break
diff --git a/image_creator/dialog_menu.py b/image_creator/dialog_menu.py
index 0513f3d60ccfef0351c2ca157f67b730491da26a..2c1d58dfd8a839bda7b7af64726570e92795a73d 100644
--- a/image_creator/dialog_menu.py
+++ b/image_creator/dialog_menu.py
@@ -68,6 +68,7 @@ CONFIGURATION_TASKS = [
("File injection", ["EnforcePersonality"], ["windows", "linux"])
]
+SYSPREP_PARAM_MAXLEN = 20
class MetadataMonitor(object):
"""Monitors image metadata chages"""
@@ -397,9 +398,9 @@ def kamaki_menu(session):
if len(Kamaki.get_clouds()):
default_item = "Cloud"
else:
- default_time = "Add/Edit"
+ default_item = "Add/Edit"
else:
- default_time = "Delete"
+ default_item = "Delete"
elif choice == "Cloud":
default_item = "Cloud"
clouds = Kamaki.get_clouds()
@@ -620,7 +621,7 @@ def exclude_tasks(session):
def sysprep_params(session):
-
+ """Collect the needed sysprep parameters"""
d = session['dialog']
image = session['image']
@@ -635,7 +636,8 @@ def sysprep_params(session):
for name in names:
param = needed[name]
default = available[name] if name in available else ""
- fields.append(("%s: " % param.description, default, param.maxlen))
+ fields.append(("%s: " % param.description, default,
+ SYSPREP_PARAM_MAXLEN))
txt = "Please provide the following system preparation parameters:"
code, output = d.form(txt, height=13, width=WIDTH, form_height=len(fields),
@@ -644,14 +646,13 @@ def sysprep_params(session):
if code in (d.DIALOG_CANCEL, d.DIALOG_ESC):
return False
- sysprep_params = {}
for i in range(len(fields)):
param = needed[names[i]]
if param.validator(output[i]):
image.os.sysprep_params[names[i]] = output[i]
else:
d.msgbox("The value you provided for parameter: %s is not valid" %
- name, width=SMALL_WIDTH)
+ names[i], width=SMALL_WIDTH)
return False
return True
diff --git a/image_creator/dialog_wizard.py b/image_creator/dialog_wizard.py
index b79d2b164989aae60bc5b11566e1ec74b7b32059..cfce374d169037194b0f85dd0edb94772ca2f978 100644
--- a/image_creator/dialog_wizard.py
+++ b/image_creator/dialog_wizard.py
@@ -49,6 +49,7 @@ from image_creator.dialog_util import extract_image, update_background_title, \
PAGE_WIDTH = 70
PAGE_HEIGHT = 10
+SYSPREP_PARAM_MAXLEN = 20
class WizardExit(Exception):
@@ -221,7 +222,7 @@ class WizardFormPage(WizardPage):
field_lenght = len(self.fields())
form_height = field_lenght if field_lenght < PAGE_HEIGHT - 4 \
- else PAGET_HEIGHT - 4
+ else PAGE_HEIGHT - 4
(code, output) = d.form(
self.text, width=PAGE_WIDTH, height=PAGE_HEIGHT,
@@ -343,7 +344,7 @@ def start_wizard(session):
for name in param_names:
text = needed[name].description
default = available[name] if name in available else ""
- fields.append(("%s: " % text, default, needed[name].maxlen))
+ fields.append(("%s: " % text, default, SYSPREP_PARAM_MAXLEN))
return fields
def sysprep_params_validate(answer):
diff --git a/image_creator/os_type/__init__.py b/image_creator/os_type/__init__.py
index 7e6c452ec4183c28d746172ebcab1db718b7cf0b..ddda45ee3c7b09d69e07b31bf44af3d027fe210b 100644
--- a/image_creator/os_type/__init__.py
+++ b/image_creator/os_type/__init__.py
@@ -64,72 +64,61 @@ def os_cls(distro, osfamily):
def add_prefix(target):
def wrapper(self, *args):
prefix = args[0]
- return map(lambda x: prefix + x, target(self, *args))
+ return [prefix + path for path in target(self, *args)]
return wrapper
def sysprep(message, enabled=True, **kwargs):
"""Decorator for system preparation tasks"""
- def wrapper(func):
- func.sysprep = True
- func.enabled = enabled
- func.executed = False
+ def wrapper(method):
+ method.sysprep = True
+ method.enabled = enabled
+ method.executed = False
for key, val in kwargs.items():
- setattr(func, key, val)
+ setattr(method, key, val)
- @wraps(func)
+ @wraps(method)
def inner(self, print_message=True):
if print_message:
self.out.output(message)
- return func(self)
+ return method(self)
return inner
-
return wrapper
-def add_sysprep_param(name, descr, maxlen, default=None,
- validator=lambda x: True):
- """Decorator for init that adds the definition for a system preparation
- parameter
+def add_sysprep_param(name, default, description, validator=lambda x: True):
+ """Decorator for __init__ that adds the definition for a system preparation
+ parameter in an instance of a os_type class
"""
- def wrapper(func):
-
- @wraps(func)
+ def wrapper(init):
+ @wraps(init)
def inner(self, *args, **kwargs):
-
- func(self, *args, **kwargs)
-
- if not hasattr(self, 'needed_sysprep_params'):
- self.needed_sysprep_params = {}
- getattr(self, 'needed_sysprep_params')[name] = \
- self.SysprepParam(descr, maxlen, validator)
+ init(self, *args, **kwargs)
+ self.needed_sysprep_params[name] = \
+ self.SysprepParam(default, description, validator)
return inner
-
return wrapper
def del_sysprep_param(name):
- """Decorator for init that deletes a previously added sysprep parameter
- definition .
+ """Decorator for __init__ that deletes a previously added sysprep parameter
+ definition from an instance of a os_type class.
"""
def wrapper(func):
-
@wraps(func)
def inner(self, *args, **kwargs):
- del self.needed_sysprep_params[nam]
+ del self.needed_sysprep_params[name]
func(self, *args, **kwargs)
-
return inner
-
return wrapper
class OSBase(object):
"""Basic operating system class"""
- SysprepParam = namedtuple('SysprepParam', 'description maxlen validator')
+ SysprepParam = namedtuple('SysprepParam', 'default description validator')
def __init__(self, image, **kargs):
self.image = image
@@ -138,10 +127,12 @@ class OSBase(object):
self.g = image.g
self.out = image.out
+ self.needed_sysprep_params = {}
self.sysprep_params = \
kargs['sysprep_params'] if 'sysprep_params' in kargs else {}
self.meta = {}
+ self.mounted = False
def collect_metadata(self):
"""Collect metadata about the OS"""
@@ -202,8 +193,8 @@ class OSBase(object):
"""Print enabled and disabled system preparation operations."""
syspreps = self.list_syspreps()
- enabled = filter(lambda x: x.enabled, syspreps)
- disabled = filter(lambda x: not x.enabled, syspreps)
+ enabled = [sysprep for sysprep in syspreps if sysprep.enabled]
+ disabled = [sysprep for sysprep in syspreps if not sysprep.enabled]
wrapper = textwrap.TextWrapper()
wrapper.subsequent_indent = '\t'
@@ -233,16 +224,14 @@ class OSBase(object):
self.out.output("Needed system preparation parameters:")
- params = self.needed_sysprep_params()
-
- if len(params) == 0:
+ if len(self.needed_sysprep_params) == 0:
self.out.output("(none)")
return
- for param in params:
+ for name, param in self.needed_sysprep_params.items():
self.out.output("\t%s (%s): %s" %
- (param.description, param.name,
- self.sysprep_params[param.name] if param.name in
+ (param.description, name,
+ self.sysprep_params[name] if name in
self.sysprep_params else "(none)"))
def do_sysprep(self):
@@ -254,8 +243,7 @@ class OSBase(object):
self.out.output('Preparing system for image creation:')
- tasks = self.list_syspreps()
- enabled = filter(lambda x: x.enabled, tasks)
+ enabled = [task for task in self.list_syspreps() if task.enabled]
size = len(enabled)
cnt = 0
diff --git a/image_creator/os_type/freebsd.py b/image_creator/os_type/freebsd.py
index 94b6a7c56a61d3dcc5c481f82314479c3ed3e46e..7efd56ec684c0a37eea50708123a5dfe68f4c6b8 100644
--- a/image_creator/os_type/freebsd.py
+++ b/image_creator/os_type/freebsd.py
@@ -110,7 +110,7 @@ class Freebsd(Unix):
# libguestfs can't handle correct freebsd partitions on a GUID
# Partition Table. We have to do the translation to linux device names
# ourselves
- guid_device = re.compile('^/dev/((?:ada)|(?:vtbd))(\d+)p(\d+)$')
+ guid_device = re.compile(r'^/dev/((?:ada)|(?:vtbd))(\d+)p(\d+)$')
mopts = "ufstype=ufs2,%s" % ('ro' if readonly else 'rw')
for mp, dev in self._mountpoints():
diff --git a/image_creator/os_type/linux.py b/image_creator/os_type/linux.py
index 5ff99aa6822c30e8298ba6202b060e6acbb77008..71ce109e0825540e4999961f2b1a4ce535d4025f 100644
--- a/image_creator/os_type/linux.py
+++ b/image_creator/os_type/linux.py
@@ -310,7 +310,7 @@ class Linux(Unix):
def _get_passworded_users(self):
"""Returns a list of non-locked user accounts"""
users = []
- regexp = re.compile('(\S+):((?:!\S+)|(?:[^!*]\S+)|):(?:\S*:){6}')
+ regexp = re.compile(r'(\S+):((?:!\S+)|(?:[^!*]\S+)|):(?:\S*:){6}')
for line in self.g.cat('/etc/shadow').splitlines():
match = regexp.match(line)
diff --git a/image_creator/os_type/unix.py b/image_creator/os_type/unix.py
index 9fe2c50794762a6105f9b2651e9a38e6b04896ba..504f2adb590f1da2aeccec75fb28bc355c3e390b 100644
--- a/image_creator/os_type/unix.py
+++ b/image_creator/os_type/unix.py
@@ -35,8 +35,6 @@
"""This module hosts OS-specific code common to all Unix-like OSs."""
-import re
-
from image_creator.os_type import OSBase, sysprep
@@ -87,7 +85,7 @@ class Unix(OSBase):
return True
- @sysprep('Removing files u)nder /var/cache')
+ @sysprep('Removing files under /var/cache')
def cleanup_cache(self):
"""Remove all regular files under /var/cache"""
diff --git a/image_creator/os_type/windows.py b/image_creator/os_type/windows.py
index b93e539467950495751eb22b004d4fa9816b9d6c..5110e306e94c1a2a45f957434ca45167e82851e7 100644
--- a/image_creator/os_type/windows.py
+++ b/image_creator/os_type/windows.py
@@ -37,7 +37,7 @@
Windows OSs."""
from image_creator.os_type import OSBase, sysprep, add_sysprep_param
-from image_creator.util import FatalError, check_guestfs_version, get_command
+from image_creator.util import FatalError, check_guestfs_version
from image_creator.winexe import WinEXE, WinexeTimeout
import hivex
@@ -108,7 +108,7 @@ KMS_CLIENT_SETUP_KEYS = {
class Windows(OSBase):
"""OS class for Windows"""
- @add_sysprep_param('password', 'Image Administrator Password', 20)
+ @add_sysprep_param('password', None, 'Image Administrator Password')
def __init__(self, image, **kargs):
super(Windows, self).__init__(image, **kargs)
@@ -127,6 +127,7 @@ class Windows(OSBase):
assert self.system_drive
self.product_name = self.g.inspect_get_product_name(self.root)
+ self.syspreped = False
@sysprep('Disabling IPv6 privacy extensions')
def disable_ipv6_privacy_extensions(self):
@@ -202,7 +203,7 @@ class Windows(OSBase):
return
self._guest_exec(
- "cscript \Windows\system32\slmgr.vbs /ipk %s" % setup_key)
+ r"cscript \Windows\system32\slmgr.vbs /ipk %s" % setup_key)
@sysprep('Shrinking the last filesystem')
def shrink(self):
@@ -273,8 +274,8 @@ class Windows(OSBase):
raise FatalError("Image is already syspreped!")
txt = "System preparation parameter: `%s' is needed but missing!"
- for param in self.needed_sysprep_params:
- if param not in self.sysprep_params:
+ for name, param in self.needed_sysprep_params.items():
+ if name not in self.sysprep_params:
raise FatalError(txt % param)
self.mount(readonly=False)
@@ -298,9 +299,9 @@ class Windows(OSBase):
# guestfs_shutdown which is the prefered way to shutdown the backend
# process was introduced in version 1.19.16
if check_guestfs_version(self.g, 1, 19, 16) >= 0:
- ret = self.g.shutdown()
+ self.g.shutdown()
else:
- ret = self.g.kill_subprocess()
+ self.g.kill_subprocess()
self.out.success('done')
@@ -329,22 +330,19 @@ class Windows(OSBase):
self.out.output('Preparing system for image creation:')
tasks = self.list_syspreps()
- enabled = filter(lambda x: x.enabled, tasks)
+ enabled = [task for task in tasks if task.enabled]
size = len(enabled)
# Make sure shrink runs in the end, before ms sysprep
- enabled = filter(lambda x: self.sysprep_info(x).name != 'shrink',
- enabled)
+ enabled = [task for task in enabled if
+ self.sysprep_info(task).name != 'shrink']
- shrink_enabled = False
if len(enabled) != size:
enabled.append(self.shrink)
- shrink_enabled = True
# Make sure the ms sysprep is the last task to run if it is enabled
- enabled = filter(
- lambda x: self.sysprep_info(x).name != 'microsoft-sysprep',
- enabled)
+ enabled = [task for task in enabled if
+ self.sysprep_info(task).name != 'microsoft-sysprep']
ms_sysprep_enabled = False
if len(enabled) != size:
@@ -397,7 +395,7 @@ class Windows(OSBase):
def _wait_vm_boot(self, vm, fname, msg):
"""Wait until a message appears on a file or the vm process dies"""
- for i in range(BOOT_TIMEOUT):
+ for _ in range(BOOT_TIMEOUT):
time.sleep(1)
with open(fname) as f:
for line in f:
@@ -425,9 +423,9 @@ class Windows(OSBase):
path = "%s/system32/config/%s" % (systemroot, regfile)
try:
path = self.g.case_sensitive_path(path)
- except RuntimeError as e:
+ except RuntimeError as error:
raise FatalError("Unable to retrieve registry file: %s. Reason: %s"
- % (regfile, str(e)))
+ % (regfile, str(error)))
return path
def _enable_os_monitor(self):
@@ -634,11 +632,10 @@ class Windows(OSBase):
def _get_users(self):
"""Returns a list of users found in the images"""
- path = self._registry_file_path('SAM')
samfd, sam = tempfile.mkstemp()
try:
os.close(samfd)
- self.g.download(path, sam)
+ self.g.download(self._registry_file_path('SAM'), sam)
h = hivex.Hivex(sam)
@@ -701,7 +698,7 @@ class Windows(OSBase):
log.file.write(stdout)
finally:
log.close()
- self.out.output("failed! See: `%' for the full output" % log.name)
+ self.out.output("failed! See: `%s' for the full output" % log.name)
if i < CONNECTION_RETRIES - 1:
self.out.output("Retrying ...", False)
raise FatalError("Connection to the VM failed after %d retries" %
@@ -743,12 +740,13 @@ class _VM(object):
self.serial = serial
def random_mac():
+ """creates a random mac address"""
mac = [0x00, 0x16, 0x3e,
random.randint(0x00, 0x7f),
random.randint(0x00, 0xff),
random.randint(0x00, 0xff)]
- return ':'.join(map(lambda x: "%02x" % x, mac))
+ return ':'.join(['%02x' % x for x in mac])
# Use ganeti's VNC port range for a random vnc port
self.display = random.randint(11000, 14999) - 5900
@@ -780,7 +778,6 @@ class _VM(object):
if self.isalive():
self.process.kill()
self.process.wait()
- self.out.output("timed-out")
raise FatalError("VM destroy timed-out")
signal.signal(signal.SIGALRM, handler)