openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Add methods to prepare cluster for MU installing" into stable/mitaka

This commit is contained in:
Jenkins 2016-09-29 11:10:35 +00:00 committed by Gerrit Code Review
parent c507029041 349e2ce033
commit 96f7541712
8 changed files with 428 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/base_tests.rst
View File

@ -688,6 +688,10 @@ Test OpenStack Upgrades
.. automodule:: fuelweb_test.tests.tests_upgrade.test_customizations_check
:members:
.. automodule:: fuelweb_test.tests.tests_upgrade.tests_install_mu.test_install_mu_base
:members:
Tests for separated services
============================

14
fuelweb_test/settings.py
View File

@ -751,3 +751,17 @@ FUEL_RELEASE_PATH = os.environ.get("FUEL_RELEASE_PATH")
MASTER_NODE_EXTRA_PACKAGES = os.environ.get("MASTER_NODE_EXTRA_PACKAGES", "")
LOG_SNAPSHOT_TIMEOUT = int(os.environ.get("LOG_SNAPSHOT_TIMEOUT", 10 * 60))
UPGRADE_CLUSTER_FROM_PROPOSED = get_var_as_bool(
"UPGRADE_CLUSTER_FROM_PROPOSED", True)
UPGRADE_CLUSTER_FROM_PROPOSED_DEB = os.environ.get(
"UPGRADE_CLUSTER_FROM_PROPOSED_DEB")
UPGRADE_CLUSTER_FROM_PROPOSED_RPM = os.environ.get(
"UPGRADE_CLUSTER_FROM_PROPOSED_RPM")
UPGRADE_CLUSTER_FROM_PROPOSED_RPM_KEY = os.environ.get(
"UPGRADE_CLUSTER_FROM_PROPOSED_RPM_KEY")
# Remove after 9.1 release
CUDET_UBUNTU_DB_URL = os.environ.get("CUDET_UBUNTU_DB_URL")
CUDET_CENTOS_DB_URL = os.environ.get("CUDET_CENTOS_DB_URL")

4
fuelweb_test/tests/test_ceph.py
View File

@ -472,6 +472,8 @@ class CephRadosGW(TestBasic):
def radosgw_started(remote):
return remote.check_call('pkill -0 radosgw')['exit_code'] == 0
self.check_run("ceph_rados_gw")
self.env.revert_snapshot("ready")
self.env.bootstrap_nodes(
self.env.d_env.nodes().slaves[:6])
@ -529,7 +531,7 @@ class CephRadosGW(TestBasic):
with self.fuel_web.get_ssh_for_node('slave-01') as remote:
assert_true(radosgw_started(remote), 'radosgw daemon started')
self.env.make_snapshot("ceph_rados_gw")
self.env.make_snapshot("ceph_rados_gw", is_make=True)
@test(groups=["ceph_ha_one_controller", "ceph_migration"])

5
fuelweb_test/tests/test_ha_one_controller.py
View File

@ -405,6 +405,8 @@ class MultiroleComputeCinder(TestBasic):
Snapshot: deploy_multirole_compute_cinder
"""
self.check_run("deploy_multirole_compute_cinder")
self.show_step(1)
self.env.revert_snapshot("ready_with_3_slaves")
cluster_id = self.fuel_web.create_cluster(
@ -425,7 +427,8 @@ class MultiroleComputeCinder(TestBasic):
self.fuel_web.run_ostf(cluster_id=cluster_id)
self.env.make_snapshot("deploy_multirole_compute_cinder")
self.env.make_snapshot("deploy_multirole_compute_cinder",
is_make=True)
@test(groups=["multirole"])

3
fuelweb_test/tests/test_ironic_base.py
View File

@ -363,6 +363,7 @@ class TestIronicDeploy(TestBasic):
Snapshot ironic_deploy_ceilometer
"""
self.check_run("ironic_deploy_ceilometer")
self.env.revert_snapshot("ready_with_3_slaves")
data = {
@ -395,7 +396,7 @@ class TestIronicDeploy(TestBasic):
self.show_step(9)
ironic_conn.verify_vms_connection(ironic_conn)
self.env.make_snapshot("ironic_deploy_ceilometer")
self.env.make_snapshot("ironic_deploy_ceilometer", is_make=True)
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["deploy_scale_controller_ironic"])

