openstack
/
magnum
Code Issues Proposed changes

Merge "Revert "fixed_network should be fixed_network_cidr""

This commit is contained in:
Jenkins 2016-01-26 10:17:29 +00:00 committed by Gerrit Code Review
parent e5397eabeb cb211c165e
commit 9a14bd770b
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/conductor/template_definition.py
View File

@ -338,8 +338,6 @@ class BaseTemplateDefinition(TemplateDefinition):
baymodel_attr='image_id')
self.add_parameter('dns_nameserver',
baymodel_attr='dns_nameserver')
self.add_parameter('fixed_network_cidr',
baymodel_attr='fixed_network')
self.add_parameter('http_proxy',
baymodel_attr='http_proxy')
self.add_parameter('https_proxy',

14
magnum/tests/unit/conductor/handlers/test_k8s_bay_conductor.py
View File

@ -30,7 +30,6 @@ class TestBayConductorWithK8s(base.TestCase):
'keypair_id': 'keypair_id',
'dns_nameserver': 'dns_nameserver',
'external_network_id': 'external_network_id',
'fixed_network': '10.20.30.0/24',
'network_driver': 'network_driver',
'docker_volume_size': 20,
'cluster_distro': 'fedora-atomic',
@ -100,7 +99,6 @@ class TestBayConductorWithK8s(base.TestCase):
'image_id': 'server_image',
'flavor_id': 'minion_flavor',
'docker_volume_size': 'docker_volume_size',
'fixed_network': 'fixed_network_cidr',
'network_driver': 'network_driver',
'master_flavor_id': 'master_flavor',
'apiserver_port': '',
@ -128,7 +126,6 @@ class TestBayConductorWithK8s(base.TestCase):
'master_flavor': 'master_flavor_id',
'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',
'flannel_network_cidr': '10.101.0.0/16',
@ -172,7 +169,6 @@ class TestBayConductorWithK8s(base.TestCase):
'master_flavor': 'master_flavor_id',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'discovery_url': 'https://discovery.etcd.io/test',
'http_proxy': 'http_proxy',
@ -212,7 +208,6 @@ class TestBayConductorWithK8s(base.TestCase):
'master_flavor': 'master_flavor_id',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'discovery_url': 'http://tokentest/h1/h2/h3',
'http_proxy': 'http_proxy',
@ -257,14 +252,6 @@ class TestBayConductorWithK8s(base.TestCase):
mock_objects_baymodel_get_by_uuid,
missing_attr='docker_volume_size')
@patch('magnum.objects.BayModel.get_by_uuid')
def test_extract_template_definition_without_fixed_network(
self,
mock_objects_baymodel_get_by_uuid):
self._test_extract_template_definition(
mock_objects_baymodel_get_by_uuid,
missing_attr='fixed_network')
@patch('magnum.objects.BayModel.get_by_uuid')
def test_extract_template_definition_without_master_flavor(
self,
@ -328,7 +315,6 @@ class TestBayConductorWithK8s(base.TestCase):
'minion_flavor': 'flavor_id',
'number_of_minions': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.20.30.0/24',
'network_driver': 'network_driver',
'docker_volume_size': 20,
'discovery_url': 'https://address/token',

2
magnum/tests/unit/conductor/handlers/test_mesos_bay_conductor.py
View File

@ -32,7 +32,6 @@ class TestBayConductorWithMesos(base.TestCase):
'keypair_id': 'keypair_id',
'dns_nameserver': 'dns_nameserver',
'external_network_id': 'external_network_id',
'fixed_network': '10.2.0.0/22',
'cluster_distro': 'ubuntu',
'coe': 'mesos',
'http_proxy': 'http_proxy',
@ -73,7 +72,6 @@ class TestBayConductorWithMesos(base.TestCase):
'slave_flavor': 'flavor_id',
'number_of_slaves': 1,
'number_of_masters': 1,
'fixed_network_cidr': '10.2.0.0/22',
'http_proxy': 'http_proxy',
'https_proxy': 'https_proxy',
'no_proxy': 'no_proxy',

2
magnum/tests/unit/conductor/handlers/test_swarm_bay_conductor.py
View File

@ -33,7 +33,6 @@ class TestBayConductorWithSwarm(base.TestCase):
'dns_nameserver': 'dns_nameserver',
'docker_volume_size': 20,
'external_network_id': 'external_network_id',
'fixed_network': '10.2.0.0/22',
'cluster_distro': 'fedora-atomic',
'coe': 'swarm',
'http_proxy': 'http_proxy',
@ -89,7 +88,6 @@ class TestBayConductorWithSwarm(base.TestCase):
'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',
'http_proxy': 'http_proxy',
'https_proxy': 'https_proxy',