openstack
/
magnum-tempest-plugin
Code Issues Proposed changes

Merge "Reduce memory consumption of gate tests"

This commit is contained in:
Jenkins 2016-02-12 01:08:31 +00:00 committed by Gerrit Code Review
parent 9adeed8245 52f6162385
commit fad77aaf15
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
magnum/tests/functional/common/config.py
View File

@ -91,6 +91,12 @@ class Config(object):
def set_magnum_url(cls, config):
cls.magnum_url = CONF.magnum.get('magnum_url', None)
@classmethod
def set_master_flavor_id(cls, config):
if 'master_flavor_id' not in CONF.magnum:
raise Exception('config missing master_flavor_id key')
cls.master_flavor_id = CONF.magnum.master_flavor_id
@classmethod
def setUp(cls):
cls.set_admin_creds(config)
@ -105,3 +111,4 @@ class Config(object):
cls.set_keypair_id(config)
cls.set_flavor_id(config)
cls.set_magnum_url(config)
cls.set_master_flavor_id(config)

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

@ -181,7 +181,8 @@ def valid_swarm_baymodel():
return baymodel_data(image_id=config.Config.image_id,
fixed_network="192.168.0.0/24",
flavor_id=config.Config.flavor_id, public=False,
dns_nameserver="8.8.8.8", master_flavor_id=None,
dns_nameserver="8.8.8.8",
master_flavor_id=config.Config.master_flavor_id,
keypair_id=config.Config.keypair_id, coe="swarm",
docker_volume_size=3, cluster_distro=None,
ssh_authorized_key=None, external_network_id="public",
@ -223,7 +224,7 @@ def bay_data(name=data_utils.rand_name('bay'),
return model
def valid_bay_data(baymodel_id, name=data_utils.rand_name('bay'), node_count=2,
def valid_bay_data(baymodel_id, name=data_utils.rand_name('bay'), node_count=1,
master_count=1, bay_create_timeout=None):
"""Generates random bay data with valid

6
magnum/tests/functional/tempest_tests/config.py
View File

@ -41,10 +41,14 @@ MagnumGroup = [
help="Keypair id to use to log into nova instances."),
cfg.StrOpt("flavor_id",
default="m1.magnum",
default="m1.magnum2",
help="Flavor id to use for baymodels."),
cfg.StrOpt("magnum_url",
default=None,
help="Bypass URL for Magnum to skip service catalog lookup"),
cfg.StrOpt("master_flavor_id",
default="m1.magnum",
help="Master flavor id to use for baymodels."),
]