openstack
/
python-novaclient
Code Issues Proposed changes

Merge "Set "latest" as default compute api version"

This commit is contained in:
Jenkins 2015-08-07 13:33:31 +00:00 committed by Gerrit Code Review
parent 59abce6462 02889515a5
commit e89e5fe1bb
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
novaclient/shell.py
View File

@ -51,7 +51,7 @@ from novaclient.i18n import _
from novaclient.openstack.common import cliutils
from novaclient import utils
DEFAULT_OS_COMPUTE_API_VERSION = "2"
DEFAULT_OS_COMPUTE_API_VERSION = "2.latest"
DEFAULT_NOVA_ENDPOINT_TYPE = 'publicURL'
DEFAULT_NOVA_SERVICE_TYPE = "compute"

12
novaclient/tests/unit/test_shell.py
View File

@ -33,26 +33,30 @@ from novaclient.tests.unit import utils
FAKE_ENV = {'OS_USERNAME': 'username',
'OS_PASSWORD': 'password',
'OS_TENANT_NAME': 'tenant_name',
'OS_AUTH_URL': 'http://no.where/v2.0'}
'OS_AUTH_URL': 'http://no.where/v2.0',
'OS_COMPUTE_API_VERSION': '2'}
FAKE_ENV2 = {'OS_USER_ID': 'user_id',
'OS_PASSWORD': 'password',
'OS_TENANT_ID': 'tenant_id',
'OS_AUTH_URL': 'http://no.where/v2.0'}
'OS_AUTH_URL': 'http://no.where/v2.0',
'OS_COMPUTE_API_VERSION': '2'}
FAKE_ENV3 = {'OS_USER_ID': 'user_id',
'OS_PASSWORD': 'password',
'OS_TENANT_ID': 'tenant_id',
'OS_AUTH_URL': 'http://no.where/v2.0',
'NOVA_ENDPOINT_TYPE': 'novaURL',
'OS_ENDPOINT_TYPE': 'osURL'}
'OS_ENDPOINT_TYPE': 'osURL',
'OS_COMPUTE_API_VERSION': '2'}
FAKE_ENV4 = {'OS_USER_ID': 'user_id',
'OS_PASSWORD': 'password',
'OS_TENANT_ID': 'tenant_id',
'OS_AUTH_URL': 'http://no.where/v2.0',
'NOVA_ENDPOINT_TYPE': 'internal',
'OS_ENDPOINT_TYPE': 'osURL'}
'OS_ENDPOINT_TYPE': 'osURL',
'OS_COMPUTE_API_VERSION': '2'}
def _create_ver_list(versions):