Rename settings_oslo parameter MANAGER to ENV_MANAGER
ENV_MANAGER variable will be used to activate one of
the environment managers:
ENV_MANAGER=devops - create, power on/off VM and BM nodes,
snapshots for libvirt VMs
ENV_MANAGER=heat - create OpenStack heat stack
ENV_MANAGER=empty - only for SSH to an existing environment
Change-Id: I90a59107a7fd350ecfeb821734c2dac4e351d468
diff --git a/tcp_tests/fixtures/underlay_fixtures.py b/tcp_tests/fixtures/underlay_fixtures.py
index b1772e8..1770c62 100644
--- a/tcp_tests/fixtures/underlay_fixtures.py
+++ b/tcp_tests/fixtures/underlay_fixtures.py
@@ -39,45 +39,46 @@
using EnvironmentManager.
Creates a snapshot 'hardware' with ready-to-use virtual environment
- (Only for config.hardware.manager='devops'):
+ (Only for config.hardware.env_manager='devops'):
- just created virtual nodes in power-on state
- node volumes filled with necessary content
- node network interfaces connected to necessary devices
- config.hardware.manager: one of ('devops', 'maas', None)
- config.hardware.config: path to the config file for the manager
+ config.hardware.env_manager: one of ('devops', 'maas', None)
+ config.hardware.config: path to the config file for the env_manager
config.hardware.current_snapshot = Latest created or reverted snapshot
- :rtype EnvironmentModel: if config.hardware.manager == 'devops'
- :rtype EnvironmentManagerEmpty: if config.hardware.manager == 'empty'
+ :rtype EnvironmentModel: if config.hardware.env_manager == 'devops'
+ :rtype EnvironmentManagerEmpty:
+ if config.hardware.env_manager == 'empty'
"""
env = None
- manager = config.hardware.manager
+ env_manager = config.hardware.env_manager
- if manager == 'empty':
+ if env_manager == 'empty':
# No environment manager is used.
# 'config' should contain config.underlay.ssh settings
# 'config' should contain config.underlay.current_snapshot setting
env = envmanager_empty.EnvironmentManagerEmpty(config=config)
- elif manager == 'devops':
+ elif env_manager == 'devops':
# fuel-devops environment manager is used.
# config.underlay.ssh settings can be empty or witn SSH to existing env
# config.underlay.current_snapshot
env = envmanager_devops.EnvironmentManager(config=config)
- elif manager == 'heat':
+ elif env_manager == 'heat':
# heat environment manager is used.
# config.underlay.ssh settings can be empty or witn SSH to existing env
# config.underlay.current_snapshot
env = envmanager_heat.EnvironmentManagerHeat(config=config)
else:
- raise Exception("Unknown hardware manager: '{}'".format(manager))
+ raise Exception("Unknown hardware manager: '{}'".format(env_manager))
- # for devops manager: power on nodes and wait for SSH
- # for empty manager: do nothing
- # for maas manager: provision nodes and wait for SSH
+ # for devops env_manager: power on nodes and wait for SSH
+ # for empty env_manager: do nothing
+ # for maas env_manager: provision nodes and wait for SSH
if not env.has_snapshot(ext.SNAPSHOT.hardware):
env.create_snapshot(ext.SNAPSHOT.hardware)
@@ -193,11 +194,11 @@
def basic_underlay():
# If config.underlay.ssh wasn't provided from external config, then
- # try to get necessary data from hardware manager (fuel-devops)
+ # try to get necessary data from hardware env_manager (fuel-devops)
- # for devops manager: power on nodes and wait for SSH
- # for empty manager: do nothing
- # for maas manager: provision nodes and wait for SSH
+ # for devops env_manager: power on nodes and wait for SSH
+ # for empty env_manager: do nothing
+ # for maas env_manager: provision nodes and wait for SSH
hardware.start(underlay_node_roles=config.underlay.roles,
timeout=config.underlay.bootstrap_timeout)
diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 5717875..e930729 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -86,8 +86,8 @@
_default_cluster_maas_config = 'cluster_infra_maas.yml'
hardware_opts = [
- ct.Cfg('manager', ct.String(),
- help="Hardware manager name", default="devops"),
+ ct.Cfg('env_manager', ct.String(),
+ help="Hardware environment manager name", default="devops"),
ct.Cfg('conf_path', ct.String(),
help="Hardware config file", default=_default_conf),
ct.Cfg('current_snapshot', ct.String(),
diff --git a/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh b/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
index ed0e190..eeda42b 100755
--- a/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
+++ b/tcp_tests/templates/_heat_environments/microcloud-8116-cookied-cicd-queens-dvr-sl.sh
@@ -18,7 +18,7 @@
export IMAGE_PATH_CFG01_DAY01=/home/jenkins/images/cfg01-day01.qcow2
export REPOSITORY_SUITE=2019.2.0
-export MANAGER=heat
+export ENV_MANAGER=heat
export ENV_NAME=test_env_queens
export LAB_CONFIG_NAME=cookied-cicd-queens-dvr-sl
diff --git a/tcp_tests/templates/_heat_environments/microcloud-8116.env b/tcp_tests/templates/_heat_environments/microcloud-8116.env
index a4cd821..9570a55 100644
--- a/tcp_tests/templates/_heat_environments/microcloud-8116.env
+++ b/tcp_tests/templates/_heat_environments/microcloud-8116.env
@@ -1,8 +1,11 @@
---
parameter_defaults:
- flavor_medium: baremetal
- image_ubuntu_cloud_xenial: ironic_provision_image
+ #flavor_medium: baremetal
+ flavor_medium: cfg01-virtual
+ flavor_ctl: ctl-virtual
+ image_vcp: ironic_provision_image
+ image_ubuntu_cloud_xenial: cfg01-day01
#keypair: system-ci-keypair
keypair: baremetal
@@ -14,5 +17,8 @@
management_subnet_pool_start: 10.13.0.20
management_subnet_pool_end: 10.13.0.60
management_subnet_gateway_ip: 10.13.0.1
+ management_subnet_cfg01_ip: 10.13.0.15
+
+ cfg01_configdrive_image: cfg01.cookied-cicd-queens-dvr-sl-config-drive.iso
dns_nameservers: 172.18.208.44
...
diff --git a/tcp_tests/utils/gen_test_config.py b/tcp_tests/utils/gen_test_config.py
index 17360ab..6e9c85d 100755
--- a/tcp_tests/utils/gen_test_config.py
+++ b/tcp_tests/utils/gen_test_config.py
@@ -31,7 +31,7 @@
CONFIG_TMPL = OrderedDict([
('hardware', {
- 'manager': 'heat',
+ 'env_manager': 'heat',
'current_snapshot': None
}),
('underlay', {