Commit bf4dd447 authored by Ricard Vilalta's avatar Ricard Vilalta
Browse files

Merge branch 'feat/180-job-failed-80694' into 'develop' 

Resolve "Job Failed #80694"

See merge request !256
parents d83d0b4e 0190accb

src/kpi_manager/database/Kpi_DB.py

+3 −2
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ class KpiDB: 
                # LOGGER.debug(f"{model.__name__} ID found: {str(entity)}")

                return entity

            else:

                LOGGER.debug(f"{model.__name__} ID not found: {str(id_to_search)}")

                raise NotFoundException (model.__name__, id_to_search, extra_details=["Row not found with ID"] )

                LOGGER.debug(f"{model.__name__} ID not found, No matching row: {str(id_to_search)}")

                print("{:} ID not found, No matching row: {:}".format(model.__name__, id_to_search))

                return None

        except Exception as e:

            session.rollback()

            LOGGER.debug(f"Failed to retrieve {model.__name__} ID. {str(e)}")

src/kpi_manager/service/KpiManagerServiceServicerImpl.py

+7 −2
Original line number Diff line number Diff line
@@ -52,6 +52,11 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
        try: 

            kpi_id_to_search = request.kpi_id.uuid

            row = self.kpi_db_obj.search_db_row_by_id(KpiModel, 'kpi_id', kpi_id_to_search)

            if row is None:

                print ('No matching row found for kpi id: {:}'.format(kpi_id_to_search))

                LOGGER.info('No matching row found kpi id: {:}'.format(kpi_id_to_search))

                return Empty()

            else:

                response = KpiModel.convert_row_to_KpiDescriptor(row)

                return response

        except Exception as e:

src/kpi_manager/tests/test_kpi_manager.py

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ from kpi_manager.tests.test_messages import create_kpi_descriptor_request, creat 
from kpi_manager.service.KpiManagerService import KpiManagerService

from kpi_manager.client.KpiManagerClient import KpiManagerClient

from kpi_manager.tests.test_messages import create_kpi_descriptor_request

from kpi_value_writer.tests.test_messages import create_kpi_id_request

from kpi_manager.tests.test_messages import create_kpi_id_request





#from monitoring.service.NameMapping import NameMapping

src/kpi_manager/tests/test_messages.py

+6 −0
Original line number Diff line number Diff line
@@ -18,6 +18,12 @@ from common.proto.kpi_sample_types_pb2 import KpiSampleType 
from common.proto.context_pb2 import DeviceId, LinkId, ServiceId, SliceId,\

                             ConnectionId, EndPointId





def create_kpi_id_request():

    _create_kpi_id = kpi_manager_pb2.KpiId()

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

    return _create_kpi_id



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())