Applying Flake-8 rules

diff --git a/lib/create_terraform/app.py b/lib/create_terraform/app.py
index 5a106495d73207e39ba646ce6a62296d0ccb5fa9..ec5fb1b0e1a0fffee1b0f0938b80b4c4c2627e64 100644 (file)
--- a/lib/create_terraform/app.py
+++ b/lib/create_terraform/app.py
@@ -42,7 +42,7 @@ from .xlate import __base_dir__ as __xlate_base_dir__
 from .xlate import __mo_file__ as __xlate_mo_file__
 from .xlate import XLATOR, LOCALE_DIR, DOMAIN
 
-__version__ = '1.3.4'
+__version__ = '1.3.5'
 LOG = logging.getLogger(__name__)
 
 SIGNAL_NAMES = {
@@ -551,7 +551,8 @@ class CrTfApplication(BaseApplication):
             prompt = self.colored(_("User password of {!r}").format(
                 self.handler.vsphere_user), 'AQUA')
             item = _('Password for user {u!r} of vSphere {n} on {h!r}').format(
-                u=self.handler.vsphere_user, n=vsphere_name, h=self.config.vsphere[vsphere_name].host)
+                u=self.handler.vsphere_user, n=vsphere_name,
+                h=self.config.vsphere[vsphere_name].host)
             item = self.colored(item, 'AQUA')
             self.handler.vsphere_password = self.get_secret(prompt=prompt, item_name=item)
             if not self.handler.vsphere_password:

diff --git a/lib/create_terraform/handler/__init__.py b/lib/create_terraform/handler/__init__.py
index a249a7cd8928202154a4f8263528f0fb8c353c5e..fd9c8df31aa7e1c9ca2919744b58793506a1002a 100644 (file)
--- a/lib/create_terraform/handler/__init__.py
+++ b/lib/create_terraform/handler/__init__.py
@@ -46,7 +46,7 @@ from ..errors import AbortExecution
 
 from ..xlate import XLATOR
 
