Unittests

canonical · Oct 9, 2024 · ac3e66a · ac3e66a
1 parent a55f1a0
commit ac3e66a
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 74 deletions.
diff --git a/tests/unit/test_api.py b/tests/unit/test_api.py
@@ -99,7 +99,7 @@ def test_api_request(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         json=expected_response,
     )
     response = harness.charm.api_manager.request("status")
@@ -164,7 +164,7 @@ def test_status(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         json=expected_response,
     )
 

diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
@@ -115,7 +115,7 @@ def test_install_sets_ip_hostname_fqdn(harness):
     with patch("workload.ODWorkload.install", return_value=False):
         harness.charm.on.install.emit()
 
-        assert harness.charm.state.unit_server.private_ip
+        assert harness.charm.state.bind_address
 
 
 def test_relation_changed_emitted_for_leader_elected(harness):
@@ -359,7 +359,7 @@ def test_workload_down_blocked_status(harness):
 def test_service_unavailable_blocked_status(harness):
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         status=503,
         body="OpenSearch Dashboards server is not ready yet",
     )
@@ -398,7 +398,7 @@ def test_service_unhealthy(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         status=200,
         json=expected_response,
     )
@@ -458,7 +458,7 @@ def test_service_error(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         status=200,
         json=expected_response,
     )
@@ -518,7 +518,7 @@ def test_service_available(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         status=200,
         json=expected_response,
     )
@@ -577,7 +577,7 @@ def test_wrong_opensearch_version(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         status=200,
         json=expected_response,
     )

diff --git a/tests/unit/test_config.py b/tests/unit/test_config.py
@@ -66,7 +66,7 @@ def test_log_level_changed(harness):
         patch("workload.ODWorkload.write") as write,
     ):
         assert harness.charm.config_manager.config_changed()
-        content = DEFAULT_CONF.format(ip=harness.charm.state.unit_server.private_ip)
+        content = DEFAULT_CONF.format(ip=harness.charm.state.bind_address)
         path = "/var/snap/opensearch-dashboards/current/etc/opensearch-dashboards/opensearch_dashboards.yml"
         write.assert_called_with(content=content, path=path)
 

diff --git a/tests/unit/test_health.py b/tests/unit/test_health.py
@@ -105,7 +105,7 @@ def test_health_status_ok(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         json=expected_response,
     )
 
@@ -119,7 +119,7 @@ def test_health_status_service_uniavail(harness):
 
     responses.add(
         method="GET",
-        url=f"{harness.charm.state.unit_server.url}/api/status",
+        url=f"{harness.charm.state.url}/api/status",
         status=503,
         body="OpenSearch Dashboards server is not ready yet",
     )

diff --git a/tests/unit/test_tls.py b/tests/unit/test_tls.py
@@ -33,16 +33,6 @@ def test_certificates_created_sets_tls_enabled(harness):
     with (
         patch("ops.framework.EventBase.defer"),
         patch("core.cluster.ClusterState.stable", new_callable=PropertyMock, return_value=True),
-        patch(
-            "core.models.ODServer.hostname",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
-        patch(
-            "core.models.ODServer.fqdn",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
     ):
         harness.add_relation(CERTS_REL_NAME, "tls-certificates-operator")
 
@@ -54,16 +44,6 @@ def test_certificates_joined_creates_private_key(harness):
         patch("core.cluster.ClusterState.stable", new_callable=PropertyMock, return_value=True),
         patch("core.models.ODCluster.tls", new_callable=PropertyMock, return_value=True),
         patch("workload.ODWorkload.configure") as workload_config,
-        patch(
-            "core.models.ODServer.hostname",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
-        patch(
-            "core.models.ODServer.fqdn",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
     ):
         cert_rel_id = harness.add_relation(CERTS_REL_NAME, "tls-certificates-operator")
         harness.add_relation_unit(cert_rel_id, "tls-certificates-operator/1")
@@ -74,30 +54,18 @@ def test_certificates_joined_creates_private_key(harness):
 
 
 def test_certificates_available_fails_wrong_csr(harness):
-    with (
-        patch(
-            "core.models.ODServer.hostname",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
-        patch(
-            "core.models.ODServer.fqdn",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
-    ):
-        cert_rel_id = harness.add_relation(CERTS_REL_NAME, "tls-certificates-operator")
-        harness.update_relation_data(cert_rel_id, f"{CHARM_KEY}/0", {"csr": "not-missing"})
-
-        harness.charm.tls_events.certificates.on.certificate_available.emit(
-            certificate_signing_request="missing",
-            certificate="cert",
-            ca="ca",
-            chain=["ca", "cert"],
-        )
+    cert_rel_id = harness.add_relation(CERTS_REL_NAME, "tls-certificates-operator")
+    harness.update_relation_data(cert_rel_id, f"{CHARM_KEY}/0", {"csr": "not-missing"})
+
+    harness.charm.tls_events.certificates.on.certificate_available.emit(
+        certificate_signing_request="missing",
+        certificate="cert",
+        ca="ca",
+        chain=["ca", "cert"],
+    )
 
-        assert not harness.charm.state.unit_server.certificate
-        assert not harness.charm.state.unit_server.ca
+    assert not harness.charm.state.unit_server.certificate
+    assert not harness.charm.state.unit_server.ca
 
 
 def test_certificates_available_succeeds(harness):
@@ -193,16 +161,6 @@ def test_certificates_expiring(harness):
             "charms.tls_certificates_interface.v3.tls_certificates.TLSCertificatesRequiresV3.request_certificate_renewal",
             return_value=None,
         ),
-        patch(
-            "core.models.ODServer.hostname",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
-        patch(
-            "core.models.ODServer.fqdn",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
     ):
         harness.charm.tls_events.certificates.on.certificate_expiring.emit(
             certificate="cert", expiry=None
@@ -231,16 +189,6 @@ def test_set_tls_private_key(harness):
             "charms.tls_certificates_interface.v3.tls_certificates.TLSCertificatesRequiresV3.request_certificate_renewal",
             return_value=None,
         ),
-        patch(
-            "core.models.ODServer.hostname",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
-        patch(
-            "core.models.ODServer.fqdn",
-            new_callable=PropertyMock,
-            return_value="opensearch-dashboards",
-        ),
     ):
         harness.run_action("set-tls-private-key", {"internal-key": key})