Commit 719fe22c authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Monitoring component: 

- Corrected unitary tests
parent feadd132

src/monitoring/tests/test_unitary.py

+8 −5
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ from monitoring.service import ManagementDBTools, MetricsDBTools 
from monitoring.service.EventTools import EventsDeviceCollector

from monitoring.service.MetricsDBTools import MetricsDB

from monitoring.service.MonitoringService import MonitoringService

from monitoring.service.NameMapping import NameMapping

#from monitoring.service.SubscriptionManager import SubscriptionManager

from monitoring.tests.Messages import create_kpi_request, create_kpi_request_d, include_kpi_request, monitor_kpi_request, \

    create_kpi_request_c, kpi_query, subs_descriptor, alarm_descriptor, alarm_subscription #, create_kpi_request_b
@@ -155,7 +156,8 @@ def monitoring_service( 
        device_service : DeviceService     # pylint: disable=redefined-outer-name,unused-argument

    ):

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

    _service = MonitoringService()

    name_mapping = NameMapping()

    _service = MonitoringService(name_mapping)

    _service.start()



    # yield the server, when test finishes, execution will resume to stop it
@@ -189,10 +191,11 @@ def management_db(): 
    return _management_db



@pytest.fixture(scope='session')

def metrics_db():

    _metrics_db = MetricsDBTools.MetricsDB(

        METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE)

    return _metrics_db

def metrics_db(monitoring_service : MonitoringService):

    return monitoring_service.monitoring_servicer.metrics_db

    #_metrics_db = MetricsDBTools.MetricsDB(

    #    METRICSDB_HOSTNAME, METRICSDB_ILP_PORT, METRICSDB_REST_PORT, METRICSDB_TABLE)

    #return _metrics_db



@pytest.fixture(scope='session')

def subs_scheduler():