Skip to content
Snippets Groups Projects
Commit 0275deff authored by Bjarke Madsen's avatar Bjarke Madsen
Browse files

Add a bunch of comments referencing JIRA ticket

parent 4552ba19
No related branches found
No related tags found
No related merge requests found
...@@ -46,7 +46,7 @@ logger = logging.getLogger(__name__) ...@@ -46,7 +46,7 @@ logger = logging.getLogger(__name__)
MAX_WORKERS = 4 MAX_WORKERS = 4
DASHBOARDS = { DASHBOARDS = {
'NRENBETA': { 'NRENBETA': { # needed for POL1-642 BETA
'tag': ['customersbeta'], 'tag': ['customersbeta'],
'folder_name': 'NREN Access BETA', 'folder_name': 'NREN Access BETA',
'interfaces': [] 'interfaces': []
...@@ -194,12 +194,15 @@ def provision_folder(token_request, folder_name, dash, ...@@ -194,12 +194,15 @@ def provision_folder(token_request, folder_name, dash,
# dashboard should include error panels # dashboard should include error panels
errors = dash.get('errors', False) errors = dash.get('errors', False)
is_nren = folder_name == 'NREN Access' # needed for POL1-642 BETA
is_nren_beta = folder_name == 'NREN Access BETA' is_nren_beta = folder_name == 'NREN Access BETA'
is_nren = folder_name == 'NREN Access'
if is_nren: if is_nren:
data = get_nren_interface_data_old(interfaces) data = get_nren_interface_data_old(interfaces)
dash_data = get_nren_dashboard_data(data, ds_name, tag) dash_data = get_nren_dashboard_data(data, ds_name, tag)
elif is_nren_beta: elif is_nren_beta:
# needed for POL1-642 BETA
services = fetch_services(config['reporting_provider']) services = fetch_services(config['reporting_provider'])
data = get_nren_interface_data( data = get_nren_interface_data(
services, interfaces, excluded_dashboards) services, interfaces, excluded_dashboards)
...@@ -277,6 +280,8 @@ def is_excluded_folder(org_config, folder_name): ...@@ -277,6 +280,8 @@ def is_excluded_folder(org_config, folder_name):
def excluded_folder_dashboards(org_config, folder_name): def excluded_folder_dashboards(org_config, folder_name):
excluded_folders = org_config.get('excluded_folders', {}) excluded_folders = org_config.get('excluded_folders', {})
excluded = excluded_folders.get(folder_name, []) excluded = excluded_folders.get(folder_name, [])
# in is needed for POL1-642 BETA ('NREN Access BETA' folder)
# revert to == 'NREN Access' when beta is over
if 'NREN Access' in folder_name: if 'NREN Access' in folder_name:
excluded_nrens = org_config.get('excluded_nrens', []) excluded_nrens = org_config.get('excluded_nrens', [])
excluded = list(set(excluded).union(set(excluded_nrens))) excluded = list(set(excluded).union(set(excluded_nrens)))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment