openstack/deb-python-magnumclient
Code Issues Proposed changes

Merge "Default version should be v1 in magnum"

Browse Source
This commit is contained in:
Jenkins
2015-01-16 05:21:12 +00:00
committed by Gerrit Code Review
parent c21d043367 b02a4dacc5
commit b25dfc61f8
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
magnumclient/shell.py
View File

@@ -52,10 +52,10 @@ from magnumclient.openstack.common.apiclient import auth
from magnumclient.openstack.common.apiclient import exceptions as exc
from magnumclient.openstack.common import cliutils
from magnumclient.v1 import client
from magnumclient.v1 import shell as shell_api
from magnumclient.v1 import shell as shell_v1
from magnumclient import version
DEFAULT_API_VERSION = 'api'
DEFAULT_API_VERSION = '1'
DEFAULT_ENDPOINT_TYPE = 'publicURL'
DEFAULT_SERVICE_TYPE = 'container'
@@ -329,11 +329,10 @@ class OpenStackMagnumShell(object):
try:
actions_module = {
'api': shell_api,
'1': shell_v1,
}[version]
except KeyError:
actions_module = shell_api
actions_module = shell_api
actions_module = shell_v1
self._find_actions(subparsers, actions_module)
self._find_actions(subparsers, self)