openstack
/
magnum
Code Issues Proposed changes

Remove fixed_network from functional tests 

With the current implementation the passed fixed_network is not
used. VM provisioning is done in the dedicated cluster network.

Change-Id: Ic9d0275356fe878693997b4915a8a8175fe51f22
This commit is contained in:
Spyros Trigazis 2016-09-29 11:33:12 +02:00
parent 45f071e36e
commit f6128a0ddc
4 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
magnum/tests/functional/common/datagen.py
View File

@ -110,7 +110,6 @@ def baymodel_data(**kwargs):
"docker_volume_size": 3,
"labels": {},
"public": False,
"fixed_network": "192.168.0.0/24",
"dns_nameserver": "8.8.8.8",
"flavor_id": data_utils.rand_name('bay'),
"master_flavor_id": data_utils.rand_name('bay'),
@ -217,7 +216,6 @@ def valid_swarm_baymodel(is_public=False):
"""
return baymodel_data(image_id=config.Config.image_id,
fixed_network="192.168.0.0/24",
flavor_id=config.Config.flavor_id, public=is_public,
dns_nameserver=config.Config.dns_nameserver,
master_flavor_id=config.Config.master_flavor_id,
@ -353,7 +351,6 @@ def cluster_template_data(**kwargs):
"docker_volume_size": 3,
"labels": {},
"public": False,
"fixed_network": "192.168.0.0/24",
"dns_nameserver": "8.8.8.8",
"flavor_id": data_utils.rand_name('cluster'),
"master_flavor_id": data_utils.rand_name('cluster'),
@ -497,7 +494,6 @@ def valid_swarm_cluster_template(is_public=False):
"""
master_flavor_id = config.Config.master_flavor_id
return cluster_template_data(image_id=config.Config.image_id,
fixed_network="192.168.0.0/24",
flavor_id=config.Config.flavor_id,
public=is_public,
dns_nameserver=config.Config.dns_nameserver,

3
magnum/tests/functional/k8s/test_k8s_python_client.py
View File

@ -17,6 +17,5 @@ class TestKubernetesAPIs(base.BaseK8sTest):
cluster_template_kwargs = {
"tls_disabled": False,
"network_driver": 'flannel',
"volume_driver": 'cinder',
"fixed_network": '192.168.0.0/24'
"volume_driver": 'cinder'
}

3
magnum/tests/functional/k8s_coreos/test_k8s_python_client.py
View File

@ -17,6 +17,5 @@ class TestCoreosKubernetesAPIs(base.BaseK8sTest):
cluster_template_kwargs = {
"tls_disabled": True,
"network_driver": 'flannel',
"volume_driver": None,
"fixed_network": '192.168.0.0/24'
"volume_driver": None
}

1
magnum/tests/functional/swarm/test_swarm_python_client.py
View File

@ -35,7 +35,6 @@ class TestSwarmAPIs(ClusterTest):
"tls_disabled": False,
"network_driver": None,
"volume_driver": None,
"fixed_network": '192.168.0.0/24',
"labels": {}
}