-__version__ = '4.0.0'
+__version__ = '4.0.1'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -86,8 +86,8 @@ class CreateTerraformHandler(
 
     steps = (
         'init', 'vmw-init', 'read-yaml', 'pdns-zones', 'vmw-test', 'collect-folders',
-        'vmw-clusters', 'vmw-datastores', 'vmw-ds-clusters', 'vmw-vms', 'vmw-networks', 'vmw-templates',
-        'validate-yaml', 'validate-storage', 'validate-iface', 'validate-dns',
+        'vmw-clusters', 'vmw-datastores', 'vmw-ds-clusters', 'vmw-vms', 'vmw-networks',
+        'vmw-templates', 'validate-yaml', 'validate-storage', 'validate-iface', 'validate-dns',
         'perform-dns', 'project-dir', 'tf-files', 'ensure-vmw-folders',
     )
     step_desc = {

diff --git a/lib/create_terraform/handler/files.py b/lib/create_terraform/handler/files.py
index 8850a33c7aeb7bc3bcba61ae9d245c664c6f0f0b..a3b651f4c2a754e64c01e4a536031ed26ed37e22 100644 (file)
--- a/lib/create_terraform/handler/files.py
+++ b/lib/create_terraform/handler/files.py
@@ -28,7 +28,7 @@ from ..errors import AbortExecution
 
 from ..xlate import XLATOR
 
-__version__ = '0.5.3'
+__version__ = '0.5.4'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -511,16 +511,15 @@ class CrTfHandlerFilesMixin():
             }}
 
             ''').format(
-                cid=self.config.vsphere_tag_cat_os_id,
-                cname=self.config.vsphere_tag_cat_os_name,
-                cdesc=self.config.vsphere_tag_cat_os_desc,
-                tid=self.config.vsphere_tag_os_rhel_id,
-                tname=self.config.vsphere_tag_os_rhel_name,
-                tdesc=self.config.vsphere_tag_os_rhel_desc,
-            )
+            cid=self.config.vsphere_tag_cat_os_id,
+            cname=self.config.vsphere_tag_cat_os_name,
+            cdesc=self.config.vsphere_tag_cat_os_desc,
+            tid=self.config.vsphere_tag_os_rhel_id,
+            tname=self.config.vsphere_tag_os_rhel_name,
+            tdesc=self.config.vsphere_tag_os_rhel_desc,
+        )
         content += tpl
 
-
         if self.simulate:
             if self.verbose:
                 print(content)
@@ -899,8 +898,9 @@ class CrTfHandlerFilesMixin():
             content += self._only_update_packages(vm)
 
         # ## Unregistring from RedHat Subscription Management
-        cmd = ('if [ -x /sbin/subscription-manager ] ; then '
-                '/sbin/subscription-manager unregister --no-progress-messages; fi || true')
+        cmd = (
+            'if [ -x /sbin/subscription-manager ] ; then '
+            '/sbin/subscription-manager unregister --no-progress-messages; fi || true')
         if vm.is_rhel:
             content += '  provisioner "remote-exec" {\n'
             content += '    inline = [\n'
@@ -987,7 +987,7 @@ class CrTfHandlerFilesMixin():
             command_list.append("/tmp/update-networkmanager -v")
             command_list.append("rm -fv /tmp/update-networkmanager")
         command_list.append("rm -fv /tmp/functions.rc")
-        commands=',\n      '.join(map( lambda x: '"' + x + '"', command_list))
+        commands = ',\n      '.join(map(lambda x: '"' + x + '"', command_list))
 
         content = textwrap.indent(textwrap.dedent('''\
         provisioner "local-exec" {{
@@ -1058,7 +1058,7 @@ class CrTfHandlerFilesMixin():
             command_list.append("/tmp/update-networkmanager -v")
             command_list.append("rm -fv /tmp/update-networkmanager")
         command_list.append("rm -fv /tmp/functions.rc")
-        commands=',\n      '.join(map( lambda x: '"' + x + '"', command_list))
+        commands = ',\n      '.join(map(lambda x: '"' + x + '"', command_list))
 
         content = textwrap.indent(textwrap.dedent('''\
         provisioner "remote-exec" {{

diff --git a/lib/create_terraform/handler/vmware.py b/lib/create_terraform/handler/vmware.py
index 262ed981cbb107ac9d29f6588533dfec5e3ccdca..9b06821d89e7c6f6833a701b287964b3bdd575f1 100644 (file)
--- a/lib/create_terraform/handler/vmware.py
+++ b/lib/create_terraform/handler/vmware.py
@@ -33,7 +33,7 @@ from ..slim_vm import SlimVm
 
 from ..xlate import XLATOR
 
-__version__ = '0.2.1'
+__version__ = '0.2.2'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -159,10 +159,13 @@ class CrTfHandlerVmwMixin():
                 }
                 show_params = copy.copy(params)
 
+                vs_port = self.config.vsphere[vsphere_name].port
+                vs_host = self.config.vsphere[vsphere_name].host
+                vs_dc = self.config.vsphere[vsphere_name].dc
+
                 connect_info = VSPhereConfigInfo(
                     appname=self.appname, verbose=self.verbose, base_dir=self.base_dir,
-                    host=self.config.vsphere[vsphere_name].host, port=self.config.vsphere[vsphere_name].port,
-                    dc=self.config.vsphere[vsphere_name].dc, user=self.vsphere_user,
+                    host=vs_host, port=vs_port, dc=vs_dc, user=self.vsphere_user,
                     password=self.vsphere_password, initialized=True)
 
                 params['connect_info'] = connect_info
@@ -296,7 +299,8 @@ class CrTfHandlerVmwMixin():
             self.incr_verbosity()
 
         for vsphere_name in self.vsphere:
-            LOG.debug(_("Searching for datastore clusters in VSPhere {!r} ...").format(vsphere_name))
+            LOG.debug(_("Searching for datastore clusters in VSPhere {!r} ...").format(
+                vsphere_name))
             self.vsphere[vsphere_name].get_ds_clusters()
             nr_total += len(self.vsphere[vsphere_name].ds_clusters.keys())
 
@@ -498,7 +502,6 @@ class CrTfHandlerVmwMixin():
             msg += "\n" + pp(self.config.vsphere[vsphere_name].used_templates)
             LOG.debug(msg)
 
-            found_template = False
             for template_name in self.config.vsphere[vsphere_name].used_templates:
 
                 if template_name in self.vsphere_templates[vsphere_name]:
@@ -507,7 +510,8 @@ class CrTfHandlerVmwMixin():
                 LOG.debug(_("Searching for template {t!r} in VSPhere {v!r} ...").format(
                     t=template_name, v=vsphere_name))
                 re_vm = re.compile(r'^' + re.escape(template_name) + r'$', re.IGNORECASE)
-                vm_list = self.vsphere[vsphere_name].get_vms(re_vm, as_obj=True, stop_at_found=True)
+                vm_list = self.vsphere[vsphere_name].get_vms(
+                    re_vm, as_obj=True, stop_at_found=True)
                 if vm_list:
                     vm = vm_list[0]
                     tname = vm.name.lower()
@@ -524,7 +528,8 @@ class CrTfHandlerVmwMixin():
             for vsphere_name in self.vsphere_templates:
                 out_dict[vsphere_name] = {}
                 for tname in self.vsphere_templates[vsphere_name]:
-                    out_dict[vsphere_name][tname] = self.vsphere_templates[vsphere_name][tname].as_dict()
+                    t_dict = self.vsphere_templates[vsphere_name][tname].as_dict()
+                    out_dict[vsphere_name][tname] = t_dict
             msg += "\n" + pp(out_dict)
             LOG.debug(msg)
 

diff --git a/lib/create_terraform/slim_vm.py b/lib/create_terraform/slim_vm.py
index 6774a4e7ba5a5af103a33e65f111fe74843c920f..424b0a9fbb6d33a7a7421a5abf83acead7102730 100644 (file)
--- a/lib/create_terraform/slim_vm.py
+++ b/lib/create_terraform/slim_vm.py
@@ -16,7 +16,7 @@ from fb_tools.obj import FbGenericBaseObject
 
 from .xlate import XLATOR
 
-__version__ = '0.1.0'
+__version__ = '0.1.1'
 LOG = logging.getLogger(__name__)
 
 _ = XLATOR.gettext
@@ -147,6 +147,7 @@ class SlimVm(FbGenericBaseObject):
 
         return True
 
+
 # =============================================================================
 
 if __name__ == '__main__':

diff --git a/lib/create_terraform/terraform/disk.py b/lib/create_terraform/terraform/disk.py
index 4b45b8ce6df47641d7fef7bb8cc379fe6dc38653..f5f912b06e96d7148837dcd5b62485f76f85e543 100644 (file)
--- a/lib/create_terraform/terraform/disk.py
+++ b/lib/create_terraform/terraform/disk.py
@@ -27,11 +27,11 @@ from fb_tools.obj import FbBaseObject
 from ..config import CrTfConfiguration
 
 from ..errors import TerraformVmDefinitionError
-from ..errors import TerraformVmTooManyDisksError
+# from ..errors import TerraformVmTooManyDisksError
 
 from ..xlate import XLATOR
 
-__version__ = '1.3.0'
+__version__ = '1.3.1'
 
 LOG = logging.getLogger(__name__)
 
@@ -222,7 +222,8 @@ class TerraformDiskDict(MutableMapping, FbBaseObject):
     A dictionary containing TerraformDisk objects.
     It works like a dict.
     i.e.:
-    * disks = TerraformDiskDict(TerraformDisk(name='disk0',unit_number=0, root=True, size_gb=48, ...))
+    * disks = TerraformDiskDict(TerraformDisk(
+                    name='disk0',unit_number=0, root=True, size_gb=48, ...))
     * disks[0] returns the first TerraformDisk object in the list of sorted disk names
     * disks['disk0'] returns the TerraformDisk object with the name 'disk0'.
     """
@@ -258,6 +259,7 @@ class TerraformDiskDict(MutableMapping, FbBaseObject):
 
         if disk.name != key:
             msg = self.msg_key_not_name.format(k=key, n=disk.name)
+            raise KeyError(msg)
 
         self._map[key] = disk
 
@@ -421,7 +423,7 @@ class TerraformDiskDict(MutableMapping, FbBaseObject):
             raise TypeError(self.msg_invalid_disk_type.format(default.__class__.__name__))
 
         if key in self._map:
-            return self._map[unit_number]
+            return self._map[key]
 
         self._set_item(key, default)
         return default

diff --git a/lib/create_terraform/terraform/vm.py b/lib/create_terraform/terraform/vm.py
index 3668bf717197811d4913a6867220f38b94314b22..d22179b6229c79018b51e94b4ea5340a44d95131 100644 (file)
--- a/lib/create_terraform/terraform/vm.py
+++ b/lib/create_terraform/terraform/vm.py
@@ -38,7 +38,7 @@ from .disk import TerraformDisk, TerraformDiskDict
 
 from .interface import TerraformInterface
 
-__version__ = '1.7.1'
+__version__ = '1.7.2'
 
 LOG = logging.getLogger(__name__)
 
@@ -305,7 +305,8 @@ class TerraformVm(HandlingObject):
 
     # -------------------------------------------------------------------------
     @classmethod
-    def _apply_vmdef2vm(cls, vm, key, value, verbose=0, appname=None, base_dir=None):
+    def _apply_vmdef2vm(                                                        # noqa: C901
+            cls, vm, key, value, verbose=0, appname=None, base_dir=None):
 
         if verbose > 3:
             LOG.debug(_("Evaluating key {k!r}: {v}").format(k=key, v=value))
@@ -503,7 +504,7 @@ class TerraformVm(HandlingObject):
 
     # -------------------------------------------------------------------------
     @classmethod
-    def _apply_puppet_vmdef2vm(cls, vm, key, value, verbose=0):
+    def _apply_puppet_vmdef2vm(cls, vm, key, value, verbose=0):                 # noqa: C901
 
         if key.lower() == 'puppet' and isinstance(value, Mapping):
             for (p_key, p_value) in value.items():