Commit 648c8af3 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into feat/379-tid-ietf_networ-nbi-extension-for-is-is-te-data
parents c323ab6a 351c6dd0

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -177,6 +177,8 @@ cython_debug/ 
# Sqlite

*.db



#temp files to test telemetry

src/telemetry/backend/tempFiles/

# TeraFlowSDN-generated files

tfs_runtime_env_vars.sh

tfs_runtime_env_vars*.sh

hackfest/mock_osm/WimconnectorIETFL2VPN.py

+3 −3
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ class WimconnectorIETFL2VPN(SdnConnectorBase): 
        """

        SETTINGS = {    # min_endpoints, max_endpoints, vpn_service_type

            'ELINE': (2,    2, 'vpws'), # Virtual Private Wire Service

            'ELAN' : (2, None, 'vpls'), # Virtual Private LAN  Service

            'ELAN' : (2, None, 'bgp-vpls'), # Virtual Private LAN  Service

        }

        settings = SETTINGS.get(service_type)

        if settings is None: raise NotImplementedError('Unsupported service_type({:s})'.format(str(service_type)))
@@ -291,12 +291,12 @@ class WimconnectorIETFL2VPN(SdnConnectorBase): 
            if access_priority is not None:

                availability = {}

                availability["access-priority"] = access_priority

                availability["single-active"] = [None]

                availability["single-active"] = None

                site_network_access["availability"] = availability



                constraint = {}

                constraint['constraint-type'] = 'end-to-end-diverse'

                constraint['target'] = {'all-other-accesses': [None]}

                constraint['target'] = {'all-other-accesses': None}



                access_diversity = {}

                access_diversity['constraints'] = {'constraint': []}

proto/kpi_sample_types.proto

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ enum KpiSampleType { 
    KPISAMPLETYPE_ML_CONFIDENCE                 = 401;  //. can be used by both optical and L3 without any issue



    KPISAMPLETYPE_OPTICAL_SECURITY_STATUS       = 501;  //. can be used by both optical and L3 without any issue

    KPISAMPLETYPE_OPTICAL_TOTAL_INPUT_POWER     = 503;



    KPISAMPLETYPE_L3_UNIQUE_ATTACK_CONNS        = 601;

    KPISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS       = 602;

scripts/run_mon_test.sh

0 → 100755
+28 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.





PROJECTDIR=`pwd`



cd $PROJECTDIR/src

#RCFILE=$PROJECTDIR/coverage/.coveragerc



export KFK_SERVER_ADDRESS='127.0.0.1:9092'



CRDB_SQL_ADDRESS=$(kubectl get service cockroachdb-public --namespace crdb -o jsonpath='{.spec.clusterIP}')

export CRDB_URI="cockroachdb://tfs:tfs123@${CRDB_SQL_ADDRESS}:26257/tfs_analytics?sslmode=require"



python3 -m pytest --log-level=DEBUG --log-cli-level=INFO --verbose \

    service/service/monitoring.py

scripts/run_tests_locally-analytics-backend.sh

+5 −2
Original line number Diff line number Diff line
@@ -24,5 +24,8 @@ export KFK_SERVER_ADDRESS='127.0.0.1:9092' 
CRDB_SQL_ADDRESS=$(kubectl get service cockroachdb-public --namespace crdb -o jsonpath='{.spec.clusterIP}')

export CRDB_URI="cockroachdb://tfs:tfs123@${CRDB_SQL_ADDRESS}:26257/tfs_analytics?sslmode=require"



python3 -m pytest --log-level=DEBUG --log-cli-level=INFO --verbose \

    analytics/backend/tests/test_backend.py
 
# python3 -m pytest --log-level=DEBUG --log-cli-level=INFO --verbose \

#     analytics/backend/tests/test_backend.py



python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \

    analytics/backend/tests/test_backend.py::test_start_analytics_backend_for_mgon_agent