8
fuelweb_test/tests/test_services.py
View File

@ -158,6 +158,8 @@ class SaharaHA(TestBasic):
"""
self.check_run("deploy_sahara_ha_tun")
self.env.revert_snapshot("ready_with_5_slaves")
logger.debug('Create Fuel cluster for Sahara tests')
@ -236,7 +238,7 @@ class SaharaHA(TestBasic):
cluster_id=cluster_id, test_sets=['tests_platform'],
test_name=path_to_tests + test_name, timeout=60 * 200)
self.env.make_snapshot("deploy_sahara_ha_tun")
self.env.make_snapshot("deploy_sahara_ha_tun", is_make=True)
@test(groups=["services", "services.murano", "services_ha_one_controller"])
@ -342,6 +344,8 @@ class MuranoHA(TestBasic):
Snapshot: deploy_murano_ha_with_tun
"""
self.check_run("deploy_murano_ha_with_tun")
self.env.revert_snapshot("ready_with_5_slaves")
data = {
@ -397,7 +401,7 @@ class MuranoHA(TestBasic):
cluster_id=cluster_id, test_sets=['tests_platform'],
test_name=test_name, timeout=60 * 20)
self.env.make_snapshot("deploy_murano_ha_with_tun")
self.env.make_snapshot("deploy_murano_ha_with_tun", is_make=True)
class OSTFCeilometerHelper(TestBasic):

0
fuelweb_test/tests/tests_upgrade/tests_install_mu/__init__.py Normal file
View File

395
fuelweb_test/tests/tests_upgrade/tests_install_mu/test_install_mu_base.py Normal file
View File

