Commit cdf65bba authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Changes in Analytics, DB, KPI Enums, KPI Manager and Telemetery 

- Create Kafka topic added in main method of services
- KPI sample types added in ENUM class
- Methods are commented in _Collector class.
- In Telemetry backend, logic is added get device ID, enpoint ID and devicec type from Context and KPI DB.
parent 56089f19

src/analytics/backend/service/__main__.py

+5 −0
Original line number Diff line number Diff line
@@ -16,8 +16,11 @@ import logging, signal, sys, threading 
from prometheus_client import start_http_server

from common.Settings import get_log_level, get_metrics_port

from .AnalyticsBackendService import AnalyticsBackendService

from common.tools.kafka.Variables import KafkaTopic





terminate = threading.Event()

logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')

LOGGER = None



def signal_handler(signal, frame): # pylint: disable=redefined-outer-name
@@ -36,6 +39,8 @@ def main(): 


    LOGGER.info('Starting...')



    KafkaTopic.create_all_topics()



    # Start metrics server

    metrics_port = get_metrics_port()

    start_http_server(metrics_port)

src/analytics/frontend/service/__main__.py

+5 −0
Original line number Diff line number Diff line
@@ -18,8 +18,11 @@ from common.Settings import get_log_level, get_metrics_port 
from .AnalyticsFrontendService import AnalyticsFrontendService

from analytics.database.AnalyzerModel import Analyzer as Model

from common.tools.database.GenericDatabase import Database

from common.tools.kafka.Variables import KafkaTopic





terminate = threading.Event()

logging.basicConfig(level=logging.INFO, format='%(asctime)s - %(levelname)s - %(message)s')

LOGGER    = None



def signal_handler(signal, frame): # pylint: disable=redefined-outer-name
@@ -43,6 +46,8 @@ def main(): 
    kpiDBobj.create_database()

    kpiDBobj.create_tables()



    KafkaTopic.create_all_topics()



    # Start metrics server

    metrics_port = get_metrics_port()

    start_http_server(metrics_port)

src/common/tools/database/GenericEngine.py

+2 −2
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ class Engine: 
                CRDB_USERNAME, CRDB_PASSWORD, CRDB_NAMESPACE, CRDB_SQL_PORT, CRDB_DATABASE, CRDB_SSLMODE)

        try:

            engine = sqlalchemy.create_engine(crdb_uri, echo=False)

            LOGGER.info(' AnalyzerDB initalized with DB URL: {:}'.format(crdb_uri))

            LOGGER.info(' Database initalized with DB URL: {:}'.format(crdb_uri))

            return engine

        except: # pylint: disable=bare-except # pragma: no cover

            LOGGER.exception('Failed to connect to database: {:s}'.format(str(crdb_uri)))

            return None # type: ignore
 
        return engine

src/context/service/database/models/enums/KpiSampleType.py

+10 −7
Original line number Diff line number Diff line
@@ -22,13 +22,16 @@ from ._GrpcToEnum import grpc_to_enum 
#            BYTES_RECEIVED. If item name does not match, automatic mapping of

#            proto enums to database enums will fail.

class ORM_KpiSampleTypeEnum(enum.Enum):

    UNKNOWN                  = KpiSampleType.KPISAMPLETYPE_UNKNOWN

    PACKETS_TRANSMITTED      = KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED

    PACKETS_RECEIVED         = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED

    BYTES_TRANSMITTED        = KpiSampleType.KPISAMPLETYPE_BYTES_TRANSMITTED

    BYTES_RECEIVED           = KpiSampleType.KPISAMPLETYPE_BYTES_RECEIVED

    LINK_TOTAL_CAPACITY_GBPS = KpiSampleType.KPISAMPLETYPE_LINK_TOTAL_CAPACITY_GBPS

    LINK_USED_CAPACITY_GBPS  = KpiSampleType.KPISAMPLETYPE_LINK_USED_CAPACITY_GBPS

    UNKNOWN                  = KpiSampleType.KPISAMPLETYPE_UNKNOWN                  # 0

    PACKETS_TRANSMITTED      = KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED      # 101

    PACKETS_RECEIVED         = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED         # 102

    PACKETS_DROPPED          = KpiSampleType.KPISAMPLETYPE_PACKETS_DROPPED          # 103

    BYTES_TRANSMITTED        = KpiSampleType.KPISAMPLETYPE_BYTES_TRANSMITTED        # 201

    BYTES_RECEIVED           = KpiSampleType.KPISAMPLETYPE_BYTES_RECEIVED           # 202

    BYTES_DROPPED            = KpiSampleType.KPISAMPLETYPE_BYTES_DROPPED            # 203

    LINK_TOTAL_CAPACITY_GBPS = KpiSampleType.KPISAMPLETYPE_LINK_TOTAL_CAPACITY_GBPS # 301

    LINK_USED_CAPACITY_GBPS  = KpiSampleType.KPISAMPLETYPE_LINK_USED_CAPACITY_GBPS  # 302





grpc_to_enum__kpi_sample_type = functools.partial(

    grpc_to_enum, KpiSampleType, ORM_KpiSampleTypeEnum)

src/kpi_manager/tests/test_messages.py

+5 −5
Original line number Diff line number Diff line
@@ -26,15 +26,15 @@ def create_kpi_id_request(): 


def create_kpi_descriptor_request(descriptor_name: str = "Test_name"):

    _create_kpi_request                                    = kpi_manager_pb2.KpiDescriptor()

    _create_kpi_request.kpi_id.kpi_id.uuid                 = str(uuid.uuid4())

    # _create_kpi_request.kpi_id.kpi_id.uuid                 = str(uuid.uuid4())

    # _create_kpi_request.kpi_id.kpi_id.uuid                 = "6e22f180-ba28-4641-b190-2287bf448888"

    # _create_kpi_request.kpi_id.kpi_id.uuid                 = "1e22f180-ba28-4641-b190-2287bf446666"

    _create_kpi_request.kpi_id.kpi_id.uuid                 = "f974b6cc-095f-4767-b8c1-3457b383fb99"

    _create_kpi_request.kpi_description                    = descriptor_name

    _create_kpi_request.kpi_sample_type                    = KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED

    _create_kpi_request.device_id.device_uuid.uuid         = 'DEV2' 

    _create_kpi_request.device_id.device_uuid.uuid         = str(uuid.uuid4())

    _create_kpi_request.service_id.service_uuid.uuid       = 'SERV2'

    _create_kpi_request.slice_id.slice_uuid.uuid           = 'SLC1'

    _create_kpi_request.endpoint_id.endpoint_uuid.uuid     = 'END1' 

    _create_kpi_request.endpoint_id.endpoint_uuid.uuid     = str(uuid.uuid4())

    _create_kpi_request.connection_id.connection_uuid.uuid = 'CON1' 

    _create_kpi_request.link_id.link_uuid.uuid             = 'LNK1' 

    return _create_kpi_request