openstack/python-openstackclient
Code Issues Proposed changes

Merge "Set default network api to 2.0 instead of 2"

Browse Source
This commit is contained in:
Jenkins 2015-11-12 00:08:57 +00:00 committed by Gerrit Code Review
commit 6611f3781b
1 changed files with 3 additions and 1 deletions

4
openstackclient/network/client.py

@ -18,10 +18,11 @@ from openstackclient.common import utils
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
DEFAULT_API_VERSION = '2' DEFAULT_API_VERSION = '2.0'
API_VERSION_OPTION = 'os_network_api_version' API_VERSION_OPTION = 'os_network_api_version'
API_NAME = "network" API_NAME = "network"
API_VERSIONS = { API_VERSIONS = {
"2.0": "neutronclient.v2_0.client.Client",
"2": "neutronclient.v2_0.client.Client", "2": "neutronclient.v2_0.client.Client",
} }
# Translate our API version to auth plugin version prefix # Translate our API version to auth plugin version prefix
@ -32,6 +33,7 @@ API_VERSION_MAP = {
NETWORK_API_TYPE = 'network' NETWORK_API_TYPE = 'network'
NETWORK_API_VERSIONS = { NETWORK_API_VERSIONS = {
'2.0': 'openstackclient.api.network_v2.APIv2',
'2': 'openstackclient.api.network_v2.APIv2', '2': 'openstackclient.api.network_v2.APIv2',
} }