Commit ea9d59dc authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

PathComp component - FrontEnd: 

- Fix Algorithms for new device types
parent 94461d98

src/pathcomp/frontend/service/algorithms/_Algorithm.py

+7 −3
Original line number Diff line number Diff line
@@ -264,9 +264,13 @@ class _Algorithm: 
                self.logger.debug('path_hops = {:s}'.format(str(path_hops)))

                device_types = {v[0]['device_type'] for k,v in self.device_dict.items()}

                DEVICES_BASIC_CONNECTION = {

                    DeviceTypeEnum.DATACENTER.value,    DeviceTypeEnum.EMULATED_DATACENTER.value,

                    DeviceTypeEnum.CLIENT.value,        DeviceTypeEnum.EMULATED_CLIENT.value,

                    DeviceTypeEnum.PACKET_ROUTER.value, DeviceTypeEnum.EMULATED_PACKET_ROUTER.value,

                    DeviceTypeEnum.EMULATED_CLIENT.value,

                    DeviceTypeEnum.EMULATED_COMPUTER.value,

                    DeviceTypeEnum.EMULATED_DATACENTER.value,

                    DeviceTypeEnum.EMULATED_VIRTUAL_MACHINE.value,

                    DeviceTypeEnum.EMULATED_PACKET_ROUTER.value,

                    DeviceTypeEnum.PACKET_POP.value,

                    DeviceTypeEnum.PACKET_ROUTER.value,

                }

                self.logger.debug('device_types = {:s}'.format(str(device_types)))

                self.logger.debug('DEVICES_BASIC_CONNECTION = {:s}'.format(str(DEVICES_BASIC_CONNECTION)))

src/pathcomp/frontend/service/algorithms/tools/ResourceGroups.py

+13 −8
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ from common.tools.grpc.Tools import grpc_message_to_json_string 




DEVICE_TYPE_TO_DEEPNESS = {

    DeviceTypeEnum.EMULATED_DATACENTER.value             : 90,

    DeviceTypeEnum.DATACENTER.value                      : 90,

    DeviceTypeEnum.EMULATED_CLIENT.value                 : 90,

    DeviceTypeEnum.CLIENT.value                          : 90,

    DeviceTypeEnum.EMULATED_COMPUTER.value               : 90,

    DeviceTypeEnum.EMULATED_DATACENTER.value             : 90,

    DeviceTypeEnum.EMULATED_VIRTUAL_MACHINE.value        : 90,



    DeviceTypeEnum.TERAFLOWSDN_CONTROLLER.value          : 80,

    DeviceTypeEnum.EMULATED_IP_SDN_CONTROLLER.value      : 80,
@@ -33,6 +33,7 @@ DEVICE_TYPE_TO_DEEPNESS = { 




    DeviceTypeEnum.EMULATED_PACKET_ROUTER.value          : 70,

    DeviceTypeEnum.PACKET_POP.value                      : 70,

    DeviceTypeEnum.PACKET_ROUTER.value                   : 70,



    DeviceTypeEnum.EMULATED_PACKET_SWITCH.value          : 60,
@@ -49,14 +50,18 @@ DEVICE_TYPE_TO_DEEPNESS = { 
    DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value       : 30,

    DeviceTypeEnum.OPEN_LINE_SYSTEM.value                : 30,



    DeviceTypeEnum.EMULATED_PACKET_RADIO_ROUTER.value    : 10,

    DeviceTypeEnum.PACKET_RADIO_ROUTER.value             : 10,

    DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER.value    : 10,

    DeviceTypeEnum.OPTICAL_TRANSPONDER.value             : 10,

    DeviceTypeEnum.EMULATED_OPTICAL_ROADM.value          : 10,

    DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER.value    : 10,

    DeviceTypeEnum.OPEN_ROADM.value                      : 10,

    DeviceTypeEnum.OPTICAL_FGOTN.value                   : 10,

    DeviceTypeEnum.OPTICAL_OLT.value                     : 10,

    DeviceTypeEnum.OPTICAL_ONT.value                     : 10,

    DeviceTypeEnum.OPTICAL_ROADM.value                   : 10,

    DeviceTypeEnum.OPTICAL_TRANSPONDER.value             : 10,



    DeviceTypeEnum.EMULATED_PACKET_RADIO_ROUTER.value    : 10,

    DeviceTypeEnum.PACKET_RADIO_ROUTER.value             : 10,

    DeviceTypeEnum.QKD_NODE.value                        : 10,

    DeviceTypeEnum.OPEN_ROADM.value                      : 10,



    DeviceTypeEnum.EMULATED_OPTICAL_SPLITTER.value       :  0,

    DeviceTypeEnum.NETWORK.value                         :  0, # network out of our control; always delegate

src/pathcomp/frontend/service/algorithms/tools/ServiceTypes.py

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ 
# limitations under the License.





from typing import Optional

from common.DeviceTypes import DeviceTypeEnum

from common.proto.context_pb2 import ServiceTypeEnum
@@ -25,6 +24,7 @@ PACKET_DEVICE_TYPES = { 
    DeviceTypeEnum.TERAFLOWSDN_CONTROLLER,

    DeviceTypeEnum.IETF_SLICE, DeviceTypeEnum.NCE,

    DeviceTypeEnum.IP_SDN_CONTROLLER, DeviceTypeEnum.EMULATED_IP_SDN_CONTROLLER,

    DeviceTypeEnum.PACKET_POP,

    DeviceTypeEnum.PACKET_ROUTER, DeviceTypeEnum.EMULATED_PACKET_ROUTER,

    DeviceTypeEnum.PACKET_SWITCH, DeviceTypeEnum.EMULATED_PACKET_SWITCH,

}