Add missing commas and GEANTOPEN to public

brian_dashboard_manager/config.py

@@ -67,9 +67,9 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "Lab Devices"
+            "Lab Devices",
             "IAS",
-            "GEANTOPEN",
+            "GÉANT Open",
             "IAS Peers"
         ],
         "excluded_folders": {
@@ -78,7 +78,8 @@ DEFAULT_ORGANIZATIONS = [
             "IAS PRIVATE": True,
             "IAS PUBLIC": True,
             "IAS UPSTREAM": True,
-            "GWS PHY Upstream": True
+            "GWS PHY Upstream": True,
+            "GEANTOPEN" : True,
         }
     },
     {
@@ -106,7 +107,7 @@ DEFAULT_ORGANIZATIONS = [
         "excluded_dashboards": [
             "GÉANT Office devices",
             "GÉANT VM",
-            "Lab Devices"
+            "Lab Devices",
             "IAS",
             "IAS Peers"
         ],

brian_dashboard_manager/grafana/dashboard.py

@@ -30,7 +30,9 @@ def delete_dashboard(request: TokenRequest, dashboard, folder_id=None):
         uid = dashboard.get('uid')
         if uid:
             return _delete_dashboard(request, uid)
-        elif dashboard.get('title') and folder_id:
+        elif dashboard.get('title'):
+            # if a folder ID is not supplied,
+            # dashboard title should be globally unique
             dash = _search_dashboard(request, dashboard, folder_id)
             if dash is None:
                 return True