tests: rename grafana to monitoring

Since the grafana-server group has been renamed to monitoring then
changing the associated tests.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/tests/conftest.py b/tests/conftest.py
index 68f63e9f7c2a1aaa42f46ea814d485d0e8f2d5b1..11a5997fe079bcf7d8204fcddaf1a6628713fe04 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -177,8 +177,8 @@ def pytest_collection_modifyitems(session, config, items):
             item.add_marker(pytest.mark.nfss)
         elif "iscsi" in test_path:
             item.add_marker(pytest.mark.iscsigws)
-        elif "grafana" in test_path:
-            item.add_marker(pytest.mark.grafanas)
+        elif "monitoring" in test_path:
+            item.add_marker(pytest.mark.monitoring)
         else:
             item.add_marker(pytest.mark.all)
 

diff --git a/tests/functional/tests/grafana/test_grafana.py b/tests/functional/tests/grafana/test_grafana.py
deleted file mode 100644 (file)
index fb12009..0000000
--- a/tests/functional/tests/grafana/test_grafana.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import pytest
-
-
-class TestGrafanas(object):
-
-    @pytest.mark.dashboard
-    @pytest.mark.no_docker
-    def test_grafana_dashboard_is_installed(self, node, host):
-        assert host.package("ceph-grafana-dashboards").is_installed
-
-    @pytest.mark.dashboard
-    @pytest.mark.parametrize('svc', [
-        'alertmanager', 'grafana-server', 'prometheus'
-    ])
-    def test_grafana_service_enabled_and_running(self, node, host, svc):
-        s = host.service(svc)
-        assert s.is_enabled
-        assert s.is_running
-
-    @pytest.mark.dashboard
-    @pytest.mark.parametrize('port', [
-        '3000', '9092', '9093'
-    ])
-    def test_grafana_socket(self, node, host, setup, port):
-        s = host.socket('tcp://%s:%s' % (setup["address"], port))
-        assert s.is_listening

diff --git a/tests/functional/tests/monitoring/test_monitoring.py b/tests/functional/tests/monitoring/test_monitoring.py
new file mode 100644 (file)
index 0000000..cf2751c
--- /dev/null
+++ b/tests/functional/tests/monitoring/test_monitoring.py
@@ -0,0 +1,26 @@
+import pytest
+
+
+class TestMonitoring(object):
+
+    @pytest.mark.dashboard
+    @pytest.mark.no_docker
+    def test_grafana_dashboard_is_installed(self, node, host):
+        assert host.package("ceph-grafana-dashboards").is_installed
+
+    @pytest.mark.dashboard
+    @pytest.mark.parametrize('svc', [
+        'alertmanager', 'grafana-server', 'prometheus'
+    ])
+    def test_grafana_service_enabled_and_running(self, node, host, svc):
+        s = host.service(svc)
+        assert s.is_enabled
+        assert s.is_running
+
+    @pytest.mark.dashboard
+    @pytest.mark.parametrize('port', [
+        '3000', '9092', '9093'
+    ])
+    def test_grafana_socket(self, node, host, setup, port):
+        s = host.socket('tcp://%s:%s' % (setup["address"], port))
+        assert s.is_listening