openstack/python-magnumclient
Code Issues Proposed changes

Revert "Parameter format change for ca-show and ca-sign"

Browse Source 
This reverts commit 329120822298080588464f8a72c049e119404931.
The commit changed CLI options without following the OpenStack
deprecation policy. We'd better to revert it for now.

Change-Id: Ie22f075d29f98e222eda033b452896bedd213662
This commit is contained in:
Hongbin Lu 2016-04-16 14:03:53 +00:00
parent 3291208222
commit c87008017a
2 changed files with 12 additions and 10 deletions

10
magnumclient/tests/v1/test_certificates_shell.py

@ -27,7 +27,7 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
mockbay.status = "CREATE_COMPLETE" mockbay.status = "CREATE_COMPLETE"
mock_bay_get.return_value = mockbay mock_bay_get.return_value = mockbay
self._test_arg_success('ca-show ' self._test_arg_success('ca-show '
'xxx') '--bay xxx')
self.assertTrue(mock_cert_get.called) self.assertTrue(mock_cert_get.called)
@mock.patch('os.path.isfile') @mock.patch('os.path.isfile')
@ -44,8 +44,8 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
file_mock = mock.mock_open(read_data=fake_csr) file_mock = mock.mock_open(read_data=fake_csr)
with mock.patch.object(certificates_shell, 'open', file_mock): with mock.patch.object(certificates_shell, 'open', file_mock):
self._test_arg_success('ca-sign ' self._test_arg_success('ca-sign '
'xxx ' '--csr path/csr.pem '
'path/csr.pem') '--bay xxx')
self.assertTrue(mock_cert_create.called) self.assertTrue(mock_cert_create.called)
@mock.patch('os.path.isfile') @mock.patch('os.path.isfile')
@ -62,8 +62,8 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
file_mock = mock.mock_open(read_data=fake_csr) file_mock = mock.mock_open(read_data=fake_csr)
with mock.patch.object(certificates_shell, 'open', file_mock): with mock.patch.object(certificates_shell, 'open', file_mock):
self._test_arg_success('ca-sign ' self._test_arg_success('ca-sign '
'xxx ' '--csr path/csr.pem '
'path/csr.pem') '--bay xxx')
mock_isfile.assert_called_once_with('path/csr.pem') mock_isfile.assert_called_once_with('path/csr.pem')
self.assertFalse(file_mock.called) self.assertFalse(file_mock.called)
self.assertFalse(mock_cert_create.called) self.assertFalse(mock_cert_create.called)

12
magnumclient/v1/certificates_shell.py

@ -21,7 +21,8 @@ def _show_cert(certificate):
print(certificate.pem) print(certificate.pem)
@utils.arg('bay', @utils.arg('--bay',
required=True,
metavar='<bay>', metavar='<bay>',
help='ID or name of the bay.') help='ID or name of the bay.')
def do_ca_show(cs, args): def do_ca_show(cs, args):
@ -35,12 +36,13 @@ def do_ca_show(cs, args):
_show_cert(cert) _show_cert(cert)
@utils.arg('bay', @utils.arg('--csr',
metavar='<bay>',
help='ID or name of the bay.')
@utils.arg('csr',
metavar='<csr>', metavar='<csr>',
help='File path of the csr file to send to Magnum to get signed.') help='File path of the csr file to send to Magnum to get signed.')
@utils.arg('--bay',
required=True,
metavar='<bay>',
help='ID or name of the bay.')
def do_ca_sign(cs, args): def do_ca_sign(cs, args):
"""Generate the CA certificate for a bay.""" """Generate the CA certificate for a bay."""
bay = cs.bays.get(args.bay) bay = cs.bays.get(args.bay)