From 29dbc62504eb5cca86867f39120a39735dc5de3d Mon Sep 17 00:00:00 2001 From: Tom Cammann Date: Wed, 29 Apr 2015 18:31:00 +0100 Subject: [PATCH] fixed_network should be fixed_network_cidr fixed_network should be fixed_network_cidr as this is the value that exists in the heat template. Update tests to use a cidr address string rather than a text string to match the parameters expected contents. Change-Id: I624b95930f9eb506abfb2e29beea8d83878ea142 Closes-Bug: 1450140 --- magnum/conductor/template_definition.py | 6 ++--- .../conductor/handlers/test_bay_k8s_heat.py | 24 +++++++++---------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/magnum/conductor/template_definition.py b/magnum/conductor/template_definition.py index 50334f9e06..5311bbc7b1 100644 --- a/magnum/conductor/template_definition.py +++ b/magnum/conductor/template_definition.py @@ -291,6 +291,8 @@ class BaseTemplateDefinition(TemplateDefinition): baymodel_attr='flavor_id') self.add_parameter('dns_nameserver', baymodel_attr='dns_nameserver') + self.add_parameter('fixed_network_cidr', + baymodel_attr='fixed_network') @abc.abstractproperty def template_path(self): @@ -306,8 +308,6 @@ class AtomicK8sTemplateDefinition(BaseTemplateDefinition): super(AtomicK8sTemplateDefinition, self).__init__() self.add_parameter('master_flavor', baymodel_attr='master_flavor_id') - self.add_parameter('fixed_network', - baymodel_attr='fixed_network') self.add_parameter('number_of_minions', bay_attr='node_count', param_type=str) @@ -372,8 +372,6 @@ class AtomicSwarmTemplateDefinition(BaseTemplateDefinition): self.add_parameter('number_of_nodes', bay_attr='node_count', param_type=str) - self.add_parameter('fixed_network_cidr', - baymodel_attr='fixed_network') self.add_output('swarm_manager', bay_attr='api_address') diff --git a/magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py b/magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py index 389374428f..ff32f9a1f4 100644 --- a/magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py +++ b/magnum/tests/unit/conductor/handlers/test_bay_k8s_heat.py @@ -37,7 +37,7 @@ class TestBayK8sHeat(base.TestCase): 'keypair_id': 'keypair_id', 'dns_nameserver': 'dns_nameserver', 'external_network_id': 'external_network_id', - 'fixed_network': 'private', + 'fixed_network': '10.20.30.0/24', 'docker_volume_size': 20, 'cluster_distro': 'fedora-atomic', 'ssh_authorized_key': 'ssh_authorized_key', @@ -81,7 +81,7 @@ class TestBayK8sHeat(base.TestCase): 'server_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertEqual(expected, definition) @@ -114,7 +114,7 @@ class TestBayK8sHeat(base.TestCase): 'server_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, 'ssh_authorized_key': 'ssh_authorized_key', 'token': 'h3' @@ -149,7 +149,7 @@ class TestBayK8sHeat(base.TestCase): 'server_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, 'ssh_authorized_key': 'ssh_authorized_key', 'token': 'ba3d1866282848ddbedc76112110c208' @@ -176,7 +176,7 @@ class TestBayK8sHeat(base.TestCase): 'server_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertEqual(expected, definition) @@ -201,7 +201,7 @@ class TestBayK8sHeat(base.TestCase): 'server_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertEqual(expected, definition) @@ -226,7 +226,7 @@ class TestBayK8sHeat(base.TestCase): 'server_image': 'image_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertEqual(expected, definition) @@ -250,7 +250,7 @@ class TestBayK8sHeat(base.TestCase): 'dns_nameserver': 'dns_nameserver', 'server_image': 'image_id', 'server_flavor': 'flavor_id', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', } @@ -301,7 +301,7 @@ class TestBayK8sHeat(base.TestCase): 'server_image': 'image_id', 'server_flavor': 'flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertEqual(expected, definition) @@ -328,7 +328,7 @@ class TestBayK8sHeat(base.TestCase): 'master_flavor': 'master_flavor_id', 'server_flavor': 'flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertIn('token', definition) @@ -356,7 +356,7 @@ class TestBayK8sHeat(base.TestCase): 'server_flavor': 'flavor_id', 'master_flavor': 'master_flavor_id', 'number_of_minions': '1', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'docker_volume_size': 20, } self.assertEqual(expected, definition) @@ -380,7 +380,7 @@ class TestBayK8sHeat(base.TestCase): 'dns_nameserver': 'dns_nameserver', 'server_image': 'image_id', 'server_flavor': 'flavor_id', - 'fixed_network': 'private', + 'fixed_network_cidr': '10.20.30.0/24', 'master_flavor': 'master_flavor_id', 'docker_volume_size': 20, }