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

Common & PathComp: 

- corrected device type name typo
- added missing devicetype-to-layer rules
parent b0be7852

src/common/DeviceTypes.py

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class DeviceTypeEnum(Enum): 


    # Emulated device types

    EMULATED_DATACENTER             = 'emu-datacenter'

    EMULATED_MICROVAWE_RADIO_SYSTEM = 'emu-microwave-radio-system'

    EMULATED_MICROWAVE_RADIO_SYSTEM = 'emu-microwave-radio-system'

    EMULATED_OPEN_LINE_SYSTEM       = 'emu-open-line-system'

    EMULATED_OPTICAL_ROADM          = 'emu-optical-roadm'

    EMULATED_OPTICAL_TRANSPONDER    = 'emu-optical-transponder'
@@ -28,7 +28,7 @@ class DeviceTypeEnum(Enum): 


    # Real device types

    DATACENTER                      = 'datacenter'

    MICROVAWE_RADIO_SYSTEM          = 'microwave-radio-system'

    MICROWAVE_RADIO_SYSTEM          = 'microwave-radio-system'

    OPEN_LINE_SYSTEM                = 'open-line-system'

    OPTICAL_ROADM                   = 'optical-roadm'

    OPTICAL_TRANSPONDER             = 'optical-transponder'

src/common/tools/object_factory/Device.py

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ DEVICE_PR_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG] 
DEVICE_TAPI_TYPE    = DeviceTypeEnum.OPEN_LINE_SYSTEM.value

DEVICE_TAPI_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API]



# check which enum type and value assign to microwave device

DEVICE_MICROWAVE_TYPE    = DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM.value

DEVICE_MICROWAVE_TYPE    = DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value

DEVICE_MICROWAVE_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY]



DEVICE_P4_TYPE      = DeviceTypeEnum.P4_SWITCH.value

src/device/service/drivers/__init__.py

+4 −4
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ DRIVERS.append( 
        {

            FilterFieldEnum.DEVICE_TYPE: [

                DeviceTypeEnum.EMULATED_DATACENTER,

                DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM,

                DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM,

                DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM,

                DeviceTypeEnum.EMULATED_OPTICAL_ROADM,

                DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER,
@@ -38,7 +38,7 @@ DRIVERS.append( 
                DeviceTypeEnum.EMULATED_PACKET_SWITCH,



                #DeviceTypeEnum.DATACENTER,

                #DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM,

                #DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM,

                #DeviceTypeEnum.OPEN_LINE_SYSTEM,

                #DeviceTypeEnum.OPTICAL_ROADM,

                #DeviceTypeEnum.OPTICAL_TRANSPONDER,
@@ -54,7 +54,7 @@ DRIVERS.append( 
        #    # Emulated devices, all drivers => use Emulated

        #    FilterFieldEnum.DEVICE_TYPE: [

        #        DeviceTypeEnum.EMULATED_DATACENTER,

        #        DeviceTypeEnum.EMULATED_MICROVAWE_RADIO_SYSTEM,

        #        DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM,

        #        DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM,

        #        DeviceTypeEnum.EMULATED_OPTICAL_ROADM,

        #        DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER,
@@ -111,7 +111,7 @@ if LOAD_ALL_DEVICE_DRIVERS: 
    DRIVERS.append(

        (IETFApiDriver, [

            {

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM,

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM,

                FilterFieldEnum.DRIVER     : ORM_DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,

            }

        ]))

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

+20 −16
Original line number Diff line number Diff line
@@ -85,14 +85,18 @@ DEVICE_TYPE_TO_LAYER = { 
    DeviceTypeEnum.PACKET_ROUTER.value                   : DeviceLayerEnum.PACKET_DEVICE,

    DeviceTypeEnum.EMULATED_PACKET_SWITCH.value          : DeviceLayerEnum.MAC_LAYER_DEVICE,

    DeviceTypeEnum.PACKET_SWITCH.value                   : DeviceLayerEnum.MAC_LAYER_DEVICE,

    DeviceTypeEnum.EMULATED_P4_SWITCH.value              : DeviceLayerEnum.MAC_LAYER_DEVICE,

    DeviceTypeEnum.P4_SWITCH.value                       : DeviceLayerEnum.MAC_LAYER_DEVICE,



    DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM.value   : DeviceLayerEnum.MAC_LAYER_CONTROLLER,

    DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM.value : DeviceLayerEnum.MAC_LAYER_CONTROLLER,

    DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value          : DeviceLayerEnum.MAC_LAYER_CONTROLLER,



    DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value       : DeviceLayerEnum.OPTICAL_CONTROLLER,

    DeviceTypeEnum.OPEN_LINE_SYSTEM.value                : DeviceLayerEnum.OPTICAL_CONTROLLER,



    DeviceTypeEnum.EMULATED_OPTICAL_ROADM.value          : DeviceLayerEnum.OPTICAL_DEVICE,

    DeviceTypeEnum.OPTICAL_ROADM.value                   : DeviceLayerEnum.OPTICAL_DEVICE,

    DeviceTypeEnum.EMULATED_OPTICAL_TRANSPONDER.value    : DeviceLayerEnum.OPTICAL_DEVICE,

    DeviceTypeEnum.OPTICAL_TRANSPONDER.value             : DeviceLayerEnum.OPTICAL_DEVICE,

}