From 4fc30376ed6a74c3c5e8e136f0b69d2539b13670 Mon Sep 17 00:00:00 2001 From: Joe Keen Date: Fri, 17 Apr 2015 13:46:03 -0600 Subject: [PATCH] Moved CLI specific error message from ksclient to shell Change-Id: I3edccf0bd146eda975b6c773ac5f5ef592768457 --- monascaclient/ksclient.py | 9 +-------- monascaclient/shell.py | 12 +++++++++++- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/monascaclient/ksclient.py b/monascaclient/ksclient.py index 7be3220..a659064 100644 --- a/monascaclient/ksclient.py +++ b/monascaclient/ksclient.py @@ -72,14 +72,7 @@ class KSClient(object): if self._keystone.project_id: self._token = self._keystone.auth_token else: - raise exc.CommandError("User does not have a default project. " - "You must provide a project id using " - "--os-project-id or via env[OS_PROJECT_ID], " - "or you must provide a project name using " - "--os-project-name or via env[OS_PROJECT_NAME] " - "and a domain using --os-domain-name, via " - "env[OS_DOMAIN_NAME], using --os-domain-id or " - "via env[OS_DOMAIN_ID]") + raise exc.CommandError("No project id or project name.") return self._token @property diff --git a/monascaclient/shell.py b/monascaclient/shell.py index 91c38f3..265fadc 100644 --- a/monascaclient/shell.py +++ b/monascaclient/shell.py @@ -331,7 +331,17 @@ class MonascaShell(object): if args.os_auth_token: token = args.os_auth_token else: - token = _ksclient.token + try: + token = _ksclient.token + except exc.CommandError: + raise exc.CommandError("User does not have a default project. " + "You must provide a project id using " + "--os-project-id or via env[OS_PROJECT_ID], " + "or you must provide a project name using " + "--os-project-name or via env[OS_PROJECT_NAME] " + "and a domain using --os-domain-name, via " + "env[OS_DOMAIN_NAME], using --os-domain-id or " + "via env[OS_DOMAIN_ID]") kwargs = { 'token': token,