Commit e2fd2d90 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/236-integration-with-multiband-amplifier-with-ocm
parents 3acc9abd d45bfa12

manifests/servicemonitors.yaml

+6 −6
Original line number Diff line number Diff line
@@ -575,9 +575,9 @@ apiVersion: monitoring.coreos.com/v1 
kind: ServiceMonitor

metadata:

  namespace: monitoring # namespace where prometheus is running

  name: tfs-kpi_value_apiservice-metric

  name: tfs-kpi-value-apiservice-metric

  labels:

    app: kpi_value_apiservice

    app: kpi-value-apiservice

    #release: prometheus

    #release: prom  # name of the release

    # ( VERY IMPORTANT: You need to know the correct release name by viewing
@@ -588,7 +588,7 @@ spec: 
    matchLabels:

      # Target app service

      #namespace: tfs

      app: kpi_value_apiservice # same as above

      app: kpi-value-apiservice # same as above

      #release: prometheus # same as above

  endpoints:

    - port: metrics # named port in target app
@@ -604,9 +604,9 @@ apiVersion: monitoring.coreos.com/v1 
kind: ServiceMonitor

metadata:

  namespace: monitoring # namespace where prometheus is running

  name: tfs-kpi_value_writerservice-metric

  name: tfs-kpi-value-writerservice-metric

  labels:

    app: kpi_value_writerservice

    app: kpi-value-writerservice

    #release: prometheus

    #release: prom  # name of the release

    # ( VERY IMPORTANT: You need to know the correct release name by viewing
@@ -617,7 +617,7 @@ spec: 
    matchLabels:

      # Target app service

      #namespace: tfs

      app: kpi_value_writerservice # same as above

      app: kpi-value-writerservice # same as above

      #release: prometheus # same as above

  endpoints:

    - port: metrics # named port in target app

proto/context.proto

+14 −11
Original line number Diff line number Diff line
@@ -223,6 +223,9 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

  DEVICEDRIVER_QKD = 12;

  DEVICEDRIVER_IETF_L3VPN = 13;

  DEVICEDRIVER_IETF_SLICE = 14;

  DEVICEDRIVER_NCE = 15;

}



enum DeviceOperationalStatusEnum {
@@ -258,6 +261,14 @@ message LinkId { 
  Uuid link_uuid = 1;

}



enum LinkTypeEnum {

  LINKTYPE_UNKNOWN = 0;

  LINKTYPE_COPPER  = 1;

  LINKTYPE_FIBER   = 2;

  LINKTYPE_RADIO   = 3;

  LINKTYPE_VIRTUAL = 4;

}



message LinkAttributes {

  float total_capacity_gbps = 1;

  float used_capacity_gbps  = 2;
@@ -266,9 +277,9 @@ message LinkAttributes { 
message Link {

  LinkId link_id = 1;

  string name = 2;

  repeated EndPointId link_endpoint_ids = 3;

  LinkAttributes attributes = 4;

  LinkTypeEnum link_type = 5;

  LinkTypeEnum link_type = 3;

  repeated EndPointId link_endpoint_ids = 4;

  LinkAttributes attributes = 5;

}



message LinkIdList {
@@ -284,14 +295,6 @@ message LinkEvent { 
  LinkId link_id = 2;

}



enum LinkTypeEnum {

  LINKTYPE_UNKNOWN = 0;

  LINKTYPE_COPPER = 1;

  LINKTYPE_VIRTUAL_COPPER = 2;

  LINKTYPE_OPTICAL = 3;

  LINKTYPE_VIRTUAL_OPTICAL = 4;

}



// ----- Service -------------------------------------------------------------------------------------------------------

message ServiceId {

  ContextId context_id = 1;

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