Merge pull request #820 from shtripat/test-cases-fixes

pep8 fixes

tendrl/commons/__init__.py

@@ -4,8 +4,6 @@
 import inspect
 import maps
 import pkgutil
-import sys
-import time
 
 from tendrl.commons import flows
 from tendrl.commons import objects
@@ -274,7 +272,8 @@ def setup_common_objects(self):
             while not NS._int.wclient:
                 try:
                     NS._int.wclient = etcd.Client(**NS._int.etcd_kwargs)
-                    # Wrap etd client's read/write/delete to auto-reconnect all the times
+                    # Wrap etd client's read/write/delete to
+                    # auto-reconnect all the times
                     NS._int.wclient._read = NS._int.wclient.read
                     NS._int.wclient.read = cs_utils.read
                     NS._int.wclient._write = NS._int.wclient.write
@@ -288,7 +287,8 @@ def setup_common_objects(self):
             while not NS._int.client:
                 try:
                     NS._int.client = etcd.Client(**NS._int.etcd_kwargs)
-                    # Wrap etd client's read/write/delete to auto-reconnect all the times
+                    # Wrap etd client's read/write/delete to
+                    # auto-reconnect all the times
                     NS._int.client._read = NS._int.client.read
                     NS._int.client.read = cs_utils.read
                     NS._int.client._write = NS._int.client.write

tendrl/commons/flows/import_cluster/__init__.py

@@ -13,18 +13,6 @@ def __init__(self, *args, **kwargs):
     def run(self):
         if "Node[]" not in self.parameters:
             integration_id = self.parameters['TendrlContext.integration_id']
-            _cluster_import_status = "clusters/%s/import_status" % \
-                                     integration_id
-            _cluster_import_job_id = "clusters/%s/import_job_id" % \
-                                     integration_id
-
-            # If cluster.import_status="failed", allow retries
-            #try:
-            #    NS._int.wclient.delete(_cluster_import_status,
-            #                           prevValue="failed")
-            #    NS._int.wclient.delete(_cluster_import_job_id)
-            #except (etcd.EtcdKeyNotFound, etcd.EtcdCompareFailed):
-            #    pass
 
             _cluster = NS.tendrl.objects.Cluster(
                 integration_id=NS.tendrl_context.integration_id).load()
@@ -54,14 +42,14 @@ def run(self):
                                                "integration_id "
                                                "(%s) not found, cannot "
                                                "import" % integration_id)
-            else:                
+            else:
                 _cluster = NS.tendrl.objects.Cluster(
                     integration_id=NS.tendrl_context.integration_id
                 ).load()
                 _cluster.enable_volume_profiling = self.parameters[
                     'Cluster.enable_volume_profiling']
                 _cluster.save()
-                
+
                 # Try to claim "provisioner/:integration_id" tag
                 try:
                     _tag = "provisioner/%s" % _cluster.integration_id
@@ -81,9 +69,7 @@ def run(self):
                         NS.node_context.save()
                 except etcd.EtcdAlreadyExist:
                     pass
-
 
