openstack/python-zunclient
Code Issues Proposed changes

Corrected wrong env variable in --zun-api-version

Browse Source 
Closes-Bug: #1656308

Change-Id: Ia5ea417ba1994dbf29b7315659b8c8131a41ec06
This commit is contained in:
prameswar 2017-01-13 03:51:49 +00:00
parent dc4bc1aa72
commit 1d960f2ef7
2 changed files with 5 additions and 5 deletions

6
zunclient/shell.py

@ -327,10 +327,10 @@ class OpenStackZunShell(object):
parser.add_argument('--zun-api-version', parser.add_argument('--zun-api-version',
metavar='<zun-api-ver>', metavar='<zun-api-ver>',
default=cliutils.env( default=cliutils.env(
'MAGNUM_API_VERSION', 'ZUN_API_VERSION',
default=DEFAULT_API_VERSION), default=DEFAULT_API_VERSION),
help='Accepts "api", ' help='Accepts "api", '
'defaults to env[MAGNUM_API_VERSION].') 'defaults to env[ZUN_API_VERSION].')
parser.add_argument('--zun_api_version', parser.add_argument('--zun_api_version',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
@ -351,7 +351,7 @@ class OpenStackZunShell(object):
help=argparse.SUPPRESS) help=argparse.SUPPRESS)
parser.add_argument('--insecure', parser.add_argument('--insecure',
default=cliutils.env('MAGNUMCLIENT_INSECURE', default=cliutils.env('ZUNCLIENT_INSECURE',
default=False), default=False),
action='store_true', action='store_true',
help="Do not verify https connections") help="Do not verify https connections")

4
zunclient/v1/containers.py

@ -52,8 +52,8 @@ class ContainerManager(base.Manager):
1) limit > 0, the maximum number of containers to return. 1) limit > 0, the maximum number of containers to return.
2) limit == 0, return the entire list of containers. 2) limit == 0, return the entire list of containers.
3) limit param is NOT specified (None), the number of items 3) limit param is NOT specified (None), the number of items
returned respect the maximum imposed by the Magnum API returned respect the maximum imposed by the ZUN API
(see Magnum's api.max_limit option). (see Zun's api.max_limit option).
:param sort_key: Optional, field used for sorting. :param sort_key: Optional, field used for sorting.