summaryrefslogtreecommitdiff
path: root/trove/common/exception.py
diff options
context:
space:
mode:
authorTrevor McCasland <TM2086@att.com>2016-06-17 08:12:15 -0500
committerPeter Stachowski <peter@tesora.com>2016-06-21 19:08:43 +0000
commit74804acd3a843c2133db8d87dab2c947909f60eb (patch)
tree6b7e2c4a8acb0d299d4ce5402bda53354a7ecf55 /trove/common/exception.py
parent4f888ddfa38e1002f12a2b3ef24b833a32f3f1d4 (diff)
downloadtrove-74804acd3a843c2133db8d87dab2c947909f60eb.tar.gz
Use correct message for missing default datastore
The error message when trying to create an instance with a non-existent default datastore was misleading: ERROR: Datastore 'mysql' cannot be found. (HTTP 400) This is now more descriptive: ERROR: Please specify datastore. Default datastore 'mysql' cannot be found. (HTTP 400) If no default datastore is defined, the message is: ERROR: Please specify datastore. No default datastore is defined. (HTTP 400) If the user specified a datastore, then the regular error message is returned. A new exception DatastoreDefaultDatastoreNotDefined was created and DatastoreDefaultDatastoreNotFound modified to take 'datastore' as an argument. Change-Id: I0b7856864bfecfe3173e42cf098ad759ec8334a2 Closes-Bug: #1331408
Diffstat (limited to 'trove/common/exception.py')
-rw-r--r--trove/common/exception.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/trove/common/exception.py b/trove/common/exception.py
index 8b624552..d5eeb5d2 100644
--- a/trove/common/exception.py
+++ b/trove/common/exception.py
@@ -144,7 +144,13 @@ class DatastoreVersionInactive(TroveError):
class DatastoreDefaultDatastoreNotFound(TroveError):
message = _("Please specify datastore. Default datastore "
- "cannot be found.")
+ "'%(datastore)s' cannot be found.")
+
+
+class DatastoreDefaultDatastoreNotDefined(TroveError):
+
+ message = _("Please specify datastore. No default datastore "
+ "is defined.")
class DatastoreDefaultVersionNotFound(TroveError):