Update tests to include services under NREN access

test/conftest.py

@@ -16,17 +16,17 @@ def data_config():
         "organizations": [
             {
                 "name": "Testorg1",
-                "excluded_nrens": [],
+                "excluded_nrens": ['GEANT'],
                 "excluded_dashboards": []
             },
             {
                 "name": "GÉANT Testorg2",
-                "excluded_nrens": [],
+                "excluded_nrens": ['GEANT'],
                 "excluded_dashboards": []
             },
             {
                 "name": "NRENsTestorg3",
-                "excluded_nrens": [],
+                "excluded_nrens": ['GEANT'],
                 "excluded_dashboards": []
             },
             {

test/test_update.py

@@ -622,6 +622,11 @@ def test_provision_folder(data_config, mocker):
 
     }
 
+    responses.add(
+        method=responses.GET,
+        url=f"{data_config['reporting_provider']}/scid/current",
+        json=_test_data('services.json'))
+
     # just return a generated folder
     _mocked_find_folder = mocker.patch(
         'brian_dashboard_manager.grafana.provision.find_folder')
@@ -635,25 +640,41 @@ def test_provision_folder(data_config, mocker):
         'brian_dashboard_manager.grafana.provision.create_dashboard',
         create_dashboard)
 
+    def _search_dashboard(request, dashboard, folder_id=None):
+        return None
+
+    mocker.patch(
+        'brian_dashboard_manager.grafana.dashboard._search_dashboard',
+        _search_dashboard)
+
+    def delete_dashboard(request, dashboard, folder_id=None):
+        return True
+
+    mocker.patch(
+        'brian_dashboard_manager.grafana.dashboard.delete_dashboard',
+        delete_dashboard)
+
     excluded_dashboards = []
-    nren_result = provision_folder(None, 'testfolder', dashboards['NREN'],
-                                   [], 'testdatasource', excluded_dashboards)
+    nren_result = provision_folder(
+        None, 'NREN Access', dashboards['NREN'],
+        data_config, 'testdatasource', excluded_dashboards)
 
-    assert len(nren_result) == 3
-    assert nren_result[0]['title'] == 'GEANT'
-    assert nren_result[1]['title'] == 'KIAE'
-    assert nren_result[2]['title'] == 'SWITCH'
+    assert len(nren_result) == 6
+    assert nren_result[0]['title'] == 'ASNET-AM'
+    assert nren_result[1]['title'] == 'LITNET'
+    assert nren_result[2]['title'] == 'CESNET'
 
-    excluded_dashboards = ['SWITCH']
-    nren_excluded = provision_folder(None, 'testfolder', dashboards['NREN'],
-                                     [], 'testdatasource', excluded_dashboards)
+    excluded_dashboards = ['ASNET-AM', 'GEANT']
+    nren_excluded = provision_folder(
+        None, 'NREN Access', dashboards['NREN'],
+        data_config, 'testdatasource', excluded_dashboards)
 
-    assert len(nren_excluded) == 2
-    assert nren_excluded[0]['title'] == 'GEANT'
-    assert nren_excluded[1]['title'] == 'KIAE'
+    assert len(nren_excluded) == 4
+    assert nren_excluded[0]['title'] == 'LITNET'
+    assert nren_excluded[1]['title'] == 'CESNET'
 
     cust_result = provision_folder(None, 'testfolder', dashboards['RE_CUST'],
-                                   [], 'testdatasource', ['GEANT'])
+                                   data_config, 'testdatasource', ['GEANT'])
     assert len(cust_result) == 2
     assert cust_result[0]['title'] == 'KIAE'
     assert cust_result[1]['title'] == 'SWITCH'