openstack
/
python-magnumclient
Code Issues Proposed changes

Merge "Now `name` is a positional argument in cluster creation"

This commit is contained in:
Zuul 2017-10-03 17:28:38 +00:00 committed by Gerrit Code Review
parent 8a39691c10 e9f17af05c
commit b9f9e1c529
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnumclient/osc/v1/cluster_templates.py
View File

@ -71,7 +71,7 @@ class CreateClusterTemplate(command.ShowOne):
parser = super(CreateClusterTemplate, self).get_parser(prog_name) parser = super(CreateClusterTemplate, self).get_parser(prog_name)
parser.add_argument( parser.add_argument(
'--name', 'name',
metavar='<name>', metavar='<name>',
help=_('Name of the cluster template to create.')) help=_('Name of the cluster template to create.'))
parser.add_argument( parser.add_argument(

2
magnumclient/osc/v1/clusters.py
View File

@ -86,7 +86,7 @@ class CreateCluster(command.Command):
default=1, default=1,
metavar='<master-count>', metavar='<master-count>',
help='The number of master nodes for the cluster.') help='The number of master nodes for the cluster.')
parser.add_argument('--name', parser.add_argument('name',
metavar='<name>', metavar='<name>',
help='Name of the cluster to create.') help='Name of the cluster to create.')
parser.add_argument('--node-count', parser.add_argument('--node-count',

8
magnumclient/tests/osc/unit/v1/test_cluster_templates.py
View File

@ -91,7 +91,7 @@ class TestClusterTemplateCreate(TestClusterTemplate):
'--coe', self.new_ct.coe, '--coe', self.new_ct.coe,
'--external-network', self.new_ct.external_network_id, '--external-network', self.new_ct.external_network_id,
'--image', self.new_ct.image_id, '--image', self.new_ct.image_id,
'--name', self.new_ct.name self.new_ct.name
] ]
verifylist = [ verifylist = [
('coe', self.new_ct.coe), ('coe', self.new_ct.coe),
@ -109,13 +109,11 @@ class TestClusterTemplateCreate(TestClusterTemplate):
arglist = [ arglist = [
'--external-network', self.new_ct.external_network_id, '--external-network', self.new_ct.external_network_id,
'--image', self.new_ct.image_id, '--image', self.new_ct.image_id
'--name', self.new_ct.name
] ]
verifylist = [ verifylist = [
('external_network', self.new_ct.external_network_id), ('external_network', self.new_ct.external_network_id),
('image', self.new_ct.image_id), ('image', self.new_ct.image_id)
('name', self.new_ct.name)
] ]
self.assertRaises(magnum_fakes.MagnumParseException, self.assertRaises(magnum_fakes.MagnumParseException,
self.check_parser, self.cmd, arglist, verifylist) self.check_parser, self.cmd, arglist, verifylist)

10
magnumclient/tests/osc/unit/v1/test_clusters.py
View File

@ -46,7 +46,7 @@ class TestClusterCreate(TestCluster):
'labels': {}, 'labels': {},
'keypair': None, 'keypair': None,
'master_count': 1, 'master_count': 1,
'name': None, 'name': 'fake-cluster-1',
'node_count': 1 'node_count': 1
} }
@ -69,10 +69,12 @@ class TestClusterCreate(TestCluster):
"""Verifies required arguments.""" """Verifies required arguments."""
arglist = [ arglist = [
'--cluster-template', self._cluster.cluster_template_id '--cluster-template', self._cluster.cluster_template_id,
self._cluster.name
] ]
verifylist = [ verifylist = [
('cluster_template', self._cluster.cluster_template_id) ('cluster_template', self._cluster.cluster_template_id),
('name', self._cluster.name)
] ]
parsed_args = self.check_parser(self.cmd, arglist, verifylist) parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args) self.cmd.take_action(parsed_args)
@ -82,7 +84,7 @@ class TestClusterCreate(TestCluster):
"""Verifies missing required arguments.""" """Verifies missing required arguments."""
arglist = [ arglist = [
'--name', self._cluster.name self._cluster.name
] ]
verifylist = [ verifylist = [
('name', self._cluster.name) ('name', self._cluster.name)