MONGO_DB_APP = "mongodb"
KEYSTONE_CHARM = "osm-keystone"
KEYSTONE_APP = "keystone"
+PROMETHEUS_CHARM = "osm-prometheus"
+PROMETHEUS_APP = "prometheus"
ZOOKEEPER_CHARM = "zookeeper-k8s"
ZOOKEEPER_APP = "zookeeper"
INGRESS_CHARM = "nginx-ingress-integrator"
INGRESS_APP = "ingress"
-APPS = [KAFKA_APP, MONGO_DB_APP, MARIADB_APP, ZOOKEEPER_APP, KEYSTONE_APP, NBI_APP]
+APPS = [KAFKA_APP, MONGO_DB_APP, MARIADB_APP, ZOOKEEPER_APP, KEYSTONE_APP, PROMETHEUS_APP, NBI_APP]
@pytest.mark.abort_on_fail
-async def test_nbi_and_other_charms_are_idle(ops_test: OpsTest):
+async def test_nbi_is_deployed(ops_test: OpsTest):
charm = await ops_test.build_charm(".")
resources = {"nbi-image": METADATA["resources"]["nbi-image"]["upstream-source"]}
ops_test.model.deploy(MONGO_DB_CHARM, application_name=MONGO_DB_APP, channel="5/edge"),
ops_test.model.deploy(MARIADB_CHARM, application_name=MARIADB_APP, channel="stable"),
ops_test.model.deploy(ZOOKEEPER_CHARM, application_name=ZOOKEEPER_APP, channel="stable"),
+ ops_test.model.deploy(PROMETHEUS_CHARM, application_name=PROMETHEUS_APP, channel="stable"),
)
# Keystone charm has to be deployed differently since
# bug https://github.com/juju/python-libjuju/issues/766
await ops_test.run(*shlex.split(cmd), check=True)
async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=APPS)
-
-
-@pytest.mark.abort_on_fail
-async def test_nbi_is_blocked_when_prometheus_config_is_invalid(ops_test: OpsTest):
+ await ops_test.model.wait_for_idle(
+ apps=APPS,
+ )
assert ops_test.model.applications[NBI_APP].status == "blocked"
unit = ops_test.model.applications[NBI_APP].units[0]
- assert unit.workload_status_message == "need prometheus-url config"
-
- await ops_test.model.applications[NBI_APP].set_config({"prometheus-url": "some_url"})
- async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=[NBI_APP], status="blocked")
- assert unit.workload_status_message == "Invalid value for prometheus-url config: 'some_url'"
-
- await ops_test.model.applications[NBI_APP].set_config(
- {"prometheus-url": "http://prometheus:0231"}
- )
-
-
-@pytest.mark.abort_on_fail
-async def test_nbi_is_blocked_when_relations_are_missing(ops_test: OpsTest):
- async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=[NBI_APP], status="blocked")
- unit = ops_test.model.applications[NBI_APP].units[0]
- assert unit.workload_status_message == "need kafka, mongodb, keystone relations"
+ assert unit.workload_status_message == "need kafka, mongodb, prometheus, keystone relations"
logger.info("Adding relations for other components")
await ops_test.model.add_relation(KAFKA_APP, ZOOKEEPER_APP)
"{}:mongodb".format(NBI_APP), "{}:database".format(MONGO_DB_APP)
)
await ops_test.model.add_relation(NBI_APP, KAFKA_APP)
+ await ops_test.model.add_relation(NBI_APP, PROMETHEUS_APP)
await ops_test.model.add_relation(NBI_APP, KEYSTONE_APP)
async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=APPS, status="active")
+ await ops_test.model.wait_for_idle(
+ apps=APPS,
+ status="active",
+ )
@pytest.mark.abort_on_fail
@pytest.mark.abort_on_fail
-@pytest.mark.parametrize("relation_to_remove", [KAFKA_APP, MONGO_DB_APP, KEYSTONE_APP])
+@pytest.mark.parametrize(
+ "relation_to_remove", [KAFKA_APP, MONGO_DB_APP, PROMETHEUS_APP, KEYSTONE_APP]
+)
async def test_nbi_blocks_without_relation(ops_test: OpsTest, relation_to_remove):
logger.info("Removing relation: %s", relation_to_remove)
# mongoDB relation is named "database"
local_relation = relation_to_remove
if local_relation == MONGO_DB_APP:
local_relation = "database"
- await ops_test.model.applications[relation_to_remove].remove_relation(local_relation, NBI_APP)
+ await asyncio.gather(
+ ops_test.model.applications[relation_to_remove].remove_relation(local_relation, NBI_APP)
+ )
async with ops_test.fast_forward():
await ops_test.model.wait_for_idle(apps=[NBI_APP])
assert ops_test.model.applications[NBI_APP].status == "blocked"
assert unit.workload_status_message == f"need {relation_to_remove} relation"
await ops_test.model.add_relation(NBI_APP, relation_to_remove)
async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=APPS, status="active")
+ await ops_test.model.wait_for_idle(
+ apps=APPS,
+ status="active",
+ )
@pytest.mark.abort_on_fail
async def test_nbi_action_debug_mode_enabled(ops_test: OpsTest):
await ops_test.model.applications[NBI_APP].set_config({"debug-mode": "true"})
async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=APPS, status="active")
+ await ops_test.model.wait_for_idle(
+ apps=APPS,
+ status="active",
+ )
logger.info("Running action 'get-debug-mode-information'")
# list of units is not ordered
unit_id = list(
await ops_test.run(*shlex.split(cmd), check=True)
async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=APPS + [INGRESS_APP])
+ await ops_test.model.wait_for_idle(
+ apps=APPS + [INGRESS_APP],
+ )
await ops_test.model.add_relation(NBI_APP, INGRESS_APP)
async with ops_test.fast_forward():
- await ops_test.model.wait_for_idle(apps=APPS + [INGRESS_APP], status="active")
+ await ops_test.model.wait_for_idle(
+ apps=APPS + [INGRESS_APP],
+ status="active",
+ )