Commit cacb2ad1 authored by Shayan Hajipour's avatar Shayan Hajipour
Browse files

Merge branch 'develop' into... 

Merge branch 'develop' into feat/215-cttc-implement-l3-vpn-sbi-driver-compatible-with-ietf-l3-service-model
parents 55fc0982 a833bdbd

proto/kpi_sample_types.proto

+10 −0
Original line number Diff line number Diff line
@@ -39,4 +39,14 @@ enum KpiSampleType { 
    KPISAMPLETYPE_L3_SECURITY_STATUS_CRYPTO     = 605;



    KPISAMPLETYPE_SERVICE_LATENCY_MS            = 701;



// output KPIs

    KPISAMPLETYPE_PACKETS_TRANSMITTED_AGG_OUTPUT           = 1101;

    KPISAMPLETYPE_PACKETS_RECEIVED_AGG_OUTPUT              = 1102;

    KPISAMPLETYPE_PACKETS_DROPPED_AGG_OUTPUT               = 1103;

    KPISAMPLETYPE_BYTES_TRANSMITTED_AGG_OUTPUT             = 1201;

    KPISAMPLETYPE_BYTES_RECEIVED_AGG_OUTPUT                = 1202;

    KPISAMPLETYPE_BYTES_DROPPED_AGG_OUTPUT                 = 1203;



    KPISAMPLETYPE_SERVICE_LATENCY_MS_AGG_OUTPUT            = 1701;

}

scripts/run_tests_locally-analytics-backend.sh

+4 −1
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ 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=DEBUG --verbose \



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

    analytics/backend/tests/test_backend.py

scripts/run_tests_locally-analytics-frontend.sh

+3 −1
Original line number Diff line number Diff line
@@ -18,8 +18,10 @@ 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=DEBUG --verbose \



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

    analytics/frontend/tests/test_frontend.py

scripts/run_tests_locally-telemetry-backend.sh

+2 −5
Original line number Diff line number Diff line
@@ -18,15 +18,12 @@ PROJECTDIR=`pwd` 


cd $PROJECTDIR/src

# RCFILE=$PROJECTDIR/coverage/.coveragerc

# coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \

#     kpi_manager/tests/test_unitary.py



# python3 kpi_manager/tests/test_unitary.py

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_telemetry?sslmode=require"

RCFILE=$PROJECTDIR/coverage/.coveragerc





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

    telemetry/backend/tests/test_TelemetryBackend.py
 
python3 -m pytest --log-level=debug --log-cli-level=debug --verbose \

    telemetry/backend/tests/test_backend.py

scripts/run_tests_locally-telemetry-emulated.sh

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

# Copyright 2022-2024 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_telemetry?sslmode=require"

RCFILE=$PROJECTDIR/coverage/.coveragerc





python3 -m pytest --log-level=debug --log-cli-level=info --verbose \

    telemetry/backend/tests/test_emulated.py