openstack
/
deb-python-magnumclient
Code Issues Proposed changes

Make --cluster option required for ca-rotate 

Otherwise, the following error with be shown:

$ magnum ca-rotate
ERROR: 'Namespace' object has no attribute 'bay'

Change-Id: I48c19ad585d3bcb863c5432fae6a6c8af358a21b
Closes-Bug: #1677393
This commit is contained in:
Jason Dunsmore 2017-03-30 13:30:29 -05:00
parent 06f9c511ca
commit c723129ae3
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
magnumclient/tests/v1/test_certificates_shell.py
View File

@ -156,3 +156,15 @@ class ShellTest(shell_test_base.TestCommandLineArgument):
expected_args = {}
expected_args['cluster_uuid'] = mockcluster.uuid
mock_rotate_ca.assert_called_once_with(**expected_args)
@mock.patch('magnumclient.v1.clusters.ClusterManager.get')
@mock.patch('magnumclient.v1.certificates.CertificateManager.rotate_ca')
def test_ca_rotate_no_cluster_arg(self, mock_rotate_ca, mock_cluster_get):
_error_msg = [
(".*(error: argument --cluster is required|" # py27 compatibility
"error: the following arguments are required: --cluster).*"),
".*Try 'magnum help ca-rotate' for more information.*"
]
self._test_arg_failure('ca-rotate', _error_msg)
mock_rotate_ca.assert_not_called()
mock_cluster_get.assert_not_called()

5
magnumclient/v1/certificates_shell.py
View File

@ -87,13 +87,14 @@ def do_ca_sign(cs, args):
@utils.arg('--cluster',
required=False,
required=True,
metavar='<cluster>',
help=_('ID or name of the cluster.'))
def do_ca_rotate(cs, args):
"""Rotate the CA certificate for a bay or cluster to revoke access."""
cluster = cs.clusters.get(args.cluster)
opts = {
'cluster_uuid': _get_target_uuid(cs, args)
'cluster_uuid': cluster.uuid
}
cs.certificates.rotate_ca(**opts)