X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fosm-nbi%2Ftests%2Fintegration%2Ftest_charm.py;h=1528869ab90d73a97067e3d35237b78745b4fd99;hb=refs%2Fchanges%2F99%2F13599%2F9;hp=a7146383e1bbf378eaaa57b9209977c4dbc7d525;hpb=56db64f403eaea09530d1073640eee9b36ff2caf;p=osm%2Fdevops.git diff --git a/installers/charm/osm-nbi/tests/integration/test_charm.py b/installers/charm/osm-nbi/tests/integration/test_charm.py index a7146383..1528869a 100644 --- a/installers/charm/osm-nbi/tests/integration/test_charm.py +++ b/installers/charm/osm-nbi/tests/integration/test_charm.py @@ -42,59 +42,74 @@ MONGO_DB_CHARM = "mongodb-k8s" 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, PROMETHEUS_APP, NBI_APP] +APPS = [KAFKA_APP, MONGO_DB_APP, MARIADB_APP, ZOOKEEPER_APP, KEYSTONE_APP, NBI_APP] @pytest.mark.abort_on_fail -async def test_nbi_is_deployed(ops_test: OpsTest): +async def test_nbi_and_other_charms_are_idle(ops_test: OpsTest): charm = await ops_test.build_charm(".") resources = {"nbi-image": METADATA["resources"]["nbi-image"]["upstream-source"]} await asyncio.gather( ops_test.model.deploy( - charm, resources=resources, application_name=NBI_APP, series="focal" + charm, resources=resources, application_name=NBI_APP, series="jammy" ), ops_test.model.deploy(KAFKA_CHARM, application_name=KAFKA_APP, channel="stable"), - ops_test.model.deploy(MONGO_DB_CHARM, application_name=MONGO_DB_APP, channel="edge"), + 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 # prevents setting correctly the resources - cmd = f"juju deploy {KEYSTONE_CHARM} {KEYSTONE_APP} --resource keystone-image=opensourcemano/keystone:12" + keystone_image = "opensourcemano/keystone:testing-daily" + cmd = f"juju deploy {KEYSTONE_CHARM} {KEYSTONE_APP} --resource keystone-image={keystone_image} --channel=latest/beta --series jammy" await ops_test.run(*shlex.split(cmd), check=True) async with ops_test.fast_forward(): - await ops_test.model.wait_for_idle( - apps=APPS, - ) + 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): assert ops_test.model.applications[NBI_APP].status == "blocked" unit = ops_test.model.applications[NBI_APP].units[0] - assert unit.workload_status_message == "need kafka, mongodb, prometheus, keystone relations" + 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" logger.info("Adding relations for other components") await ops_test.model.add_relation(KAFKA_APP, ZOOKEEPER_APP) await ops_test.model.add_relation(MARIADB_APP, KEYSTONE_APP) - logger.info("Adding relations") - await ops_test.model.add_relation(NBI_APP, MONGO_DB_APP) + logger.info("Adding relations for NBI") + await ops_test.model.add_relation( + "{}: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 @@ -110,18 +125,14 @@ async def test_nbi_scales_up(ops_test: OpsTest): @pytest.mark.abort_on_fail -@pytest.mark.parametrize( - "relation_to_remove", [KAFKA_APP, MONGO_DB_APP, PROMETHEUS_APP, KEYSTONE_APP] -) +@pytest.mark.parametrize("relation_to_remove", [KAFKA_APP, MONGO_DB_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 asyncio.gather( - ops_test.model.applications[relation_to_remove].remove_relation(local_relation, NBI_APP) - ) + await 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" @@ -129,10 +140,7 @@ async def test_nbi_blocks_without_relation(ops_test: OpsTest, relation_to_remove 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 @@ -158,10 +166,7 @@ async def test_nbi_action_debug_mode_disabled(ops_test: OpsTest): 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( @@ -181,17 +186,15 @@ async def test_nbi_action_debug_mode_enabled(ops_test: OpsTest): @pytest.mark.abort_on_fail async def test_nbi_integration_ingress(ops_test: OpsTest): - await asyncio.gather( - ops_test.model.deploy(INGRESS_CHARM, application_name=INGRESS_APP, channel="beta"), - ) + # Temporal workaround due to python-libjuju 2.9.42.2 bug fixed in + # https://github.com/juju/python-libjuju/pull/854 + # To be replaced when juju version 2.9.43 is used. + cmd = f"juju deploy {INGRESS_CHARM} {INGRESS_APP} --channel stable" + 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")