From 8ae8b1ff05bc018e71121cecd2f3bbfdbe464468 Mon Sep 17 00:00:00 2001
From: Bjarke Madsen <bjarke.madsen@geant.org>
Date: Wed, 24 Feb 2021 11:43:05 +0100
Subject: [PATCH] Update config to include excluded dashboards

---
 brian_dashboard_manager/config.py | 39 ++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 13 deletions(-)

diff --git a/brian_dashboard_manager/config.py b/brian_dashboard_manager/config.py
index a7aa274..83840e8 100644
--- a/brian_dashboard_manager/config.py
+++ b/brian_dashboard_manager/config.py
@@ -2,11 +2,6 @@ import json
 import jsonschema
 
 DEFAULT_ORGANIZATIONS = [
-    {
-        "name": "Main Org.",
-        "excluded_nrens": [],
-        "excluded_dashboards": []
-    },
     {
         "name": "GÉANT Staff",
         "excluded_nrens": [],
@@ -15,23 +10,40 @@ DEFAULT_ORGANIZATIONS = [
     {
         "name": "NRENs",
         "excluded_nrens": [],
-        "excluded_dashboards": []
+        "excluded_dashboards": [
+            "GÉANT Office devices",
+            "GÉANT VM"
+        ]
     },
     {
         "name": "General Public",
         "excluded_nrens": [
-                "JISC",
+                "CARNET",
                 "PSNC"
         ],
-        "excluded_dashboards": []
+        "excluded_dashboards": [
+            "GÉANT Office devices",
+            "GÉANT VM"
+        ]
     },
     {
         "name": "CAE1 - Europe",
+        "excluded_nrens": [],
+        "excluded_dashboards": [
+            "GÉANT Office devices",
+            "GÉANT VM"
+        ]
+    },
+    {
+        "name": "CAE1 - Asia",
         "excluded_nrens": [
-                "JISC",
+                "CARNET",
                 "PSNC"
         ],
-        "excluded_dashboards": []
+        "excluded_dashboards": [
+            "GÉANT Office devices",
+            "GÉANT VM"
+        ]
     }
 ]
 
@@ -68,13 +80,14 @@ CONFIG_SCHEMA = {
             "type": "object",
             "properties": {
                     "name": {"type": "string"},
-                    "excluded_nrens": {"type": "array", "items": {"type": "string"}},
-                    "excluded_dashboards": {"type": "array", "items": {"type": "string"}},
+                    "excluded_nrens": {
+                        "type": "array",
+                        "items": {"type": "string"}
+                    },
             },
             "required": [
                 "name",
                 "excluded_nrens",
-                "excluded_dashboards"
             ]
         }
     },
-- 
GitLab