|
15 | 15 | from pytest_operator.plugin import OpsTest |
16 | 16 |
|
17 | 17 | from .. import juju_ |
18 | | -from ..helpers import ( |
19 | | - execute_queries_on_unit, |
20 | | - get_cluster_status, |
21 | | - get_leader_unit, |
22 | | - get_relation_data, |
23 | | -) |
| 18 | +from ..helpers import execute_queries_on_unit, get_cluster_status, get_leader_unit |
24 | 19 | from ..markers import juju3 |
25 | 20 | from .high_availability_helpers import DATABASE_NAME, TABLE_NAME |
26 | 21 |
|
@@ -228,11 +223,10 @@ async def test_standby_promotion( |
228 | 223 |
|
229 | 224 | assert leader_unit is not None, "No leader unit found on standby cluster" |
230 | 225 |
|
231 | | - relation_data = await get_relation_data(ops_test, MYSQL_APP1, "database-peers") |
232 | | - cluster_set_name = relation_data[0]["application-data"]["cluster-set-domain-name"] |
233 | 226 | logger.info("Promoting standby cluster to primary") |
234 | 227 | await juju_.run_action( |
235 | | - leader_unit, "promote-to-primary", **{"cluster-set-name": cluster_set_name} |
| 228 | + leader_unit, |
| 229 | + "promote-to-primary", |
236 | 230 | ) |
237 | 231 |
|
238 | 232 | results = await get_max_written_value(first_model, second_model) |
@@ -261,12 +255,10 @@ async def test_failover(ops_test: OpsTest, first_model: Model, second_model: Mod |
261 | 255 | logger.info("Promoting standby cluster to primary with force flag") |
262 | 256 | leader_unit = await get_leader_unit(None, MYSQL_APP1, first_model) |
263 | 257 | assert leader_unit is not None, "No leader unit found" |
264 | | - relation_data = await get_relation_data(ops_test, MYSQL_APP1, "database-peers") |
265 | | - cluster_set_name = relation_data[0]["application-data"]["cluster-set-domain-name"] |
266 | 258 | await juju_.run_action( |
267 | 259 | leader_unit, |
268 | 260 | "promote-to-primary", |
269 | | - **{"--wait": "5m", "cluster-set-name": cluster_set_name, "force": True}, |
| 261 | + **{"--wait": "5m", "force": True}, |
270 | 262 | ) |
271 | 263 |
|
272 | 264 | cluster_set_status = await get_cluster_status(leader_unit, cluster_set=True) |
|
0 commit comments