Commit 086bc3c0 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/381-tid-new-nbi-for-optical-slices
parents 8e7a4136 a4cb4ad6

.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

deploy/tfs.sh

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type= 
printf "\n"



echo ">>> Create Secret with Apache Kafka..."

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-public -o 'jsonpath={.spec.ports[0].port}')

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')

kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \

    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}

manifests/kafka/single-node.yaml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
apiVersion: v1

kind: Service

metadata:

  name: kafka-public

  name: kafka-service

  labels:

    app.kubernetes.io/component: message-broker

    app.kubernetes.io/instance: kafka
@@ -50,7 +50,7 @@ spec: 
      app.kubernetes.io/component: message-broker

      app.kubernetes.io/instance: kafka

      app.kubernetes.io/name: kafka

  serviceName: "kafka-public"

  serviceName: "kafka-service"

  replicas: 1

  minReadySeconds: 5

  template:
@@ -83,7 +83,7 @@ spec: 
          - name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP

            value: "PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT"

          - name: KAFKA_CFG_ADVERTISED_LISTENERS

            value: "PLAINTEXT://kafka-public.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"

            value: "PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"

          - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES

            value: "CONTROLLER"

          - name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS

proto/kpi_sample_types.proto

+2 −0
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 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_POWER_TOTAL_INPUT     = 502;

    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