Consolidate waiters methods
Currently, for each resource there is a waiter method.
The code is almost the same in all waiter methods.
This patch suggests proposes to consolidate these methods.
Change-Id: I92f4628051731a9f7e05404b48a96d2ed27a855b
diff --git a/manila_tempest_tests/share_exceptions.py b/manila_tempest_tests/share_exceptions.py
index 9466afe..efa61b5 100644
--- a/manila_tempest_tests/share_exceptions.py
+++ b/manila_tempest_tests/share_exceptions.py
@@ -17,33 +17,34 @@
class ShareBuildErrorException(exceptions.TempestException):
- message = "Share %(share_id)s failed to build and is in ERROR status"
+ message = "Share %(resource_id)s failed to build and is in ERROR status"
class ShareInstanceBuildErrorException(exceptions.TempestException):
- message = "Share instance %(id)s failed to build and is in ERROR status"
+ message = ("Share instance %(resource_id)s failed to build and is in "
+ "ERROR status")
class ShareGroupBuildErrorException(exceptions.TempestException):
- message = ("Share group %(share_group_id)s failed to build and "
+ message = ("Share group %(resource_id)s failed to build and "
"is in ERROR status")
class AccessRuleBuildErrorException(exceptions.TempestException):
- message = "Share's rule with id %(rule_id)s is in ERROR status"
+ message = "Share's rule with id %(resource_id)s is in ERROR status"
class SnapshotBuildErrorException(exceptions.TempestException):
- message = "Snapshot %(snapshot_id)s failed to build and is in ERROR status"
+ message = "Snapshot %(resource_id)s failed to build and is in ERROR status"
class SnapshotInstanceBuildErrorException(exceptions.TempestException):
- message = ("Snapshot instance %(id)s failed to build and is in "
+ message = ("Snapshot instance %(resource_id)s failed to build and is in "
"ERROR status.")
class ShareGroupSnapshotBuildErrorException(exceptions.TempestException):
- message = ("Share Group Snapshot %(share_group_snapshot_id)s failed "
+ message = ("Share Group Snapshot %(resource_id)s failed "
"to build and is in ERROR status")