From c5fc62ed28ea6cead11c19947400c968eed3cb72 Mon Sep 17 00:00:00 2001 From: Hua Wang Date: Wed, 9 Dec 2015 17:16:29 +0800 Subject: [PATCH] The type of number_of_masters should be int not string number_of_masters, number_of_minions and number_of_nodes should be number, not string. Change-Id: Iac20023f0448aab313302c174e3743b95cd42d7a Closes-Bug: #1524236 --- magnum/conductor/template_definition.py | 12 ++++------- .../kubernetes/kubecluster-coreos.yaml | 2 +- .../kubernetes/kubecluster-fedora-ironic.yaml | 2 +- magnum/templates/kubernetes/kubecluster.yaml | 4 ++-- magnum/templates/swarm/swarmcluster.yaml | 4 ++-- .../handlers/test_k8s_bay_conductor.py | 20 +++++++++---------- .../handlers/test_mesos_bay_conductor.py | 8 ++++---- .../handlers/test_swarm_bay_conductor.py | 8 ++++---- 8 files changed, 28 insertions(+), 32 deletions(-) diff --git a/magnum/conductor/template_definition.py b/magnum/conductor/template_definition.py index 093922637d..8a9550403b 100644 --- a/magnum/conductor/template_definition.py +++ b/magnum/conductor/template_definition.py @@ -348,8 +348,7 @@ class BaseTemplateDefinition(TemplateDefinition): self.add_parameter('no_proxy', baymodel_attr='no_proxy') self.add_parameter('number_of_masters', - bay_attr='master_count', - param_type=str) + bay_attr='master_count') @abc.abstractproperty def template_path(self): @@ -446,8 +445,7 @@ class AtomicK8sTemplateDefinition(BaseTemplateDefinition): self.add_parameter('minion_flavor', baymodel_attr='flavor_id') self.add_parameter('number_of_minions', - bay_attr='node_count', - param_type=str) + bay_attr='node_count') self.add_parameter('docker_volume_size', baymodel_attr='docker_volume_size') self.add_parameter('external_network', @@ -556,8 +554,7 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition): bay_attr='uuid', param_type=str) self.add_parameter('number_of_nodes', - bay_attr='node_count', - param_type=str) + bay_attr='node_count') self.add_parameter('server_flavor', baymodel_attr='flavor_id') self.add_parameter('docker_volume_size', @@ -623,8 +620,7 @@ class UbuntuMesosTemplateDefinition(BaseTemplateDefinition): baymodel_attr='external_network_id', required=True) self.add_parameter('number_of_slaves', - bay_attr='node_count', - param_type=str) + bay_attr='node_count') self.add_parameter('master_flavor', baymodel_attr='master_flavor_id') self.add_parameter('slave_flavor', diff --git a/magnum/templates/kubernetes/kubecluster-coreos.yaml b/magnum/templates/kubernetes/kubecluster-coreos.yaml index 9560561395..a119449341 100644 --- a/magnum/templates/kubernetes/kubecluster-coreos.yaml +++ b/magnum/templates/kubernetes/kubecluster-coreos.yaml @@ -45,7 +45,7 @@ parameters: default: 8.8.8.8 number_of_minions: - type: string + type: number description: how many kubernetes minions to spawn default: 1 diff --git a/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml b/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml index cc74652711..b2593d4969 100644 --- a/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml +++ b/magnum/templates/kubernetes/kubecluster-fedora-ironic.yaml @@ -34,7 +34,7 @@ parameters: description: flavor to use when booting the server number_of_minions: - type: string + type: number description: how many kubernetes minions to spawn default: 1 diff --git a/magnum/templates/kubernetes/kubecluster.yaml b/magnum/templates/kubernetes/kubecluster.yaml index d6d7af0ba2..d9282ceefb 100644 --- a/magnum/templates/kubernetes/kubecluster.yaml +++ b/magnum/templates/kubernetes/kubecluster.yaml @@ -36,12 +36,12 @@ parameters: default: 8.8.8.8 number_of_masters: - type: string + type: number description: how many kubernetes masters to spawn default: 1 number_of_minions: - type: string + type: number description: how many kubernetes minions to spawn default: 1 diff --git a/magnum/templates/swarm/swarmcluster.yaml b/magnum/templates/swarm/swarmcluster.yaml index 1c61a0a81d..c122f62b95 100644 --- a/magnum/templates/swarm/swarmcluster.yaml +++ b/magnum/templates/swarm/swarmcluster.yaml @@ -71,12 +71,12 @@ parameters: default: "" number_of_masters: - type: string + type: number description: how many swarm masters to spawn default: 1 number_of_nodes: - type: string + type: number description: how many swarm nodes to spawn default: 1 diff --git a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py index 8e6cb403ec..2072debf79 100644 --- a/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py @@ -126,8 +126,8 @@ class TestBayConductorWithK8s(base.TestCase): 'server_image': 'image_id', 'minion_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', - 'number_of_minions': '1', - 'number_of_masters': '1', + 'number_of_minions': 1, + 'number_of_masters': 1, 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, 'discovery_url': 'https://discovery.etcd.io/test', @@ -178,8 +178,8 @@ class TestBayConductorWithK8s(base.TestCase): 'server_image': 'image_id', 'minion_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', - 'number_of_minions': '1', - 'number_of_masters': '1', + 'number_of_minions': 1, + 'number_of_masters': 1, 'fixed_network_cidr': '10.20.30.0/24', 'network_driver': 'network_driver', 'docker_volume_size': 20, @@ -230,8 +230,8 @@ class TestBayConductorWithK8s(base.TestCase): 'server_image': 'image_id', 'minion_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', - 'number_of_minions': '1', - 'number_of_masters': '1', + 'number_of_minions': 1, + 'number_of_masters': 1, 'fixed_network_cidr': '10.20.30.0/24', 'network_driver': 'network_driver', 'docker_volume_size': 20, @@ -324,8 +324,8 @@ class TestBayConductorWithK8s(base.TestCase): 'server_image': 'image_id', 'master_flavor': 'master_flavor_id', 'minion_flavor': 'flavor_id', - 'number_of_minions': '1', - 'number_of_masters': '1', + 'number_of_minions': 1, + 'number_of_masters': 1, 'fixed_network_cidr': '10.20.30.0/24', 'network_driver': 'network_driver', 'docker_volume_size': 20, @@ -401,8 +401,8 @@ class TestBayConductorWithK8s(base.TestCase): 'server_image': 'image_id', 'master_flavor': 'master_flavor_id', 'minion_flavor': 'flavor_id', - 'number_of_minions': '1', - 'number_of_masters': '1', + 'number_of_minions': 1, + 'number_of_masters': 1, 'fixed_network_cidr': '10.20.30.0/24', 'network_driver': 'network_driver', 'docker_volume_size': 20, diff --git a/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py index 4fb560d5f8..637b5dcd92 100644 --- a/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py @@ -71,8 +71,8 @@ class TestBayConductorWithMesos(base.TestCase): 'server_image': 'image_id', 'master_flavor': 'master_flavor_id', 'slave_flavor': 'flavor_id', - 'number_of_slaves': '1', - 'number_of_masters': '1', + 'number_of_slaves': 1, + 'number_of_masters': 1, 'fixed_network_cidr': '10.2.0.0/22', 'http_proxy': 'http_proxy', 'https_proxy': 'https_proxy', @@ -101,8 +101,8 @@ class TestBayConductorWithMesos(base.TestCase): expected = { 'ssh_key_name': 'keypair_id', 'external_network': 'external_network_id', - 'number_of_slaves': '1', - 'number_of_masters': '1', + 'number_of_slaves': 1, + 'number_of_masters': 1, } self.assertEqual(expected, definition) diff --git a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py index 6fe052b010..8917e15672 100644 --- a/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py +++ b/magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py @@ -84,8 +84,8 @@ class TestBayConductorWithSwarm(base.TestCase): 'dns_nameserver': 'dns_nameserver', 'server_image': 'image_id', 'server_flavor': 'flavor_id', - 'number_of_masters': '1', - 'number_of_nodes': '1', + 'number_of_masters': 1, + 'number_of_nodes': 1, 'docker_volume_size': 20, 'fixed_network_cidr': '10.2.0.0/22', 'discovery_url': 'https://discovery.test.io/123456789', @@ -126,8 +126,8 @@ class TestBayConductorWithSwarm(base.TestCase): expected = { 'ssh_key_name': 'keypair_id', 'external_network': 'external_network_id', - 'number_of_masters': '1', - 'number_of_nodes': '1', + 'number_of_masters': 1, + 'number_of_nodes': 1, 'discovery_url': 'https://discovery.etcd.io/test', 'user_token': 'fake_token', 'bay_uuid': 'some_uuid',