-
         try:
             super(ImportCluster, self).run()
         except (FlowExecutionFailedError,

tendrl/commons/flows/import_cluster/gluster_help.py

@@ -1,15 +1,11 @@
 import os
-import uuid
 
 import pkg_resources
 from ruamel import yaml
 
-from tendrl.commons.event import Event
-from tendrl.commons.message import Message
-from tendrl.commons.objects.job import Job
 from tendrl.commons.utils import ansible_module_runner
 from tendrl.commons.utils import cmd_utils
-from tendrl.commons.utils import log_utils
+from tendrl.commons.utils import log_utils as logger
 
 
 def import_gluster(parameters):
@@ -32,16 +28,15 @@ def import_gluster(parameters):
     else:
         return False
 
-    Event(
-        Message(
-            job_id=parameters['job_id'],
-            flow_id=parameters['flow_id'],
-            priority="info",
-            publisher=NS.publisher_id,
-            payload={"message": "Installing tendrl-gluster-integration on "
-                                "Node %s" % NS.node_context.fqdn
-                     }
-        )
+    logger.log(
+        "info",
+        NS.publisher_id,
+        {
+            'message': "Installing tendrl-gluster-integration on "
+            "Node %s" % NS.node_context.fqdn
+        },
+        job_id=parameters['job_id'],
+        flow_id=parameters['flow_id'],
     )
 
     try:
@@ -58,48 +53,43 @@ def import_gluster(parameters):
     try:
         out, err = runner.run()
         if out['rc'] != 0:
-            Event(
-                Message(
-                    job_id=parameters['job_id'],
-                    flow_id=parameters['flow_id'],
-                    priority="error",
-                    publisher=NS.publisher_id,
-                    payload={
-                        "message": "Could not install "
-                                   "tendrl-gluster-integration on Node %s"
-                                   "Error: %s" %
-                                   (NS.node_context.fqdn, out['msg'])
-                    }
-                )
-            )
-            return False
-    except ansible_module_runner.AnsibleExecutableGenerationFailed:
-        Event(
-            Message(
+            logger.log(
+                "error",
+                NS.publisher_id,
+                {
+                    "message": "Could not install "
+                    "tendrl-gluster-integration on Node %s"
+                    "Error: %s" %
+                    (NS.node_context.fqdn, out['msg'])
+                },
                 job_id=parameters['job_id'],
                 flow_id=parameters['flow_id'],
-                priority="error",
-                publisher=NS.publisher_id,
-                payload={"message": "Error: Could not install "
-                                    "tendrl-gluster-integration on Node %s" %
-                                    NS.node_context.fqdn
-                         }
             )
-        )
-
-        return False
-
-    Event(
-        Message(
+            return False
+    except ansible_module_runner.AnsibleExecutableGenerationFailed:
+        logger.log(
+            "error",
+            NS.publisher_id,
+            {
+                "message": "Error: Could not install "
+                "tendrl-gluster-integration on Node %s" %
+                NS.node_context.fqdn
+            },
             job_id=parameters['job_id'],
             flow_id=parameters['flow_id'],
-            priority="info",
-            publisher=NS.publisher_id,
-            payload={"message": "Generating configuration for "
-                                "tendrl-gluster-integration on Node %s" %
-                                NS.node_context.fqdn
-                     }
         )
+        return False
+
+    logger.log(
+        "info",
+        NS.publisher_id,
+        {
+            "message": "Generating configuration for "
+            "tendrl-gluster-integration on Node %s" %
+            NS.node_context.fqdn
+        },
+        job_id=parameters['job_id'],
+        flow_id=parameters['flow_id'],
     )
 
     with open(logging_config_file_path + logging_file_name,
@@ -108,15 +98,16 @@ def import_gluster(parameters):
     gluster_integration_tag = NS.compiled_definitions.get_parsed_defs()[
         'namespace.tendrl'
     ]['tags']['tendrl-gluster-integration']
-    config_data = {"etcd_port": int(NS.config.data['etcd_port']),
-                   "etcd_connection": str(NS.config.data['etcd_connection']),
-                   "log_cfg_path": (logging_config_file_path +
-                                    logging_file_name),
-                   "log_level": "DEBUG",
-                   "logging_socket_path": "/var/run/tendrl/message.sock",
-                   "sync_interval": int(NS.config.data['sync_interval']),
-                   "tags": [gluster_integration_tag]
-                   }
+    config_data = {
+        "etcd_port": int(NS.config.data['etcd_port']),
+        "etcd_connection": str(NS.config.data['etcd_connection']),
+        "log_cfg_path": (logging_config_file_path +
+                         logging_file_name),
+        "log_level": "DEBUG",
+        "logging_socket_path": "/var/run/tendrl/message.sock",
+        "sync_interval": int(NS.config.data['sync_interval']),
+        "tags": [gluster_integration_tag]
+    }
     etcd_ca_cert_file = NS.config.data.get("etcd_ca_cert_file")
     etcd_cert_file = NS.config.data.get("etcd_cert_file")
     etcd_key_file = NS.config.data.get("etcd_key_file")
@@ -138,16 +129,15 @@ def import_gluster(parameters):
     with open(_gluster_integration_conf_file_path,
               'w') as outfile:
         yaml.dump(config_data, outfile, default_flow_style=False)
-    Event(
-        Message(
-            job_id=parameters['job_id'],
-            flow_id=parameters['flow_id'],
-            priority="info",
-            publisher=NS.publisher_id,
-            payload={"message": "Running tendrl-gluster-integration on Node "
-                                "%s" % NS.node_context.fqdn
-                     }
-        )
+    logger.log(
+        "info",
+        NS.publisher_id,
+        {
+            "message": "Running tendrl-gluster-integration on Node "
+            "%s" % NS.node_context.fqdn
+        },
+        job_id=parameters['job_id'],
+        flow_id=parameters['flow_id'],
     )
     os.chmod(_gluster_integration_conf_file_path, 0o640)
 
@@ -157,34 +147,30 @@ def import_gluster(parameters):
         )
         err, out, rc = command.run()
         if err:
-            Event(
-                Message(
-                    job_id=parameters['job_id'],
-                    flow_id=parameters['flow_id'],
-                    priority="error",
-                    publisher=NS.publisher_id,
-                    payload={
-                        "message": "Could not enable gluster-integration"
-                        " service. Error: %s" % err
-                    }
-                )
+            logger.log(
+                "error",
+                NS.publisher_id,
+                {
+                    "message": "Could not enable gluster-integration"
+                    " service. Error: %s" % err
+                },
+                job_id=parameters['job_id'],
+                flow_id=parameters['flow_id'],
             )
             return False
 
     cmd = cmd_utils.Command(_cmd)
     err, out, rc = cmd.run()
     if err:
-        Event(
-            Message(
-                job_id=parameters['job_id'],
-                flow_id=parameters['flow_id'],
-                priority="error",
-                publisher=NS.publisher_id,
-                payload={
-                    "message": "Could not start gluster-integration"
-                    " service. Error: %s" % err
-                }
-            )
+        logger.log(
+            "error",
+            NS.publisher_id,
+            {
+                "message": "Could not start gluster-integration"
+                " service. Error: %s" % err
+            },
+            job_id=parameters['job_id'],
+            flow_id=parameters['flow_id'],
         )
         return False
 

tendrl/commons/objects/__init__.py

@@ -51,9 +51,10 @@ def load_definition(self):
                 )
             )
         except KeyError:
-            sys.stdout.write("Load definitions (.yml) for namespace.%s.objects"
-                             ".%s \n" % (self._ns.ns_name,
-                                      self.__class__.__name__))
+            sys.stdout.write(
+                "Load definitions (.yml) for namespace.%s.objects"
+                ".%s \n" % (self._ns.ns_name, self.__class__.__name__)
+            )
         try:
             return self._ns.get_obj_definition(self.__class__.__name__)
         except KeyError as ex:
@@ -127,8 +128,10 @@ def save(self, update=True, ttl=None):
                     )
                 )
             except KeyError:
-                sys.stdout.write("Writing %s to %s \n" % (item['key'],
-                                                       item['value']))
+                sys.stdout.write(
+                    "Writing %s to %s \n" %
+                    (item['key'], item['value'])
+                )
             # convert list, dict (json) to python based on definitions
             _type = self._defs.get("attrs", {}).get(item['name'],
                                                     {}).get("type")
@@ -411,19 +414,26 @@ def load_definition(self):
                 )
             )
         except KeyError:
-            sys.stdout.write("Load definitions (.yml) for "
-                             "namespace.%s.objects.%s."
-                             "atoms.%s \n" % (self._ns.ns_name, self.obj.__name__,
-                                           self.__class__.__name__))
+            sys.stdout.write(
+                "Load definitions (.yml) for "
+                "namespace.%s.objects.%s."
+                "atoms.%s \n" %
+                (self._ns.ns_name, self.obj.__name__,
+                 self.__class__.__name__)
+            )
         try:
-            return self._ns.get_atom_definition(self.obj.__name__,
-                                                self.__class__.__name__)
+            return self._ns.get_atom_definition(
+                self.obj.__name__,
+                self.__class__.__name__
+            )
         except KeyError as ex:
             msg = "Could not find definitions (.yml) for" \
-                  "namespace.%s.objects.%s.atoms.%s" % (self._ns.ns_src,
-                                                        self.obj.__name__,
-                                                        self.__class__.__name__
-                                                        )
+                  "namespace.%s.objects.%s.atoms.%s" % \
+                  (
+                      self._ns.ns_src,
+                      self.obj.__name__,
+                      self.__class__.__name__
+                  )
             try:
                 Event(
                     ExceptionMessage(

tendrl/commons/objects/cluster_node_alert_counters/__init__.py

@@ -13,7 +13,8 @@ def __init__(
         super(ClusterNodeAlertCounters, self).__init__(*args, **kwargs)
         self.warning_count = warn_count
         self.node_id = node_id or NS.node_context.node_id
-        self.integration_id = integration_id or NS.tendrl_context.integration_id
+        self.integration_id = \
+            integration_id or NS.tendrl_context.integration_id
         self.value = 'clusters/{0}/nodes/{1}/alert_counters'
 
     def render(self):

tendrl/commons/objects/node_alert_counters/__init__.py

@@ -15,12 +15,16 @@ def __init__(
         self.value = '/nodes/{0}/alert_counters'
 
     def render(self):
-        self.value = self.value.format(self.node_id or NS.node_context.node_id)
+        self.value = self.value.format(
+            self.node_id or NS.node_context.node_id
+        )
         return super(NodeAlertCounters, self).render()
 
     def save(self, *args, **kwargs):
         if NS.tendrl_context.integration_id:
-            NS.tendrl.objects.ClusterNodeAlertCounters(warn_count=self.warning_count,
-                                                       node_id=self.node_id,
-                                                       integration_id=NS.tendrl_context.integration_id).save()
+            NS.tendrl.objects.ClusterNodeAlertCounters(
+                warn_count=self.warning_count,
+                node_id=self.node_id,
+                integration_id=NS.tendrl_context.integration_id
+            ).save()
         super(NodeAlertCounters, self).save(*args, **kwargs)