Merge "osc: Don't pass parameters with null value"
This commit is contained in:
commit
d856f05d54
|
@ -124,18 +124,24 @@ class CreateCluster(command.Command):
|
|||
'cluster_template_id': parsed_args.cluster_template,
|
||||
'create_timeout': parsed_args.timeout,
|
||||
'discovery_url': parsed_args.discovery_url,
|
||||
'docker_volume_size': parsed_args.docker_volume_size,
|
||||
'keypair': parsed_args.keypair,
|
||||
'master_count': parsed_args.master_count,
|
||||
'name': parsed_args.name,
|
||||
'node_count': parsed_args.node_count,
|
||||
'master_flavor_id': parsed_args.master_flavor,
|
||||
'flavor_id': parsed_args.flavor,
|
||||
}
|
||||
|
||||
if parsed_args.labels is not None:
|
||||
args['labels'] = magnum_utils.handle_labels(parsed_args.labels)
|
||||
|
||||
if parsed_args.docker_volume_size is not None:
|
||||
args['docker_volume_size'] = parsed_args.docker_volume_size
|
||||
|
||||
if parsed_args.master_flavor is not None:
|
||||
args['master_flavor_id'] = parsed_args.master_flavor
|
||||
|
||||
if parsed_args.flavor is not None:
|
||||
args['flavor_id'] = parsed_args.flavor
|
||||
|
||||
cluster = mag_client.clusters.create(**args)
|
||||
print("Request to create cluster %s accepted"
|
||||
% cluster.uuid)
|
||||
|
|
|
@ -52,13 +52,10 @@ class TestClusterCreate(TestCluster):
|
|||
'cluster_template_id': 'fake-ct',
|
||||
'create_timeout': 60,
|
||||
'discovery_url': None,
|
||||
'docker_volume_size': None,
|
||||
'flavor_id': None,
|
||||
'keypair': None,
|
||||
'master_count': 1,
|
||||
'name': 'fake-cluster-1',
|
||||
'node_count': 1,
|
||||
'master_flavor_id': None,
|
||||
}
|
||||
|
||||
self.clusters_mock.create = mock.Mock()
|
||||
|
|
Loading…
Reference in New Issue