diff --git a/README.md b/README.md index c760177..a99d465 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ 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 juju integrate sdcore-pcf-k8s:certificates self-signed-certificates:certificates -juju integrate sdcore-pcf-k8s:sdcore-config sdcore-nms-k8s:sdcore-config +juju integrate sdcore-pcf-k8s:sdcore_config sdcore-nms-k8s:sdcore_config ``` ## Image diff --git a/charmcraft.yaml b/charmcraft.yaml index 087f43a..c5e4f69 100644 --- a/charmcraft.yaml +++ b/charmcraft.yaml @@ -41,7 +41,7 @@ requires: interface: tls-certificates logging: interface: loki_push_api - sdcore-config: + sdcore_config: interface: sdcore_config provides: diff --git a/src/charm.py b/src/charm.py index c358065..421e2f2 100755 --- a/src/charm.py +++ b/src/charm.py @@ -51,7 +51,7 @@ CERTIFICATE_NAME = "pcf.pem" CERTIFICATE_COMMON_NAME = "pcf.sdcore" LOGGING_RELATION_NAME = "logging" -SDCORE_CONFIG_RELATION_NAME = "sdcore-config" +SDCORE_CONFIG_RELATION_NAME = "sdcore_config" WORKLOAD_VERSION_FILE_NAME = "/etc/workload-version" diff --git a/terraform/outputs.tf b/terraform/outputs.tf index 90ddbba..1019266 100644 --- a/terraform/outputs.tf +++ b/terraform/outputs.tf @@ -25,7 +25,7 @@ output "logging_endpoint" { output "sdcore_config_endpoint" { description = "Name of the endpoint used to integrate with the NMS." - value = "sdcore-config" + value = "sdcore_config" } # Provided integration endpoints diff --git a/tests/integration/test_integration.py b/tests/integration/test_integration.py index 40124fc..870925b 100644 --- a/tests/integration/test_integration.py +++ b/tests/integration/test_integration.py @@ -66,8 +66,8 @@ async def test_relate_and_wait_for_active_status(ops_test: OpsTest, deploy): ) await ops_test.model.integrate(relation1=APPLICATION_NAME, relation2=TLS_CHARM_NAME) await ops_test.model.integrate( - relation1=f"{APPLICATION_NAME}:sdcore-config", - relation2=f"{NMS_CHARM_NAME}:sdcore-config", + relation1=f"{APPLICATION_NAME}:sdcore_config", + relation2=f"{NMS_CHARM_NAME}:sdcore_config", ) await ops_test.model.integrate( relation1=f"{APPLICATION_NAME}:logging", @@ -110,8 +110,8 @@ async def test_restore_nms_and_wait_for_active_status(ops_test: OpsTest, deploy) assert ops_test.model await _deploy_nms(ops_test) await ops_test.model.integrate( - relation1=f"{APPLICATION_NAME}:sdcore-config", - relation2=f"{NMS_CHARM_NAME}:sdcore-config", + relation1=f"{APPLICATION_NAME}:sdcore_config", + relation2=f"{NMS_CHARM_NAME}:sdcore_config", ) await ops_test.model.wait_for_idle(apps=[APPLICATION_NAME], status="active", timeout=1000) diff --git a/tests/unit/fixtures.py b/tests/unit/fixtures.py index 4334ad0..cac7115 100644 --- a/tests/unit/fixtures.py +++ b/tests/unit/fixtures.py @@ -31,7 +31,7 @@ PRIVATE_KEY_PATH = "support/TLS/pcf.key" VALID_NRF_URL = "https://nrf:443" WEBUI_URL = "sdcore-webui:9876" -SDCORE_CONFIG_RELATION_NAME = "sdcore-config" +SDCORE_CONFIG_RELATION_NAME = "sdcore_config" NMS_APPLICATION_NAME = "sdcore-nms-operator" diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py index 1da3023..7ff7c17 100644 --- a/tests/unit/test_charm.py +++ b/tests/unit/test_charm.py @@ -31,7 +31,7 @@ PRIVATE_KEY_PATH = "support/TLS/pcf.key" VALID_NRF_URL = "https://nrf:443" WEBUI_URL = "sdcore-webui:9876" -SDCORE_CONFIG_RELATION_NAME = "sdcore-config" +SDCORE_CONFIG_RELATION_NAME = "sdcore_config" class TestCharm(PCFUnitTestFixtures): @@ -85,7 +85,7 @@ def test_given_container_can_connect_and_sdcore_config_relation_is_not_created_w self.harness.evaluate_status() assert self.harness.model.unit.status == BlockedStatus( - "Waiting for sdcore-config relation(s)" + "Waiting for sdcore_config relation(s)" ) def test_given_pcf_charm_in_active_state_when_nrf_relation_breaks_then_status_is_blocked( @@ -115,7 +115,7 @@ def test_given_pcf_charm_in_active_state_when_sdcore_config_relation_breaks_then self.harness.evaluate_status() assert self.harness.model.unit.status == BlockedStatus( - "Waiting for sdcore-config relation(s)" + "Waiting for sdcore_config relation(s)" ) def test_given_container_can_connect_and_fiveg_nrf_relation_is_not_available_when_collect_status_then_status_is_waiting( # noqa: E501