openstack/python-novaclient
Code Issues Proposed changes

Updated --version to default to NOVA_VERSION

Browse Source
This commit is contained in:
Brian Lamar 2011-08-04 10:52:53 -04:00
parent c0c5f6925e
commit ea4b625e7b
4 changed files with 9 additions and 12 deletions

4
novaclient/shell.py

@ -75,8 +75,8 @@ class OpenStackComputeShell(object):
help='Defaults to env[NOVA_URL].') help='Defaults to env[NOVA_URL].')
parser.add_argument('--version', parser.add_argument('--version',
default='1.0', default=env('NOVA_VERSION'),
help='Accepts 1.0 or 1.1, defaults to 1.0') help='Accepts 1.0 or 1.1, defaults to env[NOVA_VERSION].')
return parser return parser

3
tests/test_shell.py

@ -16,7 +16,8 @@ class ShellTest(utils.TestCase):
fake_env = { fake_env = {
'NOVA_USERNAME': 'username', 'NOVA_USERNAME': 'username',
'NOVA_API_KEY': 'password', 'NOVA_API_KEY': 'password',
'NOVA_PROJECT_ID': 'project_id' 'NOVA_PROJECT_ID': 'project_id',
'NOVA_VERSION': '1.0',
} }
_old_env, os.environ = os.environ, fake_env.copy() _old_env, os.environ = os.environ, fake_env.copy()

8
tests/v1_0/test_shell.py

@ -16,7 +16,8 @@ class ShellTest(utils.TestCase):
os.environ = { os.environ = {
'NOVA_USERNAME': 'username', 'NOVA_USERNAME': 'username',
'NOVA_API_KEY': 'password', 'NOVA_API_KEY': 'password',
'NOVA_PROJECT_ID': 'project_id' 'NOVA_PROJECT_ID': 'project_id',
'NOVA_VERSION': '1.0',
} }
self.shell = OpenStackComputeShell() self.shell = OpenStackComputeShell()
@ -26,10 +27,7 @@ class ShellTest(utils.TestCase):
os.environ = self.old_environment os.environ = self.old_environment
def run_command(self, cmd): def run_command(self, cmd):
command = ['--version=1.0'] self.shell.main(cmd.split())
command.extend(cmd.split())
print command
self.shell.main(command)
def assert_called(self, method, url, body=None): def assert_called(self, method, url, body=None):
return self.shell.cs.assert_called(method, url, body) return self.shell.cs.assert_called(method, url, body)

6
tests/v1_1/test_shell.py

@ -18,6 +18,7 @@ class ShellTest(utils.TestCase):
'NOVA_USERNAME': 'username', 'NOVA_USERNAME': 'username',
'NOVA_API_KEY': 'password', 'NOVA_API_KEY': 'password',
'NOVA_PROJECT_ID': 'project_id', 'NOVA_PROJECT_ID': 'project_id',
'NOVA_VERSION': '1.1',
} }
self.shell = OpenStackComputeShell() self.shell = OpenStackComputeShell()
@ -27,10 +28,7 @@ class ShellTest(utils.TestCase):
os.environ = self.old_environment os.environ = self.old_environment
def run_command(self, cmd): def run_command(self, cmd):
command = ['--version=1.1'] self.shell.main(cmd.split())
command.extend(cmd.split())
print command
self.shell.main(command)
def assert_called(self, method, url, body=None): def assert_called(self, method, url, body=None):
return self.shell.cs.assert_called(method, url, body) return self.shell.cs.assert_called(method, url, body)