diff options
| author | Rui Yuan Dou <rydou@fiberhome.com> | 2017-08-08 11:06:39 +0800 |
|---|---|---|
| committer | Rui Yuan Dou <rydou@fiberhome.com> | 2018-01-17 08:50:57 +0800 |
| commit | 8e862b6018404117263e817a896728e344858d94 (patch) | |
| tree | 4d1ed4e9c8644a4afd1a2ddfde1db9a1b6f34a3f /glanceclient | |
| parent | c0677ad425e40d80d54f9d82786f60cf88eeeb42 (diff) | |
| download | python-glanceclient-8e862b6018404117263e817a896728e344858d94.tar.gz | |
Remove deprecated ssl options
Old deprecated ssl options block the new keystoneauth parser get the
correct value, should be removed.
Change-Id: Ie080f9a8fa7f4407b1fcbb7fb7c763152c5ec295
Closes-Bug: 1697163
Diffstat (limited to 'glanceclient')
| -rw-r--r-- | glanceclient/shell.py | 12 | ||||
| -rw-r--r-- | glanceclient/tests/unit/test_shell.py | 11 |
2 files changed, 0 insertions, 23 deletions
diff --git a/glanceclient/shell.py b/glanceclient/shell.py index 416d173..3dfa14a 100644 --- a/glanceclient/shell.py +++ b/glanceclient/shell.py @@ -61,18 +61,6 @@ class OpenStackImagesShell(object): parser.set_defaults(os_project_id=utils.env( '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', help=argparse.SUPPRESS) diff --git a/glanceclient/tests/unit/test_shell.py b/glanceclient/tests/unit/test_shell.py index 5e59be1..898a9eb 100644 --- a/glanceclient/tests/unit/test_shell.py +++ b/glanceclient/tests/unit/test_shell.py @@ -307,17 +307,6 @@ class ShellTest(testutils.TestCase): self.assertEqual('mycert', args.os_cert) 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') 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 |