Commit 2c370a0b authored by Pedro Paulo Tavares's avatar Pedro Paulo Tavares
Browse files

Added components to service

parent 6c4ef63c

proto/context.proto

+2 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_OPTICAL_TFS = 9;

  DEVICEDRIVER_IETF_ACTN = 10;

  DEVICEDRIVER_OC = 11;

  DEVICEDRIVER_QKD = 12;

}



enum DeviceOperationalStatusEnum {
@@ -300,6 +301,7 @@ enum ServiceTypeEnum { 
  SERVICETYPE_TE = 4;

  SERVICETYPE_E2E = 5;

  SERVICETYPE_OPTICAL_CONNECTIVITY = 6;

  SERVICETYPE_QKD = 7;

}



enum ServiceStatusEnum {

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

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ class ORM_DeviceDriverEnum(enum.Enum): 
    GNMI_OPENCONFIG       = DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG

    OPTICAL_TFS           = DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS

    IETF_ACTN             = DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN

    OC                    = DeviceDriverEnum.DEVICEDRIVER_OC

    OC                    = DeviceDriverEnum.DEVICEDRIVER_OC,

    QKD                   = DeviceDriverEnum.DEVICEDRIVER_QKD



grpc_to_enum__device_driver = functools.partial(

    grpc_to_enum, DeviceDriverEnum, ORM_DeviceDriverEnum)

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

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ class ORM_ServiceTypeEnum(enum.Enum): 
    TE                        = ServiceTypeEnum.SERVICETYPE_TE

    E2E                       = ServiceTypeEnum.SERVICETYPE_E2E

    OPTICAL_CONNECTIVITY      = ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY

    QKD                       = ServiceTypeEnum.SERVICETYPE_QKD



grpc_to_enum__service_type = functools.partial(

    grpc_to_enum, ServiceTypeEnum, ORM_ServiceTypeEnum)

src/service/service/service_handler_api/FilterFields.py

+4 −2
Original line number Diff line number Diff line
@@ -26,7 +26,8 @@ SERVICE_TYPE_VALUES = { 
    ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE,

    ServiceTypeEnum.SERVICETYPE_TE,

    ServiceTypeEnum.SERVICETYPE_E2E,

    ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY

    ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY,

    ServiceTypeEnum.SERVICETYPE_QKD

}



DEVICE_DRIVER_VALUES = {
@@ -41,7 +42,8 @@ DEVICE_DRIVER_VALUES = { 
    DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,

    DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS,

    DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN,

    DeviceDriverEnum.DEVICEDRIVER_OC

    DeviceDriverEnum.DEVICEDRIVER_OC,

    DeviceDriverEnum.DEVICEDRIVER_QKD

}



# Map allowed filter fields to allowed values per Filter field. If no restriction (free text) None is specified

src/service/service/service_handlers/__init__.py

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ from .tapi_tapi.TapiServiceHandler import TapiServiceHandler 
from .tapi_xr.TapiXrServiceHandler import TapiXrServiceHandler

from .e2e_orch.E2EOrchestratorServiceHandler import E2EOrchestratorServiceHandler

from .oc.OCServiceHandler import OCServiceHandler

from .qkd.qkd_service_handler import QKDServiceHandler



SERVICE_HANDLERS = [

    (L2NMEmulatedServiceHandler, [
@@ -106,5 +107,11 @@ SERVICE_HANDLERS = [ 
            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY,

            FilterFieldEnum.DEVICE_DRIVER : DeviceDriverEnum.DEVICEDRIVER_OC,

        }

    ]),

    (QKDServiceHandler, [

        {

            FilterFieldEnum.SERVICE_TYPE  : ServiceTypeEnum.SERVICETYPE_QKD,

            FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_QKD],

        }

    ])

]