arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor Hacluster.

Browse Source 
Moving the attributes from HaclusterScaleBackAndForthTest to
HaclusterBaseTest allows HaclusterTest to access them and identify the
hacluster application correctly.
This commit is contained in:
Felipe Reyes
2023-05-25 11:50:03 -04:00
parent fdaf43f52c
commit a67e1e0ec7
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
zaza/openstack/charm_tests/hacluster/tests.py
View File

@@ -19,6 +19,7 @@
import logging
import os
import zaza.model
import zaza.openstack.charm_tests.test_utils as test_utils
import zaza.openstack.configure.hacluster
import zaza.utilities.juju as juju_utils
@@ -32,6 +33,15 @@ class HaclusterBaseTest(test_utils.OpenStackBaseTest):
"""Run class setup for running hacluster tests."""
super(HaclusterBaseTest, cls).setUpClass()
cls.vip = os.environ.get("TEST_VIP00")
test_config = cls.test_config['tests_options']['hacluster']
cls._principle_app_name = test_config['principle-app-name']
cls._hacluster_charm_name = test_config['hacluster-charm-name']
cls._hacluster_app_name = ("{}-{}".format(
cls._principle_app_name, cls._hacluster_charm_name))
cls.lead_unit = zaza.model.get_lead_unit_name(
cls._hacluster_app_name,
model_name=cls.model_name)
logging.debug('Leader unit is {}'.format(cls.lead_unit))
class HaclusterTest(HaclusterBaseTest):
@@ -40,7 +50,7 @@ class HaclusterTest(HaclusterBaseTest):
def test_900_action_cleanup(self):
"""The services can be cleaned up."""
zaza.model.run_action_on_leader(
self.application_name,
self._hacluster_app_name,
'cleanup',
raise_on_failure=True)
@@ -56,13 +66,13 @@ class HaclusterTest(HaclusterBaseTest):
"""
config = {"maintenance-mode": expected}
logging.info("Setting config to {}".format(config))
zaza.model.set_application_config(self.application_name, config)
zaza.model.set_application_config(self._hacluster_app_name, config)
if expected == 'true':
_states = {"hacluster": {
_states = {self._hacluster_app_name: {
"workload-status": "maintenance",
"workload-status-message": "Pacemaker in maintenance mode"}}
else:
_states = {"hacluster": {
_states = {self._hacluster_app_name: {
"workload-status": "active",
"workload-status-message": "Unit is ready and clustered"}}
zaza.model.wait_for_application_states(states=_states)
@@ -79,16 +89,6 @@ class HaclusterTest(HaclusterBaseTest):
class HaclusterScaleBackAndForthTest(HaclusterBaseTest):
"""hacluster tests scaling back and forth."""
@classmethod
def setUpClass(cls):
"""Run class setup for running hacluster tests."""
super(HaclusterScaleBackAndForthTest, cls).setUpClass()
test_config = cls.test_config['tests_options']['hacluster']
cls._principle_app_name = test_config['principle-app-name']
cls._hacluster_charm_name = test_config['hacluster-charm-name']
cls._hacluster_app_name = ("{}-{}".format(
cls._principle_app_name, cls._hacluster_charm_name))
def test_930_scaleback(self):
"""Remove one unit, recalculate quorum and re-add one unit.