Merge pull request #50308 from adk3798/mock-fqdn-secure-alertmanager

mgr/cephadm: mock get_fqdn in secure alertmanager config test

Reviewed-by: Redouane Kachach <rkachach@redhat.com>
This commit is contained in:
Adam King 2023-02-28 14:57:44 -05:00 committed by GitHub
commit 0aef3d9741
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -397,11 +397,15 @@ class TestMonitoring:
)
@patch("cephadm.serve.CephadmServe._run_cephadm")
@patch("socket.getfqdn")
@patch("cephadm.module.CephadmOrchestrator.get_mgr_ip", lambda _: '::1')
@patch("cephadm.services.monitoring.password_hash", lambda password: 'fake_password')
def test_alertmanager_config_security_enabled(self, _run_cephadm, cephadm_module: CephadmOrchestrator):
def test_alertmanager_config_security_enabled(self, _get_fqdn, _run_cephadm, cephadm_module: CephadmOrchestrator):
_run_cephadm.side_effect = async_side_effect(('{}', '', 0))
fqdn = 'host1.test'
_get_fqdn.return_value = fqdn
def gen_cert(host, addr):
return ('mycert', 'mykey')
@ -416,7 +420,7 @@ class TestMonitoring:
cephadm_module.http_server.service_discovery.ssl_certs.get_root_cert = MagicMock(side_effect=get_root_cert)
with with_service(cephadm_module, AlertManagerSpec()):
y = dedent("""
y = dedent(f"""
# This file is generated by cephadm.
# See https://prometheus.io/docs/alerting/configuration/ for documentation.
@ -440,7 +444,7 @@ class TestMonitoring:
webhook_configs:
- name: 'ceph-dashboard'
webhook_configs:
- url: 'http://localhost:8080/api/prometheus_receiver'
- url: 'http://{fqdn}:8080/api/prometheus_receiver'
""").lstrip()
web_config = dedent("""