From 5f23c6625802c2dfcaf86b59655529b3137aa72b Mon Sep 17 00:00:00 2001 From: David Rabel Date: Thu, 28 Jun 2018 17:16:07 +0200 Subject: [PATCH] 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 --- magnumclient/osc/v1/clusters.py | 12 +++++++++--- magnumclient/tests/osc/unit/v1/test_clusters.py | 3 --- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/magnumclient/osc/v1/clusters.py b/magnumclient/osc/v1/clusters.py index c6857b73..30a17687 100644 --- a/magnumclient/osc/v1/clusters.py +++ b/magnumclient/osc/v1/clusters.py @@ -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) diff --git a/magnumclient/tests/osc/unit/v1/test_clusters.py b/magnumclient/tests/osc/unit/v1/test_clusters.py index 67375baa..4783c138 100644 --- a/magnumclient/tests/osc/unit/v1/test_clusters.py +++ b/magnumclient/tests/osc/unit/v1/test_clusters.py @@ -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()