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

Renamed FLEXSCALE SBI Driver to Optical TFS SBI Driver

parent f9141ded

proto/context.proto

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_XR = 6;

  DEVICEDRIVER_IETF_L2VPN = 7;

  DEVICEDRIVER_GNMI_OPENCONFIG = 8;

  DEVICEDRIVER_FLEXSCALE = 9;

  DEVICEDRIVER_OPTICAL_TFS = 9;

  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

}

src/common/type_checkers/Assertions.py

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ def validate_device_driver_enum(message): 
        'DEVICEDRIVER_XR',

        'DEVICEDRIVER_IETF_L2VPN',

        'DEVICEDRIVER_GNMI_OPENCONFIG',

        'DEVICEDRIVER_FLEXSCALE',

        'DEVICEDRIVER_OPTICAL_TFS',

        'DEVICEDRIVER_IETF_ACTN',

    ]

src/context/service/database/models/enums/DeviceDriver.py

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ class ORM_DeviceDriverEnum(enum.Enum): 
    XR                    = DeviceDriverEnum.DEVICEDRIVER_XR

    IETF_L2VPN            = DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN

    GNMI_OPENCONFIG       = DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG

    FLEXSCALE             = DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE

    OPTICAL_TFS           = DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS

    IETF_ACTN             = DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN

    OC                    = DeviceDriverEnum.DEVICEDRIVER_OC

src/device/service/drivers/__init__.py

+3 −3
Original line number Diff line number Diff line
@@ -156,12 +156,12 @@ if LOAD_ALL_DEVICE_DRIVERS: 
        ]))



if LOAD_ALL_DEVICE_DRIVERS:

    from .flexscale.FlexScaleDriver import FlexScaleDriver # pylint: disable=wrong-import-position

    from .optical_tfs.OpticalTfsDriver import OpticalTfsDriver # pylint: disable=wrong-import-position

    DRIVERS.append(

        (FlexScaleDriver, [

        (OpticalTfsDriver, [

            {

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.OPEN_LINE_SYSTEM,

                FilterFieldEnum.DRIVER: DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE,

                FilterFieldEnum.DRIVER: DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS,

            }

        ]))

src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py

+3 −1
Original line number Diff line number Diff line
@@ -44,7 +44,9 @@ MAPPING_DRIVER = { 
    'DEVICEDRIVER_XR'                   : 6,

    'DEVICEDRIVER_IETF_L2VPN'           : 7,

    'DEVICEDRIVER_GNMI_OPENCONFIG'      : 8,

    'DEVICEDRIVER_FLEXSCALE'            : 9,

    'DEVICEDRIVER_OPTICAL_TFS'          : 9,

    'DEVICEDRIVER_IETF_ACTN'            : 10,

    'DEVICEDRIVER_OC'                   : 11,

}



MSG_ERROR = 'Could not retrieve devices in remote TeraFlowSDN instance({:s}). status_code={:s} reply={:s}'