Skip to content

Removing remaining changes even after reverting an old commit. #1270

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
xtrusia wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Removing remaining changes even after reverting an old commit. #1270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b6db21f
Removing remaining changes even after reverting an old commit.
xtrusia Oct 1, 2024
1e8944c
Merge branch 'openstack-charmers:master' into master
xtrusia Oct 1, 2025
3bc5563
Adding config proxyv2 test
Oct 1, 2025
93a9804
Merge branch 'openstack-charmers:master' into master
xtrusia Feb 3, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions zaza/openstack/charm_tests/keystone/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,19 @@ def test_200_config_flags_precedence(self):
"user_tree_dn value is expected to be present "
"and set to dc=test,dc=com in the config file")

class KeystoneProxyV2Test(BaseKeystoneTest):

"""Test keystone proxy v2."""
def test_proxy_v2(self):
"""Test keystone proxy v2."""

with self.config_change({
'haproxy-enable-proxyv2': True
}):
logging.info("Waiting for keystone to settle")
zaza.model.wait_for_application_states()
zaza.model.block_until_all_units_idle()
logging.info("Keystone units settled")

class KeystoneTempestTestK8S(tempest_tests.TempestTestScaleK8SBase):
"""Test keystone k8s scale out and scale back."""
Expand Down
63 changes: 0 additions & 63 deletions zaza/openstack/charm_tests/mysql/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1145,66 +1145,3 @@ def test_910_restart_on_config_change(self):
{}, {},
self.services)
logging.info("Passed restart on changed test.")

def test_920_mysqlrouter_conf_broken(self):
"""Checking conf broken case.

Run the bootstrap when conf is broken
"""
# application_name on test is keystone-mysql-router
# using self.conf_file introduces error.
# instead of changing current self.conf_file,
# define one (it could introduce another issue)
config_file = (
"/var/lib/mysql/{}/mysqlrouter.conf"
.format(self.application_name))

logging.info("Starting broken conf test")

# put empty string to conf_file and make it wrong
logging.info("Breaking configuration file")
zaza.model.run_on_leader(self.application,
"echo '[DEFAULT]\n \
[metadata_cache:[\\w$]+$] \
' > {}".format(
config_file))

logging.info("Getting configuration file")
recovered = zaza.model.run_on_leader(self.application,
"cat {}".format(
config_file))['Stdout']

# Checking conf file length,
# if file is broken it is around 250
assert len(recovered) < 1000, (
"Breaking mysqlrouter conf failed.")

# verify it is in error state
for attempt in tenacity.Retrying(
reraise=True,
wait=tenacity.wait_fixed(10),
stop=tenacity.stop_after_attempt(30),
):
with attempt:
# update status to make the status error
logging.info("Run update-status")
self.run_update_status_hooks(['keystone-mysql-router/0'])

# get current status
unit_status = (zaza.model.get_status()
.applications
['keystone-mysql-router']['status'])
logging.info("Status:{}".format(unit_status['status']))
self.assertEqual(unit_status['status'], "active")

logging.info("Getting configuration file")
recovered = zaza.model.run_on_leader(self.application,
"cat {}".format(
config_file))['Stdout']

# Checking conf file length,
# if file is broken it is around 250
assert len(recovered) > 1000, (
"Fixing mysqlrouter conf failed.")

logging.info("Passed broken conf test.")
Loading