From 057f09e4810d88d268b7f74e9b441f1f23b41b07 Mon Sep 17 00:00:00 2001 From: Nizamudeen A Date: Fri, 8 Mar 2024 15:51:15 +0530 Subject: [PATCH] mgr/cephadm: adapting unit tests to include provider file Signed-off-by: Nizamudeen A --- src/pybind/mgr/cephadm/tests/test_services.py | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/cephadm/tests/test_services.py b/src/pybind/mgr/cephadm/tests/test_services.py index dbab022058d..cd59fcd0356 100644 --- a/src/pybind/mgr/cephadm/tests/test_services.py +++ b/src/pybind/mgr/cephadm/tests/test_services.py @@ -1106,6 +1106,20 @@ class TestMonitoring: # generated by cephadm\n{grafana_cert}""").lstrip(), 'certs/cert_key': dedent(f""" # generated by cephadm\n{grafana_key}""").lstrip(), + 'provisioning/dashboards/default.yml': dedent(""" + # This file is generated by cephadm. + apiVersion: 1 + + providers: + - name: 'Ceph Dashboard' + orgId: 1 + folder: '' + type: file + disableDeletion: false + updateIntervalSeconds: 3 + editable: false + options: + path: '/etc/grafana/provisioning/dashboards'""").lstrip(), } _run_cephadm.assert_called_with( @@ -1184,7 +1198,21 @@ class TestMonitoring: ' isDefault: false\n' ' editable: false', 'certs/cert_file': ANY, - 'certs/cert_key': ANY}}, ['secure_monitoring_stack:False']) + 'certs/cert_key': ANY, + 'provisioning/dashboards/default.yml': + '# This file is generated by cephadm.\n' + 'apiVersion: 1\n\n' + 'providers:\n' + " - name: 'Ceph Dashboard'\n" + ' orgId: 1\n' + " folder: ''\n" + ' type: file\n' + ' disableDeletion: false\n' + ' updateIntervalSeconds: 3\n' + ' editable: false\n' + ' options:\n' + " path: '/etc/grafana/provisioning/dashboards'" + }}, ['secure_monitoring_stack:False']) @patch("cephadm.serve.CephadmServe._run_cephadm", _run_cephadm('{}')) def test_grafana_no_anon_access(self, cephadm_module: CephadmOrchestrator): @@ -1232,7 +1260,21 @@ class TestMonitoring: ' isDefault: false\n' ' editable: false', 'certs/cert_file': ANY, - 'certs/cert_key': ANY}}, ['secure_monitoring_stack:False']) + 'certs/cert_key': ANY, + 'provisioning/dashboards/default.yml': + '# This file is generated by cephadm.\n' + 'apiVersion: 1\n\n' + 'providers:\n' + " - name: 'Ceph Dashboard'\n" + ' orgId: 1\n' + " folder: ''\n" + ' type: file\n' + ' disableDeletion: false\n' + ' updateIntervalSeconds: 3\n' + ' editable: false\n' + ' options:\n' + " path: '/etc/grafana/provisioning/dashboards'" + }}, ['secure_monitoring_stack:False']) @patch("cephadm.serve.CephadmServe._run_cephadm") def test_monitoring_ports(self, _run_cephadm, cephadm_module: CephadmOrchestrator): -- 2.39.5