openstack/python-glanceclient
Code Issues Proposed changes

Remove deprecated ssl options

Browse Source 
Old deprecated ssl options block the new keystoneauth parser get the
correct value, should be removed.

Change-Id: Ie080f9a8fa7f4407b1fcbb7fb7c763152c5ec295
Closes-Bug: 1697163
This commit is contained in:
Rui Yuan Dou 2017-08-08 11:06:39 +08:00
parent c0677ad425
commit 8e862b6018
4 changed files with 10 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/source/cli/details.rst
View File

@ -23,8 +23,7 @@ glance usage
usage: glance [--version] [-d] [-v] [--get-schema] [-f] usage: glance [--version] [-d] [-v] [--get-schema] [-f]
[--os-image-url OS_IMAGE_URL] [--os-image-url OS_IMAGE_URL]
[--os-image-api-version OS_IMAGE_API_VERSION] [--os-image-api-version OS_IMAGE_API_VERSION]
[--profile HMAC_KEY] [--key-file OS_KEY] [--ca-file OS_CACERT] [--profile HMAC_KEY] [--os-region-name OS_REGION_NAME]
[--cert-file OS_CERT] [--os-region-name OS_REGION_NAME]
[--os-auth-token OS_AUTH_TOKEN] [--os-auth-token OS_AUTH_TOKEN]
[--os-service-type OS_SERVICE_TYPE] [--os-service-type OS_SERVICE_TYPE]
[--os-endpoint-type OS_ENDPOINT_TYPE] [--insecure] [--os-endpoint-type OS_ENDPOINT_TYPE] [--insecure]
@ -101,15 +100,6 @@ glance optional arguments
profiling will not be triggered even if osprofiler is profiling will not be triggered even if osprofiler is
enabled on server side. Defaults to ``env[OS_PROFILE]``. enabled on server side. Defaults to ``env[OS_PROFILE]``.
``--key-file OS_KEY``
**DEPRECATED!** Use --os-key.
``--ca-file OS_CACERT``
**DEPRECATED!** Use --os-cacert.
``--cert-file OS_CERT``
**DEPRECATED!** Use --os-cert.
``--os-region-name OS_REGION_NAME`` ``--os-region-name OS_REGION_NAME``
Defaults to ``env[OS_REGION_NAME]``. Defaults to ``env[OS_REGION_NAME]``.

12
glanceclient/shell.py
View File

@ -61,18 +61,6 @@ class OpenStackImagesShell(object):
parser.set_defaults(os_project_id=utils.env( parser.set_defaults(os_project_id=utils.env(
'OS_PROJECT_ID', 'OS_TENANT_ID')) 'OS_PROJECT_ID', 'OS_TENANT_ID'))
parser.add_argument('--key-file',
dest='os_key',
help='DEPRECATED! Use --os-key.')
parser.add_argument('--ca-file',
dest='os_cacert',
help='DEPRECATED! Use --os-cacert.')
parser.add_argument('--cert-file',
dest='os_cert',
help='DEPRECATED! Use --os-cert.')
parser.add_argument('--os_tenant_id', parser.add_argument('--os_tenant_id',
help=argparse.SUPPRESS) help=argparse.SUPPRESS)

11
glanceclient/tests/unit/test_shell.py
View File

@ -307,17 +307,6 @@ class ShellTest(testutils.TestCase):
self.assertEqual('mycert', args.os_cert) self.assertEqual('mycert', args.os_cert)
self.assertEqual('mykey', args.os_key) self.assertEqual('mykey', args.os_key)
# make sure we get the same thing with --cert-file and --key-file
args = ('--os-image-api-version 2 '
'--cert-file mycertfile '
'--key-file mykeyfile image-list')
glance_shell = openstack_shell.OpenStackImagesShell()
glance_shell.main(args.split())
assert mock_versioned_client.called
((api_version, args), kwargs) = mock_versioned_client.call_args
self.assertEqual('mycertfile', args.os_cert)
self.assertEqual('mykeyfile', args.os_key)
@mock.patch('glanceclient.v1.client.Client') @mock.patch('glanceclient.v1.client.Client')
def test_no_auth_with_token_and_image_url_with_v1(self, v1_client): def test_no_auth_with_token_and_image_url_with_v1(self, v1_client):
# test no authentication is required if both token and endpoint url # test no authentication is required if both token and endpoint url

9
releasenotes/notes/rm-deprecate-ssl-opts-c88225a4ba2285ad.yaml Normal file
View File

@ -0,0 +1,9 @@
---
other:
- |
The following options to the command line client, which have been
deprecated since Icehouse, have been removed:
* ``--key-file`` (use ``--os-key`` instead)
* ``--ca-file`` (use ``--os-cacert`` instead)
* ``--cert-file`` (use ``--os-cert`` instead)