openstack
/
magnum
Code Issues Proposed changes

Remove docker_volume_size from functional-test 

To unblock our gate, in all the functional tests, create
clusters without cinder volumes.

Change-Id: Ia3b14603c5fc516b00c862c8b9257e0fd23d4b9e
Related-Bug: #1422831
This commit is contained in:
Spyros Trigazis 2016-12-08 19:36:02 +01:00
parent 6db2ab0568
commit 874d81c1d9
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -107,7 +107,6 @@ def baymodel_data(**kwargs):
"tls_disabled": False,
"network_driver": None,
"volume_driver": None,
"docker_volume_size": 3,
"labels": {},
"public": False,
"dns_nameserver": "8.8.8.8",
@ -220,7 +219,7 @@ def valid_swarm_baymodel(is_public=False):
dns_nameserver=config.Config.dns_nameserver,
master_flavor_id=config.Config.master_flavor_id,
keypair_id=config.Config.keypair_id, coe="swarm",
docker_volume_size=3, cluster_distro=None,
cluster_distro=None,
external_network_id=config.Config.nic_id,
http_proxy=None, https_proxy=None, no_proxy=None,
network_driver=None, volume_driver=None, labels={},
@ -348,7 +347,6 @@ def cluster_template_data(**kwargs):
"tls_disabled": False,
"network_driver": None,
"volume_driver": None,
"docker_volume_size": 3,
"labels": {},
"public": False,
"dns_nameserver": "8.8.8.8",
@ -498,7 +496,7 @@ def valid_swarm_cluster_template(is_public=False):
public=is_public,
dns_nameserver=config.Config.dns_nameserver,
master_flavor_id=master_flavor_id,
coe="swarm", docker_volume_size=3,
coe="swarm",
cluster_distro=None,
external_network_id=config.Config.nic_id,
http_proxy=None, https_proxy=None,

2
magnum/tests/functional/python_client_base.py
View File

@ -152,7 +152,6 @@ class BaseMagnumClient(base.BaseMagnumTest):
# Plan is to support other kinds of ClusterTemplate
# creation.
coe = kwargs.pop('coe', 'kubernetes')
docker_volume_size = kwargs.pop('docker_volume_size', 3)
network_driver = kwargs.pop('network_driver', 'flannel')
volume_driver = kwargs.pop('volume_driver', 'cinder')
labels = kwargs.pop('labels', {"K1": "V1", "K2": "V2"})
@ -167,7 +166,6 @@ class BaseMagnumClient(base.BaseMagnumTest):
image_id=cls.image_id,
flavor_id=cls.flavor_id,
master_flavor_id=cls.master_flavor_id,
docker_volume_size=docker_volume_size,
network_driver=network_driver,
volume_driver=volume_driver,
dns_nameserver=cls.dns_nameserver,