Finished release 0.54.

.coveragerc

-[run]
-concurrency=multiprocessing,thread
\ No newline at end of file

LICENSE.txt

+MIT License
+
+Copyright (c) 2023 GÉANT Vereniging
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

MANIFEST.in

@@ -2,4 +2,5 @@ include brian_dashboard_manager/logging_default_config.json
 include brian_dashboard_manager/dashboards/*
 include brian_dashboard_manager/datasources/*
 include config.json.example
-recursive-include brian_dashboard_manager/templating/templates *
+recursive-include brian_dashboard_manager/templating/templates *
\ No newline at end of file
+recursive-exclude test *
\ No newline at end of file

brian_dashboard_manager/config.py

@@ -203,7 +203,7 @@ CONFIG_SCHEMA = {
         "datasources": {
             "type": "object",
             "properties": {
-                "influxdb": {"$ref": "#definitions/influx-datasource"}
+                "influxdb": {"$ref": "#/definitions/influx-datasource"}
             },
             "additionalProperties": False
         },

brian_dashboard_manager/templating/helpers.py

@@ -231,11 +231,20 @@ def get_nren_interface_data(services, interfaces, excluded_dashboards):
                 # MDVPN type services don't have data in BRIAN
                 continue
 
+            has_v6_interface = False
+            for interface in _interfaces:
+                if 'addresses' in interface:
+                    for address in interface['addresses']:
+                        if address.find(':') > 0:
+                            has_v6_interface = True
+                            break
+
             dashboard['SERVICES'].append({
                 'measurement': measurement,
                 'title': title,
                 'scid': scid,
-                'sort': (sid[:2], name)
+                'sort': (sid[:2], name),
+                'has_v6': has_v6_interface
             })
 
     def _check_in_aggregate(router, interface):
@@ -486,7 +495,7 @@ def get_panel_fields(panel, panel_type, datasource):
     })
 
 
-def default_interface_panel_generator(gridPos):
+def default_interface_panel_generator(gridPos, ipv6_only=False):
     """
     Helper for generating panel definitions for dashboards.
 
@@ -494,6 +503,7 @@ def default_interface_panel_generator(gridPos):
     panel data and panel type.
 
     :param gridPos: generator for grid positions
+    :param ipv6_only: whether to use IPv6 traffic exclusively or not
 
     :return: function that generates panel definitions
     """
@@ -515,20 +525,29 @@ def default_interface_panel_generator(gridPos):
         result = []
 
         for panel in panels:
-            result.append(get_panel_fields({
-                **panel,
-                **next(gridPos)
-            }, 'traffic', datasource))
-            if panel.get('has_v6', False):
-                result.append(get_panel_fields({
-                    **panel,
-                    **next(gridPos)
-                }, 'IPv6', datasource))
-            if errors:
+            if ipv6_only:
+                if panel.get('has_v6', False):
+                    result.append(get_panel_fields({
+                        **panel,
+                        **next(gridPos)
+                    }, 'IPv6', datasource))
+                else:
+                    continue
+            else:
                 result.append(get_panel_fields({
                     **panel,
                     **next(gridPos)
-                }, 'errors', datasource))
+                }, 'traffic', datasource))
+                if panel.get('has_v6', False):
+                    result.append(get_panel_fields({
+                        **panel,
+                        **next(gridPos)
+                    }, 'IPv6', datasource))
+                if errors:
+                    result.append(get_panel_fields({
+                        **panel,
+                        **next(gridPos)
+                    }, 'errors', datasource))
 
         return result
 
@@ -567,6 +586,7 @@ def get_nren_dashboard_data_single(data, datasource, tag):
         agg_panels = []
 
     panel_gen = default_interface_panel_generator(gridPos)
+    panel_ipv6_gen = default_interface_panel_generator(gridPos, ipv6_only=True)
 
     services_dropdown = create_dropdown_panel('Services', **next(gridPos))
 
@@ -578,6 +598,12 @@ def get_nren_dashboard_data_single(data, datasource, tag):
 
     service_panels = panel_gen(
         sorted(dash['SERVICES'], key=sort_key), datasource)
+
+    services_ipv6_dropdown = create_dropdown_panel('Services - IPv6 Only', **next(gridPos))
+    service_ipv6_panels = panel_ipv6_gen(
+        sorted(dash['SERVICES'], key=sort_key), datasource
+    )
+
     iface_dropdown = create_dropdown_panel('Interfaces', **next(gridPos))
     phys_panels = panel_gen(dash['PHYSICAL'], datasource, True)
 
@@ -590,6 +616,10 @@ def get_nren_dashboard_data_single(data, datasource, tag):
                 'dropdown': services_dropdown,
                 'panels': service_panels,
             },
+            {
+                'dropdown': services_ipv6_dropdown,
+                'panels': service_ipv6_panels
+            },
             {
                 'dropdown': iface_dropdown,
                 'panels': phys_panels,
@@ -769,7 +799,7 @@ def get_aggregate_dashboard_data(title, remotes, datasource, tag):
     ingress and one for egress.
 
     :param title: title for the dashboard
-    :param targets: dictionary of targets for the panels, the key is the
+    :param remotes: dictionary of targets for the panels, the key is the
     remote (usually a customer) and the value is a list of targets
     for that remote. A single target represents how to fetch
     data for one interface.

changelog.md

@@ -2,6 +2,9 @@
 
 All notable changes to this project will be documented in this file.
 
+## [0.54] - 2023-02-09
+- POL1-648: Added IPv6 graphs for NREN dashboards
+
 ## [0.53] - 2023-06-21
 - Add banner explaining difference between average/mean for >48h time ranges
 

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='brian-dashboard-manager',
-    version="0.53",
+    version="0.54",
     author='GEANT',
     author_email='swd@geant.org',
     description='',
@@ -16,4 +16,6 @@ setup(
         'sentry-sdk[flask]'
     ],
     include_package_data=True,
+    license='MIT',
+    license_files=('LICENSE.txt',)
 )

test/test_gws_direct.py

 import responses
-from conftest import get_test_data
+from test.conftest import get_test_data
 from brian_dashboard_manager.templating.gws import generate_gws
 from brian_dashboard_manager.inventory_provider.interfaces import \
     get_gws_direct

test/test_update.py

@@ -3,7 +3,7 @@ import json
 
 from brian_dashboard_manager.grafana.provision import provision_folder, \
     provision
-from conftest import get_test_data
+from test.conftest import get_test_data
 
 TEST_INTERFACES = [
     {

tox.ini

 [tox]
-envlist = py36
+envlist = py38, py311
 
 [flake8]
 exclude = venv,.tox
 max-line-length = 120
 
+[coverage:run]
+concurrency = multiprocessing,thread
+
 [testenv]
-setenv = 
-    COVERAGE_PROCESS_START=.coveragerc
 deps =
-    coverage
+    pytest-xdist
+    pytest-cov
     flake8
     -r requirements.txt
 
 commands =
     coverage erase
-    coverage run --source brian_dashboard_manager -m pytest {posargs}
-    coverage combine
-    coverage xml
-    coverage html
-    coverage report --fail-under 75
+    pytest -n auto --cov brian_dashboard_manager --cov-fail-under=80 --cov-report html --cov-report xml --cov-report term -p no:checkdocs
     flake8
     sphinx-build -M html docs/source docs/build