From 40333f008c9086c7152c1928b8fe2da76854fcef Mon Sep 17 00:00:00 2001 From: Chmouel Boudjnah Date: Tue, 30 Aug 2011 08:57:49 -0500 Subject: [PATCH] ensure we have auth_url and project_id for !1.0 Make sure we have an auth_url or project_id when API version is not 1.0 --- novaclient/shell.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/novaclient/shell.py b/novaclient/shell.py index 869b8c842..1e91d2647 100644 --- a/novaclient/shell.py +++ b/novaclient/shell.py @@ -158,6 +158,16 @@ class OpenStackComputeShell(object): raise exc.CommandError("You must provide an API key, either" "via --apikey or via" "env[NOVA_API_KEY]") + if options.version and options.version != '1.0': + if not projectid: + raise exc.CommandError("You must provide an projectid, either" + "via --projectid or via" + "env[NOVA_PROJECT_ID") + + if not url: + raise exc.CommandError("You must provide a auth url, either" + "via --url or via" + "env[NOVA_URL") self.cs = self.get_api_class(options.version)(user, apikey, projectid, url)