@ -0,0 +1,395 @@
# Copyright 2016 Mirantis, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from __future__ import unicode_literals
from proboscis import test
from proboscis.asserts import assert_true
from fuelweb_test import logger
from fuelweb_test.helpers.utils import pretty_log
from fuelweb_test.helpers.utils import YamlEditor
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test import settings
from fuelweb_test.tests import test_cli_base
from gates_tests.helpers import exceptions
@test(groups=["prepare_mu_installing"])
class MUInstallBase(test_cli_base.CommandLine):
def _add_cluster_repo(self, cluster_id, repo):
attributes = self.fuel_web.client.get_cluster_attributes(cluster_id)
repos_attr = attributes['editable']['repo_setup']['repos']
repos_attr['value'].append(repo)
self.fuel_web.client.update_cluster_attributes(cluster_id, attributes)
@staticmethod
def check_env_var():
if not settings.PATCHING_DISABLE_UPDATES \
and not settings.REPLACE_DEFAULT_REPOS \
and not settings.REPLACE_DEFAULT_REPOS_ONLY_ONCE:
raise exceptions.FuelQAVariableNotSet(
(settings.PATCHING_DISABLE_UPDATES,
settings.REPLACE_DEFAULT_REPOS,
settings.REPLACE_DEFAULT_REPOS_ONLY_ONCE),
'True')
def _enable_mos_updates_repo(self):
cmd = "yum-config-manager --enable mos9.0-* --save"
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
)
backup_path = "/var/astute.yaml"
admin_ip = self.env.get_admin_node_ip()
backup = YamlEditor(backup_path,
ip=admin_ip
).get_content()
with YamlEditor(settings.FUEL_SETTINGS_YAML,
ip=admin_ip) as editor:
editor.content['BOOTSTRAP']['repos'] = backup['BOOTSTRAP'][
'repos']
def _prepare_for_update(self, cluster_id):
cmd = "update-prepare prepare env {}".format(cluster_id)
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
)
def _add_centos_test_proposed_repo(self, repo_url, key):
cmds = ["yum-config-manager --add-repo {}".format(repo_url),
"rpm --import {}".format(key)]
for cmd in cmds:
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd)
def _check_for_potential_updates(self, cluster_id, updated=False):
# "cudet" command don't have json output
if updated:
cmd = "cudet -e {}".format(cluster_id)
std_out = self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
).stdout_str
logger.debug(pretty_log(std_out))
assert_true(
"ALL NODES UP-TO-DATE" in std_out,
"There potential updates "
"after installing MU:/n{}".format(pretty_log(std_out)))
return
logger.warning(
"Execute workaround for disabling cudet online DB's. "
"Remove after 9.1 release")
# TODO - remove all 4 steps of workaround after 9.1 release
# step 1 of workaround -download sqlite db's to cudet db folded
cudet_db_path = "/usr/share/cudet/db/versions/9.0/"
centos_db_url = settings.CUDET_CENTOS_DB_URL
ubuntu_db_url = settings.CUDET_UBUNTU_DB_URL
cmds = ["wget {} -O {}/{}".format(centos_db_url,
cudet_db_path,
"centos.sqlite"),
"wget {} -O {}/{}".format(ubuntu_db_url,
cudet_db_path,
"ubuntu.sqlite")]
for cmd in cmds:
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd)
# step 2 of workaround -backup cudet "main.py"
cudet_file_path = "/usr/lib/python2.7/" \
"site-packages/cudet/main.py"
cmd = "cp {} /tmp/main.py".format(cudet_file_path)
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
)
# step 3 of workaround -disable updating db's
cmd = 'sed -i "s/ext_db = online(' \
'release, os_platform, \'sqlite\')/' \
'return False/" {}'.format(cudet_file_path)
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
)
cmd = "cudet -e {}".format(cluster_id)
std_out = self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
).stdout_str
logger.debug(pretty_log(std_out))
assert_true(
"ALL NODES UP-TO-DATE" not in std_out.split(
"Potential updates:")[1] and "GA to MU" in std_out.split(
"Potential updates:")[1],
"There are no potential updates "
"before installing MU. Check availability of mos-updates repo:"
"/n{}".format(pretty_log(std_out)))
# step 4 of workaround -discard changes in cudet main.py
cmd = "mv /tmp/main.py {}".format(cudet_file_path)
self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
)
def _install_mu(self, cluster_id, repos=None):
if repos:
cmd = "fuel2 update install --env {} --repos {} " \
"--restart-rabbit --restart-mysql".format(cluster_id,
repos)
else:
cmd = "fuel2 update install --env {}" \
"--restart-rabbit --restart-mysql ".format(cluster_id)
std_out = self.ssh_manager.check_call(
ip=self.ssh_manager.admin_ip,
command=cmd
).stderr_str
# "fuel2 update" command don't have json output
assert_true(
"fuel2 task show" in std_out,
"fuel2 update command don't return task id: \n {}".format(std_out))
task_id = int(std_out.split("fuel2 task show")[1].split("`")[0])
task = self.get_task(task_id)
self.assert_cli_task_success(task,
timeout=120 * 60)
def _prepare_cluster_for_mu(self):
cluster_id = self.fuel_web.get_last_created_cluster()
mos_repo = {
'name': 'mos-updates',
'section': 'main restricted',
'uri': 'http://mirror.fuel-infra.org/mos-repos/ubuntu/9.0/',
'priority': 1050,
'suite':
'mos9.0-updates',
'type': 'deb'}
self.show_step(self.next_step)
self._enable_mos_updates_repo()
logger.debug("Enable DEB mos-updates repo")
self._add_cluster_repo(cluster_id, mos_repo)
if settings.UPGRADE_CLUSTER_FROM_PROPOSED:
proposed = {
'name': 'proposed',
'section': 'main restricted',
'uri': settings.UPGRADE_CLUSTER_FROM_PROPOSED_DEB,
'priority': 1200,
'suite':
'mos9.0-proposed',
'type': 'deb'}
self._add_cluster_repo(cluster_id, proposed)
repo_url = settings.UPGRADE_CLUSTER_FROM_PROPOSED_RPM
key = settings.UPGRADE_CLUSTER_FROM_PROPOSED_RPM_KEY
self._add_centos_test_proposed_repo(repo_url, key)
with YamlEditor(settings.FUEL_SETTINGS_YAML,
ip=self.env.get_admin_node_ip()) as editor:
editor.content['BOOTSTRAP']['repos'].append(proposed)
self.show_step(self.next_step)
self.show_step(self.next_step)
self.env.admin_install_updates()
self.show_step(self.next_step)
self._prepare_for_update(cluster_id)
self.show_step(self.next_step)
self.env.admin_actions.wait_for_fuel_ready(timeout=600)
@test(depends_on_groups=["deploy_multirole_compute_cinder"],
groups=["prepare_for_install_mu_non_ha_cluster"])
@log_snapshot_after_test
def prepare_for_install_mu_non_ha_cluster(self):
"""Update master node and install packages for MU installing
Scenario:
1. Revert snapshot deploy_multirole_compute_cinder
2. Enable updates repo
3. Prepare master node for update
4. Update master node
5. Prepare env for update
6. Check Fuel services
Duration: 20m
Snapshot: prepare_for_install_mu_non_ha_cluster
"""
self.check_env_var()
self.check_run("prepare_for_install_mu_non_ha_cluster")
self.show_step(1)
self.env.revert_snapshot("deploy_multirole_compute_cinder")
self._prepare_cluster_for_mu()
self.env.make_snapshot(
"prepare_for_install_mu_non_ha_cluster",
is_make=True)
@test(depends_on_groups=["ceph_rados_gw"],
groups=["prepare_for_install_mu_ha_cluster"])
@log_snapshot_after_test
def prepare_for_install_mu_ha_cluster(self):
"""Update master node and install packages for MU installing
Scenario:
1. Revert snapshot ceph_rados_gw
2. Enable updates repo
3. Prepare master node for update
4. Update master node
5. Prepare env for update
6. Check Fuel services
Duration: 20m
Snapshot: prepare_for_install_mu_ha_cluster
"""
self.check_env_var()
self.check_run("prepare_for_install_mu_ha_cluster")
self.show_step(1)
self.env.revert_snapshot("ceph_rados_gw")
self._prepare_cluster_for_mu()
self.env.make_snapshot(
"prepare_for_install_mu_ha_cluster",
is_make=True)
@test(depends_on_groups=["ironic_deploy_ceilometer"],
groups=["prepare_for_install_mu_services_1"])
@log_snapshot_after_test
def prepare_for_install_mu_services_1(self):
"""Update master node and install packages for MU installing
Scenario:
1. Revert snapshot ironic_deploy_ceilometer
2. Enable updates repo
3. Prepare master node for update
4. Update master node
5. Prepare env for update
6. Check Fuel services
Duration: 20m
Snapshot: prepare_for_install_mu_services_1
"""
self.check_env_var()
self.check_run("prepare_for_install_mu_services_1")
self.show_step(1)
self.env.revert_snapshot("ironic_deploy_ceilometer")
self._prepare_cluster_for_mu()
self.env.make_snapshot(
"prepare_for_install_mu_services_1",
is_make=True)
@test(depends_on_groups=["deploy_sahara_ha_tun"],
groups=["prepare_for_install_mu_services_2"])
@log_snapshot_after_test
def prepare_for_install_mu_services_2(self):
"""Update master node and install packages for MU installing
Scenario:
1. Revert snapshot deploy_sahara_ha_tun
2. Enable updates repo
3. Prepare master node for update
4. Update master node
5. Prepare env for update
6. Check Fuel services
Duration: 20m
Snapshot: prepare_for_install_mu_services_2
"""
self.check_env_var()
self.check_run("prepare_for_install_mu_services_2")
self.show_step(1)
self.env.revert_snapshot("deploy_sahara_ha_tun")
self._prepare_cluster_for_mu()
self.env.make_snapshot(
"prepare_for_install_mu_services_2",
is_make=True)
@test(depends_on_groups=["deploy_murano_ha_with_tun"],
groups=["prepare_for_install_mu_services_3"])
@log_snapshot_after_test
def prepare_for_install_mu_services_3(self):
"""Update master node and install packages for MU installing
Scenario:
1. Revert snapshot deploy_sahara_ha_tun
2. Enable updates repo
3. Prepare master node for update
4. Update master node
5. Prepare env for update
6. Check Fuel services
Duration: 20m
Snapshot: prepare_for_install_mu_services_3
"""
self.check_env_var()
self.check_run("prepare_for_install_mu_services_3")
self.show_step(1)
self.env.revert_snapshot("deploy_murano_ha_with_tun")
self._prepare_cluster_for_mu()
self.env.make_snapshot(
"prepare_for_install_mu_services_3",
is_make=True)