openstack
/
python-novaclient
Code Issues Proposed changes

Merge pull request #99 from chmouel/no-auth-url-error 

ensure we have auth_url and project_id fo the CLI when using API greater 1.0
This commit is contained in:
Josh Kearney 2011-09-01 13:02:54 -07:00
parent 3f22be9b26 40333f008c
commit 3507905a7a
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
novaclient/shell.py
View File

@ -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)