Commit 4f2374f6 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Minor changes in Telemetry package

parent 23e6f6e8

src/telemetry/backend/service/TelemetryBackendService.py

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ class TelemetryBackendService: 
            if time.time() - start_time >= duration:            # condition to terminate backend

                print("Execution Time Completed: \n --- Consumer terminating: KPI ID: ", kpi_id, " - ", time.time() - start_time)

                self.generate_kafka_response(collector_id, "NULL", False)

                # write to Kafka

                # write to Kafka to send the termination confirmation.

                break

            # print ("Received KPI: ", kpi_id, ", Duration: ", duration, ", Fetch Interval: ", interval)

            self.extract_kpi_value(collector_id, kpi_id)

src/telemetry/database/tests/telemetryDBtests.py

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ def test_telemetry_object_creation(): 


    LOGGER.info('>>> Creating TelemetryDBmanager Object <<< ')

    TelemetryDBmanagerObj = TelemetryDBmanager()

    TelemetryEngine.create_database(TelemetryDBmanagerObj.db_engine)

    TelemetryEngine.create_database(TelemetryDBmanagerObj.db_engine)        # creates 'frontend' db, if it doesnot exists.



    LOGGER.info('>>> Creating database <<< ')

    TelemetryDBmanagerObj.create_database()

src/telemetry/frontend/service/TelemetryFrontendServiceServicerImpl.py

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ class TelemetryFrontendServiceServicerImpl(TelemetryFrontendServiceServicer): 
            # Create a new Collector instance

            collector_to_insert                     = CollectorModel()

            collector_to_insert.collector_id        = request.collector_id.collector_id.uuid

            collector_to_insert.kpi_id              = '3a17230d-8e95-4afb-8b21-6965481aee5a'

            collector_to_insert.collector           = "Test collector description"

            collector_to_insert.kpi_id              = request.kpi_id.kpi_id.uuid

            collector_to_insert.collector           = "DESC 1"

            collector_to_insert.sampling_duration_s = request.duration_s

            collector_to_insert.sampling_interval_s = request.interval_s

            collector_to_insert.start_timestamp     = time.time()

src/telemetry/frontend/tests/Messages.py

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ def create_collector_id_a(coll_id_str : str): 
def create_collector_request():

    _create_collector_request                                = telemetry_frontend_pb2.Collector()

    _create_collector_request.collector_id.collector_id.uuid = str(uuid.uuid4())

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

    _create_collector_request.kpi_id.kpi_id.uuid             = "165d20c5-a446-42fa-812f-e2b7ed283c6f"

    _create_collector_request.duration_s                     = float(random.randint(8, 16))

    _create_collector_request.interval_s                     = float(random.randint(2, 4))

    return _create_collector_request