Commit 88a942b1 authored by Antonio Gines Buendia Lopez's avatar Antonio Gines Buendia Lopez
Browse files

Updates PathComp service for H-RAT modelling

parent c32fa219

proto/src/python/__init__.py

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

proto/src/python/asyncio/__init__.py

100644 → 100755
+0 −0

File mode changed from 100644 to 100755.

View file

src/pathcompextended/service/PathCompExtendedService.py

+2 −2
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ from common.Settings import get_service_port_grpc 
from common.proto.pathcompextended_pb2 import DESCRIPTOR as PATHCOMPEXTENDED_DESCRIPTOR

from common.proto.pathcompextended_pb2_grpc import add_PathCompExtendedServiceServicer_to_server

from common.tools.service.GenericGrpcService import GenericGrpcService

from .PathCompServiceServicerImpl import PathCompServiceServicerImpl

from .PathCompExtendedServiceServicerImpl import PathCompExtendedServiceServicerImpl



class PathCompExtendedService(GenericGrpcService):

    def __init__(self, cls_name: str = __name__) -> None:

        port = get_service_port_grpc(ServiceNameEnum.PATHCOMPEXTENDED)

        super().__init__(port, cls_name=cls_name)

        self.pathcompextended_servicer = PathCompServiceServicerImpl()

        self.pathcompextended_servicer = PathCompExtendedServiceServicerImpl()



    def install_servicers(self):

        add_PathCompExtendedServiceServicer_to_server(self.pathcompextended_servicer, self.server)

src/pathcompextended/service/PathCompExtendedServiceServicerImpl.py

+13 −10
Original line number Diff line number Diff line
@@ -23,10 +23,13 @@ from common.proto.pathcompextended_pb2 import ( 
from common.proto.pathcompextended_pb2_grpc import PathCompExtendedServiceServicer

from common.tools.grpc.Tools import grpc_message_to_json_string

from pathcompextended.Config import is_forecaster_enabled, is_hrat_enabled

from pathcompextended.connector.hrat import HRAT

from pathcompextended.model.network_context import NetworkContextPostRequest

from pathcompextended.model.transport_optical_slice import TransportOpticalSlicePostRequest

from pathcompextended.model.transport_network_slice_l3 import TransportNetworkSliceL3PostRequest

from pathcompextended.connector.hrat import (

    HRAT,

    NetworkContextPostRequest,

    TransportOpticalSlicePostRequest,

    TransportNetworkSliceL3PostRequest,

)

from pathcompextended.model import Topology



LOGGER = logging.getLogger(__name__)
@@ -83,12 +86,12 @@ class PathCompExtendedServiceServicerImpl(PathCompExtendedServiceServicer): 
            try:

                # Convert proto NetworkContext to Pydantic model

                hrat_request = NetworkContextPostRequest(topologies=[

                    {

                        "topology-id": topology.topology_id,

                        "controllerId": topology.controller_id,

                        "topology-type": topology.topology_type,

                        "raw-json-topology": topology.raw_json_topology,

                    }

                    Topology(

                        topology_id=topology.topology_id,

                        controller_id=topology.controller_id,

                        topology_type=topology.topology_type,

                        raw_json_topology=topology.raw_json_topology,

                    )

                    for topology in request.topologies

                ])