Commit 547bb133 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Monitoring component changes to fix unitary tests

parent 58251afe

src/monitoring/requirements.in

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ protobuf==3.19.3 
pytest==6.2.5

pytest-benchmark==3.4.1

influxdb

#redis==4.1.2

redis==4.1.2

#anytree==2.8.0

#APScheduler==3.8.1

#xmltodict==0.12.0

src/monitoring/tests/test_unitary.py

+14 −11
Original line number Diff line number Diff line
@@ -19,10 +19,9 @@ import pytest 
from typing import Tuple





from monitoring.proto import context_pb2, kpi_sample_types_pb2

from monitoring.proto import monitoring_pb2

from monitoring.client.monitoring_client import MonitoringClient

from monitoring.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD, DEVICE_GRPC_GRACE_PERIOD, DEVICE_GRPC_MAX_WORKERS, DEVICE_GRPC_SERVICE_PORT, DEVICE_SERVICE_HOST

from monitoring.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD, DEVICE_GRPC_SERVICE_PORT

from monitoring.proto import context_pb2, monitoring_pb2

from monitoring.proto.kpi_sample_types_pb2 import KpiSampleType

from monitoring.service import SqliteTools, InfluxTools

from monitoring.service.MonitoringService import MonitoringService
@@ -33,7 +32,11 @@ from common.orm.Factory import get_database_backend, BackendEnum as DatabaseBack 
from common.message_broker.Factory import get_messagebroker_backend, BackendEnum as MessageBrokerBackendEnum

from common.message_broker.MessageBroker import MessageBroker



from context.Config import GRPC_SERVICE_PORT as grpc_port_context, GRPC_MAX_WORKERS as grpc_workers_context, GRPC_GRACE_PERIOD as grpc_grace_context

from context.Config import (

    GRPC_SERVICE_PORT as grpc_port_context,

    GRPC_MAX_WORKERS as grpc_workers_context,

    GRPC_GRACE_PERIOD as grpc_grace_context

)

from context.client.ContextClient import ContextClient

from context.service.grpc_server.ContextService import ContextService

from context.service.Populate import populate
@@ -104,15 +107,15 @@ def monitoring_service(): 
    grace_period    = GRPC_GRACE_PERIOD



    LOGGER.info('Initializing MonitoringService...')

    grpc_service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period)

    server = grpc_service.start()

    _service = MonitoringService(port=service_port, max_workers=max_workers, grace_period=grace_period)

    _service.start()



    # yield the server, when test finishes, execution will resume to stop it

    LOGGER.warning('monitoring_service yielding')

    yield server

    yield _service



    LOGGER.info('Terminating MonitoringService...')

    grpc_service.stop()

    _service.stop()



# This fixture will be requested by test cases and last during testing session.

# The client requires the server, so client fixture has the server as dependency.
@@ -159,7 +162,7 @@ def create_kpi_request(): 


    create_kpi_request                                  = monitoring_pb2.KpiDescriptor()

    create_kpi_request.kpi_description                  = 'KPI Description Test'

    create_kpi_request.kpi_sample_type                  = kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED

    create_kpi_request.kpi_sample_type                  = KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED

    create_kpi_request.device_id.device_uuid.uuid       = 'DEV1'  # pylint: disable=maybe-no-member

    create_kpi_request.service_id.service_uuid.uuid     = "SERV1"

    create_kpi_request.endpoint_id.endpoint_uuid.uuid   = "END1"
@@ -293,7 +296,7 @@ def test_sqlitedb_tools_get_kpis(sql_db): 
def test_sqlitedb_tools_delete_kpi(sql_db, create_kpi_request):

    LOGGER.warning('test_sqlitedb_tools_get_kpi begin')



    response = sql_db.delete_KPI("DEV1",kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED)

    response = sql_db.delete_KPI("DEV1",KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED)



    if response == False:

        kpi_description = create_kpi_request.kpi_description
@@ -303,7 +306,7 @@ def test_sqlitedb_tools_delete_kpi(sql_db, create_kpi_request): 
        kpi_service_id = create_kpi_request.service_id.service_uuid.uuid



        sql_db.insert_KPI(kpi_description, kpi_sample_type, kpi_device_id, kpi_endpoint_id, kpi_service_id)

        response = sql_db.delete_KPI("DEV1", kpi_sample_types_pb2.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED)

        response = sql_db.delete_KPI("DEV1", KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED)



    assert response == True