From 49268243ba11b8cb8c1510ffb2eea28943f5cb3b Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Tue, 22 Sep 2020 16:18:09 +0200
Subject: [PATCH] Improve logging

---
 zaza/openstack/charm_tests/cinder_backup/tests.py |  8 ++++----
 zaza/openstack/utilities/openstack.py             | 13 ++++++-------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/zaza/openstack/charm_tests/cinder_backup/tests.py b/zaza/openstack/charm_tests/cinder_backup/tests.py
index 7d3442e..1cdd887 100644
--- a/zaza/openstack/charm_tests/cinder_backup/tests.py
+++ b/zaza/openstack/charm_tests/cinder_backup/tests.py
@@ -63,7 +63,7 @@ class CinderBackupTest(test_utils.OpenStackBaseTest):
             self.cinder_client.volumes,
             vol_new.id,
             expected_status="available",
-            msg="Volume status wait")
+            msg="Extended volume")
 
     def test_410_cinder_vol_create_backup_delete_restore_pool_inspect(self):
         """Create, backup, delete, restore a ceph-backed cinder volume.
@@ -99,7 +99,7 @@ class CinderBackupTest(test_utils.OpenStackBaseTest):
             wait_iteration_max_time=180,
             stop_after_attempt=30,
             expected_status='available',
-            msg='Volume status wait')
+            msg='ceph-backed cinder volume')
 
         # Backup the volume
         vol_backup = self.cinder_client.backups.create(
@@ -111,7 +111,7 @@ class CinderBackupTest(test_utils.OpenStackBaseTest):
             wait_iteration_max_time=180,
             stop_after_attempt=30,
             expected_status='available',
-            msg='Volume status wait')
+            msg='Backup volume')
         # Delete the volume
         openstack_utils.delete_volume(self.cinder_client, cinder_vol.id)
         # Restore the volume
@@ -122,7 +122,7 @@ class CinderBackupTest(test_utils.OpenStackBaseTest):
             wait_iteration_max_time=180,
             stop_after_attempt=15,
             expected_status='available',
-            msg='Backup status wait')
+            msg='Restored backup volume')
         # Delete the backup
         openstack_utils.delete_volume_backup(
             self.cinder_client,
diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 35972c6..35e188d 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -1896,14 +1896,13 @@ def _resource_reaches_status(resource, resource_id,
     :param expected_status: status to expect resource to reach
     :type expected_status: str
     :param msg: text to identify purpose in logging
-    :type msy: str
+    :type msg: str
     :raises: AssertionError
     """
     resource_status = resource.get(resource_id).status
-    logging.info(resource_status)
-    assert resource_status == expected_status, (
-        "Resource in {} state, waiting for {}" .format(resource_status,
-                                                       expected_status,))
+    logging.info("{}: resource {} in {} state, waiting for {}".format(
+        msg, resource_id, resource_status, expected_status))
+    assert resource_status == expected_status
 
 
 def resource_reaches_status(resource,
@@ -1965,8 +1964,8 @@ def _resource_removed(resource, resource_id, msg="resource"):
     :raises: AssertionError
     """
     matching = [r for r in resource.list() if r.id == resource_id]
-    logging.debug("Resource {} still present".format(resource_id))
-    assert len(matching) == 0, "Resource {} still present".format(resource_id)
+    logging.debug("{}: resource {} still present".format(msg, resource_id))
+    assert len(matching) == 0
 
 
 def resource_removed(resource,