Commit 50e4cd3f authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... 

Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into feat/347-cttc-integrate-ddos-mitigation-with-teraflowsdn
parents e7c5c315 eb5af569

manifests/metallb.yaml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
apiVersion: metallb.io/v1beta1

kind: IPAddressPool

metadata:

  name: my-ip-pool

  name: metallb-address-pool

  namespace: metallb-system

spec:

  addresses:

src/kpi_manager/database/KpiModel.py

+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ from sqlalchemy import Column, Integer, String, Text 
from sqlalchemy.orm import registry

from common.proto.kpi_manager_pb2 import KpiDescriptor



logging.basicConfig(level=logging.INFO)

LOGGER = logging.getLogger(__name__)



# Create a base class for declarative models

src/kpi_manager/service/KpiManagerServiceServicerImpl.py

+5 −5
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
        self, request: KpiDescriptor, grpc_context: grpc.ServicerContext # type: ignore

    ) -> KpiId: # type: ignore

        response = KpiId()

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

        LOGGER.debug(f"SetKpiDescriptor - Received gRPC message object: {request}")

        kpi_to_insert = KpiModel.convert_KpiDescriptor_to_row(request)

        if self.kpi_db_obj.add_row_to_db(kpi_to_insert):

            response.kpi_id.uuid = request.kpi_id.kpi_id.uuid
@@ -47,11 +47,11 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
        self, request: KpiId, grpc_context: grpc.ServicerContext # type: ignore

    ) -> KpiDescriptor: # type: ignore

        response = KpiDescriptor()

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

        LOGGER.debug(f"GetKpiDescriptor - Received gRPC message object: {request}")

        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:

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

            LOGGER.error(f"No matching row found kpi id: {kpi_id_to_search}")

            raise NotFoundException('KpiDescriptor', kpi_id_to_search)

        response = KpiModel.convert_row_to_KpiDescriptor(row)

        return response
@@ -60,7 +60,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    def DeleteKpiDescriptor(

        self, request: KpiId, grpc_context: grpc.ServicerContext # type: ignore

    ) -> Empty: # type: ignore

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

        LOGGER.debug(f"DeleteKpiDescriptor - Received gRPC message object: {request}")

        kpi_id_to_search = request.kpi_id.uuid

        self.kpi_db_obj.delete_db_row_by_id(KpiModel, 'kpi_id', kpi_id_to_search)

        return Empty()
@@ -69,7 +69,7 @@ class KpiManagerServiceServicerImpl(KpiManagerServiceServicer): 
    def SelectKpiDescriptor(

        self, filter: KpiDescriptorFilter, grpc_context: grpc.ServicerContext # type: ignore

    ) -> KpiDescriptorList: # type: ignore

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

        LOGGER.debug(f"SelectKpiDescriptor - Received gRPC message object: {filter}")

        response = KpiDescriptorList()

        rows = self.kpi_db_obj.select_with_filter(KpiModel, filter)

        for row in rows:

src/kpi_manager/service/__main__.py

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ def main(): 
    global LOGGER # pylint: disable=global-statement



    log_level = get_log_level()

    logging.basicConfig(level=log_level)

    logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s")

    LOGGER = logging.getLogger(__name__)



    signal.signal(signal.SIGINT,  signal_handler)

src/kpi_value_api/service/__main__.py

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ def main(): 
    global LOGGER # pylint: disable=global-statement



    log_level = get_log_level()

    logging.basicConfig(level=log_level)

    logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s")

    LOGGER = logging.getLogger(__name__)



    signal.signal(signal.SIGINT,  signal_handler)