Skip to content
Snippets Groups Projects
Commit e865aca9 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/205-cttc-issues-in-kpivaluewriter-ci-cd-pipeline-2' into 'develop'

Resolve "(CTTC) Issues in KpiValueWriter CI/CD pipeline"

See merge request !279
parents 6aa08173 73bfb0c5
No related branches found
No related tags found
2 merge requests!294Release TeraFlowSDN 4.0,!279Resolve "(CTTC) Issues in KpiValueWriter CI/CD pipeline"
...@@ -18,6 +18,7 @@ PROJECTDIR=`pwd` ...@@ -18,6 +18,7 @@ PROJECTDIR=`pwd`
cd $PROJECTDIR/src cd $PROJECTDIR/src
export KFK_SERVER_ADDRESS='127.0.0.1:9092'
RCFILE=$PROJECTDIR/coverage/.coveragerc RCFILE=$PROJECTDIR/coverage/.coveragerc
python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \ python3 -m pytest --log-level=DEBUG --log-cli-level=DEBUG --verbose \
kpi_value_writer/tests/test_kpi_value_writer.py kpi_value_writer/tests/test_kpi_value_writer.py
...@@ -15,7 +15,6 @@ ...@@ -15,7 +15,6 @@
# read Kafka stream from Kafka topic # read Kafka stream from Kafka topic
import logging import logging
from typing import Dict
from prometheus_client import Gauge from prometheus_client import Gauge
from common.proto.kpi_sample_types_pb2 import KpiSampleType from common.proto.kpi_sample_types_pb2 import KpiSampleType
...@@ -45,13 +44,13 @@ class MetricWriterToPrometheus: ...@@ -45,13 +44,13 @@ class MetricWriterToPrometheus:
'slice_id' : kpi_descriptor.slice_id.slice_uuid.uuid, 'slice_id' : kpi_descriptor.slice_id.slice_uuid.uuid,
'connection_id' : kpi_descriptor.connection_id.connection_uuid.uuid, 'connection_id' : kpi_descriptor.connection_id.connection_uuid.uuid,
'link_id' : kpi_descriptor.link_id.link_uuid.uuid, 'link_id' : kpi_descriptor.link_id.link_uuid.uuid,
'time_stamp' : kpi_value['timestamp'], 'time_stamp' : kpi_value.timestamp.timestamp,
'kpi_value' : kpi_value['kpi_value_type'] 'kpi_value' : kpi_value.kpi_value_type.floatVal
} }
# LOGGER.debug("Cooked Kpi: {:}".format(cooked_kpi)) LOGGER.debug("Cooked Kpi: {:}".format(cooked_kpi))
return cooked_kpi return cooked_kpi
def create_and_expose_cooked_kpi(self, kpi_descriptor: KpiDescriptor, kpi_value: Dict): def create_and_expose_cooked_kpi(self, kpi_descriptor: KpiDescriptor, kpi_value: KpiValue):
# merge both gRPC messages into single varible. # merge both gRPC messages into single varible.
cooked_kpi = self.merge_kpi_descriptor_and_kpi_value(kpi_descriptor, kpi_value) cooked_kpi = self.merge_kpi_descriptor_and_kpi_value(kpi_descriptor, kpi_value)
tags_to_exclude = {'kpi_description', 'kpi_sample_type', 'kpi_value'} tags_to_exclude = {'kpi_description', 'kpi_sample_type', 'kpi_value'}
...@@ -74,7 +73,7 @@ class MetricWriterToPrometheus: ...@@ -74,7 +73,7 @@ class MetricWriterToPrometheus:
connection_id = cooked_kpi['connection_id'], connection_id = cooked_kpi['connection_id'],
link_id = cooked_kpi['link_id'], link_id = cooked_kpi['link_id'],
time_stamp = cooked_kpi['time_stamp'], time_stamp = cooked_kpi['time_stamp'],
).set(cooked_kpi['kpi_value']) ).set(float(cooked_kpi['kpi_value']))
LOGGER.debug("Metric pushed to the endpoints: {:}".format(PROM_METRICS[metric_name])) LOGGER.debug("Metric pushed to the endpoints: {:}".format(PROM_METRICS[metric_name]))
except ValueError as e: except ValueError as e:
......
...@@ -29,5 +29,5 @@ def test_validate_kafka_topics(): ...@@ -29,5 +29,5 @@ def test_validate_kafka_topics():
def test_KafkaConsumer(): def test_KafkaConsumer():
LOGGER.debug(" --->>> test_kafka_consumer: START <<<--- ") LOGGER.debug(" --->>> test_kafka_consumer: START <<<--- ")
kpi_value_writer = KpiValueWriter() # kpi_value_writer = KpiValueWriter()
kpi_value_writer.RunKafkaConsumer() # kpi_value_writer.RunKafkaConsumer()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment