Commit 23e6f6e8 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Logs are added to log gRPC messages.

parent 1ef912c5

src/kpi_manager/service/KpiManagerServiceServicerImpl.py

+5 −10
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



# do tests to verify the "grpc.ServicerContext" is required or not.



import logging, grpc

from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method

from common.proto.context_pb2 import Empty
@@ -39,7 +39,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    def SetKpiDescriptor(self, request: KpiDescriptor, grpc_context: grpc.ServicerContext # type: ignore

                        ) -> KpiId: # type: ignore

        response = KpiId()



        LOGGER.info("Received gRPC message object: {:}".format(request))

        try:

            kpi_to_insert                 = KpiModel()

            kpi_to_insert.kpi_id          = request.kpi_id.kpi_id.uuid
@@ -62,7 +62,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    def GetKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext # type: ignore

                         ) -> KpiDescriptor: # type: ignore

        response = KpiDescriptor()



        LOGGER.info("Received gRPC message object: {:}".format(request))

        try: 

            kpi_id_to_search = request.kpi_id.uuid

            row = self.managementDBobj.search_db_row_by_id(KpiModel, 'kpi_id', kpi_id_to_search)
@@ -82,6 +82,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

    def DeleteKpiDescriptor(self, request: KpiId, grpc_context: grpc.ServicerContext

                            ) -> Empty: # type: ignore

        LOGGER.info("Received gRPC message object: {:}".format(request))

        try:

            kpi_id_to_search = request.kpi_id.uuid

            self.managementDBobj.delete_db_row_by_id(KpiModel, 'kpi_id', kpi_id_to_search)
@@ -93,6 +94,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    @safe_and_metered_rpc_method(METRICS_POOL, LOGGER)

    def SelectKpiDescriptor(self, request: KpiDescriptorFilter, grpc_context: grpc.ServicerContext # type: ignore

                            ) -> KpiDescriptorList: # type: ignore

        LOGGER.info("Received gRPC message object: {:}".format(request))

        response = KpiDescriptorList()

        # LOGGER.info("Recevied requested Object: {:}".format(request))

        # re-structre the filter. create dynamic filter
@@ -105,13 +107,6 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
            LOGGER.info('Unable to apply filter on kpi descriptor. {:}'.format(e))

        try:

            if len(rows) != 0:

                kpi_id_obj    = KpiId()

                device_id_obj = DeviceId()

                endpoint_id_obj = EndPointId()

                service_id_obj = ServiceId()

                slice_id_obj = SliceId()

                link_id_obj = LinkId()



                for row in rows:

                    kpiDescriptor_obj = KpiDescriptor()

                    kpiDescriptor_obj.kpi_id.kpi_id.uuid = row.kpi_id

src/kpi_manager/tests/test_unitary.py

+5 −2
Original line number Diff line number Diff line
@@ -213,24 +213,27 @@ def kpi_manager_client(kpi_manager_service : KpiManagerService): # pylint: disab 
def test_SetKpiDescriptor(kpi_manager_client):

    LOGGER.info(" >>> test_SetKpiDescriptor: START <<< ")

    response = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request())

    LOGGER.info("Response gRPC message object: {:}".format(response))

    assert isinstance(response, KpiId)



def test_GetKpiDescriptor(kpi_manager_client):

    LOGGER.info(" >>> test_GetKpiDescriptor: START <<< ")

    response = kpi_manager_client.GetKpiDescriptor(create_kpi_id_request())

    LOGGER.info("Response gRPC message object: {:}".format(response))

    assert isinstance(response, KpiDescriptor)



def test_DeleteKpiDescriptor(kpi_manager_client):

    LOGGER.info(" >>> test_DeleteKpiDescriptor: START <<< ")

    response = kpi_manager_client.SetKpiDescriptor(create_kpi_descriptor_request())

    kpi_manager_client.DeleteKpiDescriptor(response)

    del_response = kpi_manager_client.DeleteKpiDescriptor(response)

    kpi_manager_client.GetKpiDescriptor(response)

    LOGGER.info("Response of delete method gRPC message object: {:}".format(del_response))

    assert isinstance(response, KpiId)



def test_SelectKpiDescriptor(kpi_manager_client):

    LOGGER.info(" >>> test_SelectKpiDescriptor: START <<< ")

    response = kpi_manager_client.SelectKpiDescriptor(create_kpi_filter_request_a())

    # LOGGER.info(" >>> test_SelectKpiDescriptor: END <<< {:}".format(response))

    LOGGER.info("Response gRPC message object: {:}".format(response))

    assert isinstance(response, KpiDescriptorList)



# ------------- INITIAL TESTs ----------------

src/telemetry/database/managementDB.py

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ class managementDB: 
                query = query.filter(getattr(model, column) == value) # type: ignore   

            result = query.all()

            if result:

                LOGGER.info(f"Fetched filtered rows from {model.__name__} table with filters: {filters}- Results: {result}") #  

                LOGGER.info(f"Fetched filtered rows from {model.__name__} table with filters: {filters}") #  - Results: {result}

            else:

                LOGGER.warning(f"No matching row found in {model.__name__} table with filters: {filters}")

            return result