From d972286f94fe2b947a0b9f7ff996e63de89e5a3d Mon Sep 17 00:00:00 2001 From: Patricia Reinoso Date: Mon, 18 Nov 2024 16:56:01 +0000 Subject: [PATCH] feat: add NMS integration with TLS --- README.md | 1 + tests/integration/test_integration.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index a99d465..e9fb1b8 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ juju deploy self-signed-certificates --channel=stable juju integrate sdcore-nms-k8s:common_database mongodb-k8s:database juju integrate sdcore-nms-k8s:auth_database mongodb-k8s:database +juju integrate sdcore-nms-k8s:certificates self-signed-certificates:certificates juju integrate sdcore-nrf-k8s self-signed-certificates:certificates juju integrate sdcore-nrf-k8s:database mongodb-k8s juju integrate sdcore-pcf-k8s:fiveg_nrf sdcore-nrf-k8s:fiveg_nrf diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 7e8284a..6187df7 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -132,6 +132,8 @@ async def test_restore_tls_and_wait_for_active_status(ops_test: OpsTest, deploy) assert ops_test.model await _deploy_tls_provider(ops_test) await ops_test.model.integrate(relation1=APPLICATION_NAME, relation2=TLS_CHARM_NAME) + await ops_test.model.integrate(relation1=NMS_CHARM_NAME, relation2=TLS_CHARM_NAME) + await ops_test.model.integrate(relation1=NRF_CHARM_NAME, relation2=TLS_CHARM_NAME) await ops_test.model.wait_for_idle(apps=[APPLICATION_NAME], status="active", timeout=1000) @@ -154,11 +156,12 @@ async def _deploy_nms(ops_test: OpsTest): channel=NMS_CHARM_CHANNEL, ) await ops_test.model.integrate( - relation1=f"{NMS_CHARM_NAME}:common_database", relation2=f"{DATABASE_CHARM_NAME}" + relation1=f"{NMS_CHARM_NAME}:common_database", relation2=DATABASE_CHARM_NAME ) await ops_test.model.integrate( - relation1=f"{NMS_CHARM_NAME}:auth_database", relation2=f"{DATABASE_CHARM_NAME}" + relation1=f"{NMS_CHARM_NAME}:auth_database", relation2=DATABASE_CHARM_NAME ) + await ops_test.model.integrate(relation1=NMS_CHARM_NAME, relation2=TLS_CHARM_NAME) async def _deploy_nrf(ops_test: OpsTest):