[ci] Support fedora-coreos in magnum-tempest-plugin

Story: 2007561
Task: 39512

Change-Id: I2a5ba0a3bbc99c31af5de96e5b2acfa6107b698e
This commit is contained in:
Bharat Kunwar 2020-04-21 15:36:05 +00:00
parent 0655f1a2cb
commit d75cbd1e48
5 changed files with 13 additions and 13 deletions

View File

@ -35,7 +35,7 @@ def random_int(min_int=1, max_int=100):
def gen_coe_dep_network_driver(coe): def gen_coe_dep_network_driver(coe):
allowed_driver_types = { allowed_driver_types = {
'kubernetes': ['flannel', None], 'kubernetes': ['flannel', 'calico', None],
'swarm': ['docker', 'flannel', None], 'swarm': ['docker', 'flannel', None],
'swarm-mode': ['docker', None], 'swarm-mode': ['docker', None],
'mesos': ['docker', None], 'mesos': ['docker', None],
@ -105,7 +105,7 @@ def baymodel_data(**kwargs):
data = { data = {
"name": data_utils.rand_name('bay'), "name": data_utils.rand_name('bay'),
"coe": "swarm-mode", "coe": "kubernetes",
"tls_disabled": False, "tls_disabled": False,
"network_driver": None, "network_driver": None,
"volume_driver": None, "volume_driver": None,
@ -210,8 +210,8 @@ def baymodel_valid_data_with_specific_coe(coe):
image_id=config.Config.image_id, coe=coe) image_id=config.Config.image_id, coe=coe)
def valid_swarm_mode_baymodel(is_public=False): def valid_kubernetes_baymodel(is_public=False):
"""Generates a valid swarm mode baymodel with valid data """Generates a valid kubernetes baymodel with valid data
:returns: BayModelEntity with generated data :returns: BayModelEntity with generated data
""" """
@ -221,7 +221,7 @@ def valid_swarm_mode_baymodel(is_public=False):
dns_nameserver=config.Config.dns_nameserver, dns_nameserver=config.Config.dns_nameserver,
master_flavor_id=config.Config.master_flavor_id, master_flavor_id=config.Config.master_flavor_id,
keypair_id=config.Config.keypair_name, keypair_id=config.Config.keypair_name,
coe="swarm-mode", coe="kubernetes",
cluster_distro=None, cluster_distro=None,
external_network_id=config.Config.nic_id, external_network_id=config.Config.nic_id,
http_proxy=None, https_proxy=None, no_proxy=None, http_proxy=None, https_proxy=None, no_proxy=None,
@ -346,7 +346,7 @@ def cluster_template_data(**kwargs):
data = { data = {
"name": data_utils.rand_name('cluster'), "name": data_utils.rand_name('cluster'),
"coe": "swarm-mode", "coe": "kubernetes",
"tls_disabled": False, "tls_disabled": False,
"network_driver": None, "network_driver": None,
"volume_driver": None, "volume_driver": None,

View File

@ -31,7 +31,7 @@ MagnumGroup = [
cfg.StrOpt("docker_storage_driver", cfg.StrOpt("docker_storage_driver",
help="Docker storage driver. Supported: devicemapper, overlay"), help="Docker storage driver. Supported: devicemapper, overlay"),
cfg.StrOpt("image_id", cfg.StrOpt("image_id",
default="fedora-atomic-latest", default="fedora-coreos-latest",
help="Image id to be used for ClusterTemplate."), help="Image id to be used for ClusterTemplate."),
cfg.StrOpt("nic_id", cfg.StrOpt("nic_id",
default="public", default="public",
@ -41,12 +41,12 @@ MagnumGroup = [
help="Keypair name to use to log into nova instances, the " help="Keypair name to use to log into nova instances, the "
"keypair is created automatically if not exist."), "keypair is created automatically if not exist."),
cfg.StrOpt("flavor_id", cfg.StrOpt("flavor_id",
default="s1.magnum", default="ds2G",
help="Flavor id to use for ClusterTemplate."), help="Flavor id to use for ClusterTemplate."),
cfg.StrOpt("magnum_url", cfg.StrOpt("magnum_url",
help="Bypass URL for Magnum to skip service catalog lookup"), help="Bypass URL for Magnum to skip service catalog lookup"),
cfg.StrOpt("master_flavor_id", cfg.StrOpt("master_flavor_id",
default="m1.magnum", default="ds2G",
help="Master flavor id to use for ClusterTemplate."), help="Master flavor id to use for ClusterTemplate."),
cfg.StrOpt("csr_location", cfg.StrOpt("csr_location",
default="/opt/stack/new/magnum/default.csr", default="/opt/stack/new/magnum/default.csr",
@ -60,7 +60,7 @@ MagnumGroup = [
default=True, default=True,
help="Specify whether to copy nova server logs on failure."), help="Specify whether to copy nova server logs on failure."),
cfg.StrOpt("coe", cfg.StrOpt("coe",
default="swarm-mode", default="kubernetes",
help="Container Orchestration Engine"), help="Container Orchestration Engine"),
cfg.StrOpt("network_driver", cfg.StrOpt("network_driver",
help="Network Driver"), help="Network Driver"),

View File

@ -58,7 +58,7 @@ class BayTest(base.BaseTempestTest):
creds=self.creds, creds=self.creds,
type_of_creds='default', type_of_creds='default',
request_type='cert') request_type='cert')
model = datagen.valid_swarm_mode_baymodel() model = datagen.valid_kubernetes_baymodel()
_, self.baymodel = self._create_baymodel(model) _, self.baymodel = self._create_baymodel(model)
# NOTE (dimtruck) by default tempest sets timeout to 20 mins. # NOTE (dimtruck) by default tempest sets timeout to 20 mins.

View File

@ -74,7 +74,7 @@ class BayModelTest(base.BaseTempestTest):
@testtools.testcase.attr('positive') @testtools.testcase.attr('positive')
def test_create_get_public_baymodel(self): def test_create_get_public_baymodel(self):
gen_model = datagen.valid_swarm_mode_baymodel(is_public=True) gen_model = datagen.valid_kubernetes_baymodel(is_public=True)
self.assertRaises( self.assertRaises(
exceptions.Forbidden, exceptions.Forbidden,
self.baymodel_client.post_baymodel, gen_model) self.baymodel_client.post_baymodel, gen_model)

View File

@ -57,7 +57,7 @@ class BayModelAdminTest(base.BaseTempestTest):
@testtools.testcase.attr('positive') @testtools.testcase.attr('positive')
def test_create_get_public_baymodel(self): def test_create_get_public_baymodel(self):
gen_model = datagen.valid_swarm_mode_baymodel(is_public=True) gen_model = datagen.valid_kubernetes_baymodel(is_public=True)
resp, model = self._create_baymodel(gen_model) resp, model = self._create_baymodel(gen_model)
resp, model = self.baymodel_client.get_baymodel(model.uuid) resp, model = self.baymodel_client.get_baymodel(model.uuid)