osc: Don't pass parameters with null value
Don't pass parameters docker_volume_size, flavor_id and master_flavor_id if they are null. This is to be compatible with Ocata version of Magnum API. Change-Id: I0d89e1b973585ae5d4633843feedc0c35b4f624a Closes-Bug: #1779160
This commit is contained in:
parent
1dec8995fb
commit
5f23c66258
|
@ -124,18 +124,24 @@ class CreateCluster(command.Command):
|
||||||
'cluster_template_id': parsed_args.cluster_template,
|
'cluster_template_id': parsed_args.cluster_template,
|
||||||
'create_timeout': parsed_args.timeout,
|
'create_timeout': parsed_args.timeout,
|
||||||
'discovery_url': parsed_args.discovery_url,
|
'discovery_url': parsed_args.discovery_url,
|
||||||
'docker_volume_size': parsed_args.docker_volume_size,
|
|
||||||
'keypair': parsed_args.keypair,
|
'keypair': parsed_args.keypair,
|
||||||
'master_count': parsed_args.master_count,
|
'master_count': parsed_args.master_count,
|
||||||
'name': parsed_args.name,
|
'name': parsed_args.name,
|
||||||
'node_count': parsed_args.node_count,
|
'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:
|
if parsed_args.labels is not None:
|
||||||
args['labels'] = magnum_utils.handle_labels(parsed_args.labels)
|
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)
|
cluster = mag_client.clusters.create(**args)
|
||||||
print("Request to create cluster %s accepted"
|
print("Request to create cluster %s accepted"
|
||||||
% cluster.uuid)
|
% cluster.uuid)
|
||||||
|
|
|
@ -52,13 +52,10 @@ class TestClusterCreate(TestCluster):
|
||||||
'cluster_template_id': 'fake-ct',
|
'cluster_template_id': 'fake-ct',
|
||||||
'create_timeout': 60,
|
'create_timeout': 60,
|
||||||
'discovery_url': None,
|
'discovery_url': None,
|
||||||
'docker_volume_size': None,
|
|
||||||
'flavor_id': None,
|
|
||||||
'keypair': None,
|
'keypair': None,
|
||||||
'master_count': 1,
|
'master_count': 1,
|
||||||
'name': 'fake-cluster-1',
|
'name': 'fake-cluster-1',
|
||||||
'node_count': 1,
|
'node_count': 1,
|
||||||
'master_flavor_id': None,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.clusters_mock.create = mock.Mock()
|
self.clusters_mock.create = mock.Mock()
|
||||||
|
|
Loading…
Reference in New Issue