Improving un-manage log messages

bugzilla: 1645221 tendrl-bug-id: Tendrl#1078 Signed-off-by: GowthamShanmugasundaram <[email protected]>
GowthamShanmugam · May 14, 2019 · b8171ca · b8171ca
1 parent 0ede4e7
commit b8171ca
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/tendrl/commons/flows/unmanage_cluster/__init__.py b/tendrl/commons/flows/unmanage_cluster/__init__.py
@@ -34,7 +34,7 @@ def run(self):
                 "(job_id: %s) (integration_id: %s) " %
                 (
                     _cluster.current_job['job_id'],
-                    _cluster.integration_id
+                    _cluster.short_name
                 )
             )
 

diff --git a/tendrl/commons/objects/cluster/atoms/set_cluster_unmanaged/__init__.py b/tendrl/commons/objects/cluster/atoms/set_cluster_unmanaged/__init__.py
@@ -10,20 +10,20 @@ def __init__(self, *args, **kwargs):
 
     def run(self):
         integration_id = self.parameters['TendrlContext.integration_id']
-        logger.log(
-            "info",
-            NS.get("publisher_id", None),
-            {
-                "message": "Setting cluster %s is_managed to \"no\":" %
-                           integration_id
-            },
-            job_id=self.parameters['job_id'],
-            flow_id=self.parameters['flow_id']
-        )
         try:
             _cluster = NS.tendrl.objects.Cluster(
                 integration_id=integration_id
             ).load()
+            logger.log(
+                "info",
+                NS.get("publisher_id", None),
+                {
+                    "message": "Setting cluster %s is_managed to \"no\":" %
+                               _cluster.short_name
+                },
+                job_id=self.parameters['job_id'],
+                flow_id=self.parameters['flow_id']
+            )
             _cluster.is_managed = "no"
             _cluster.save()
         except etcd.EtcdKeyNotFound:

diff --git a/tendrl/commons/objects/node/flows/stop_services/__init__.py b/tendrl/commons/objects/node/flows/stop_services/__init__.py
@@ -17,7 +17,7 @@ def run(self):
                 NS.publisher_id,
                 {
                     "message": "Stopping service %s on node %s" %
-                               (service, NS.node_context.node_id)
+                               (service, NS.node_context.fqdn)
                 },
                 job_id=self.parameters['job_id'],
                 flow_id=self.parameters['flow_id'],
@@ -39,7 +39,7 @@ def run(self):
                         NS.publisher_id,
                         {
                             "message": "%s not running on "
-                            "%s" % (service, NS.node_context.node_id)
+                            "%s" % (service, NS.node_context.fqdn)
                         },
                         job_id=self.parameters['job_id'],
                         flow_id=self.parameters['flow_id'],
@@ -57,7 +57,7 @@ def run(self):
                         "message": "Could not stop %s"
                         " service on %s. Error: %s" % (
                             service,
-                            NS.node_context.node_id,
+                            NS.node_context.fqdn,
                             err
                         )
                     },
@@ -76,7 +76,7 @@ def run(self):
                         "message": "Could not disable %s"
                         " service on %s. Error: %s" % (
                             service,
-                            NS.node_context.node_id,
+                            NS.node_context.fqdn,
                             err
                         )
                     },