x/osops-tools-monitoring
Code Issues Proposed changes

oschecks/utils: update novaclient to use 2.1 version

Browse Source 
Make sure we use the latest version of novaclient when testing nova-api.

Change-Id: Ic277d97d87c7d8460c8a05e8a7898b8cc9007ff5
This commit is contained in:
Emilien Macchi
2015-12-11 09:54:00 -05:00
parent c786c2146c
commit 32ede0eca8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
monitoring-for-openstack/oschecks/utils.py
View File

@@ -120,8 +120,8 @@ class Nova(object):
self.nova.parser = self.nova.get_base_parser() self.nova.parser = self.nova.get_base_parser()
self.add_argument = self.nova.parser.add_argument self.add_argument = self.nova.parser.add_argument
def setup(self, api_version='1.1'): def setup(self):
from novaclient import client from novaclient.client import Client
(options, args) = self.nova.parser.parse_known_args(self.base_argv) (options, args) = self.nova.parser.parse_known_args(self.base_argv)
if options.help: if options.help:
options.command = None options.command = None
@@ -130,9 +130,9 @@ class Nova(object):
auth_token = None auth_token = None
if options.os_auth_token and options.os_endpoint: if options.os_auth_token and options.os_endpoint:
auth_token = options.os_auth_token auth_token = options.os_auth_token
if options.os_compute_api_version: api_version = '2.1'
api_version = options.os_compute_api_version nova_client = Client(
client = client.get_client_class(api_version)( api_version,
options.os_username, options.os_username,
options.os_password, options.os_password,
options.os_tenant_name, options.os_tenant_name,
@@ -143,7 +143,7 @@ class Nova(object):
cacert=options.os_cacert, cacert=options.os_cacert,
insecure=options.insecure, insecure=options.insecure,
timeout=options.timeout) timeout=options.timeout)
return options, args, client return options, args, nova_client
class Glance(object): class Glance(object):