Commit f0c99c8d authored by Waleed Akbar's avatar Waleed Akbar
Browse files

cleanup for merge

parent 1b88637a
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ class KafkaTopic(Enum):
        """
        all_topics = [member.value for member in KafkaTopic]
        if( KafkaTopic.create_new_topic_if_not_exists( all_topics )):
            LOGGER.debug("All topics created sucsessfully")
            LOGGER.debug("All topics are created sucsessfully")
            return True
        else:
            LOGGER.debug("Error creating all topics")
+1 −3
Original line number Diff line number Diff line
@@ -65,10 +65,8 @@ class KpiManagerClient:

    @RETRY_DECORATOR
    def GetKpiDescriptor(self, request : KpiId) -> KpiDescriptor:
        print('---> GetKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
        LOGGER.debug('GetKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
        response = self.stub.GetKpiDescriptor(request)
        print('---> GetKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
        LOGGER.debug('GetKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
        return response

+2 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@

import logging
from sqlalchemy.dialects.postgresql import UUID
from sqlalchemy import Column, Integer, String, Float, Text
from sqlalchemy import Column, Integer, String, Text
from sqlalchemy.orm import registry
from common.proto.kpi_manager_pb2 import KpiDescriptor

@@ -23,7 +23,6 @@ LOGGER = logging.getLogger(__name__)

# Create a base class for declarative models
Base = registry().generate_base()
# Base = declarative_base()

class Kpi(Base):
    __tablename__ = 'kpi'
+2 −3
Original line number Diff line number Diff line
@@ -14,17 +14,16 @@

from common.Constants import ServiceNameEnum
from common.Settings import get_service_port_grpc
from .NameMapping import NameMapping
from common.tools.service.GenericGrpcService import GenericGrpcService
from common.proto.kpi_manager_pb2_grpc import add_KpiManagerServiceServicer_to_server
from kpi_manager.service.KpiManagerServiceServicerImpl import KpiManagerServiceServicerImpl


class KpiManagerService(GenericGrpcService):
    def __init__(self, name_mapping : NameMapping, cls_name: str = __name__) -> None:
    def __init__(self, cls_name: str = __name__) -> None:
        port = get_service_port_grpc(ServiceNameEnum.KPIMANAGER)
        super().__init__(port, cls_name=cls_name)
        self.kpiManagerService_servicer = KpiManagerServiceServicerImpl(name_mapping)
        self.kpiManagerService_servicer = KpiManagerServiceServicerImpl()

    def install_servicers(self):
        add_KpiManagerServiceServicer_to_server(self.kpiManagerService_servicer, self.server)
+1 −7
Original line number Diff line number Diff line
@@ -14,24 +14,18 @@


import logging, grpc
from typing import List, Set
from sqlalchemy.sql.expression import BinaryExpression
from common.method_wrappers.Decorator import MetricsPool, safe_and_metered_rpc_method
from common.proto.context_pb2 import Empty
from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceServicer
from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
from .NameMapping import NameMapping
from kpi_manager.database.Kpi_DB import KpiDB
from kpi_manager.database.KpiModel import Kpi as KpiModel

LOGGER = logging.getLogger(__name__)
METRICS_POOL = MetricsPool('KpiManager', 'NBIgRPC')

class IDNotFoundError(Exception):
    ...

class KpiManagerServiceServicerImpl(KpiManagerServiceServicer):
    def __init__(self, name_mapping : NameMapping):
    def __init__(self):
        LOGGER.info('Init KpiManagerService')
        self.kpi_db_obj = KpiDB()
    
Loading