Commit 040224d4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/130-opt-sbi-for-qkd-nodes' into 'develop' 

Resolve "(OPT) SBI for QKD Nodes", "(OPT) QKD Network Topology" and "(OPT) Path Computation for QKD Networks"

See merge request !262
parents 4d16becb 45f86f70

my_deploy.sh

+4 −0
Original line number Diff line number Diff line
@@ -70,6 +70,10 @@ export TFS_COMPONENTS="context device pathcomp service slice nbi webui load_gene 
#    export TLS_CERT_PATH="src/dlt/gateway/keys/ca.crt"

#fi



# Uncomment to activate QKD App

#export TFS_COMPONENTS="${TFS_COMPONENTS} app"





# Set the tag you want to use for your images.

export TFS_IMAGE_TAG="dev"

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/common/DeviceTypes.py

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ class DeviceTypeEnum(Enum): 
    PACKET_ROUTER                   = 'packet-router'

    PACKET_SWITCH                   = 'packet-switch'

    XR_CONSTELLATION                = 'xr-constellation'

    QKD_NODE                        = 'qkd-node'



    # ETSI TeraFlowSDN controller

    TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'

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

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ class ORM_DeviceDriverEnum(enum.Enum): 
    OPTICAL_TFS           = DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS

    IETF_ACTN             = DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN

    OC                    = DeviceDriverEnum.DEVICEDRIVER_OC

    QKD                   = DeviceDriverEnum.DEVICEDRIVER_QKD



grpc_to_enum__device_driver = functools.partial(

    grpc_to_enum, DeviceDriverEnum, ORM_DeviceDriverEnum)

src/device/service/drivers/__init__.py

+11 −0
Original line number Diff line number Diff line
@@ -178,3 +178,14 @@ if LOAD_ALL_DEVICE_DRIVERS: 
                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_OC,

            }

        ]))



if LOAD_ALL_DEVICE_DRIVERS:

    from .qkd.QKDDriver2 import QKDDriver # pylint: disable=wrong-import-position

    DRIVERS.append(

        (QKDDriver, [

            {

                # Close enough, it does optical switching

                FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.QKD_NODE,

                FilterFieldEnum.DRIVER     : DeviceDriverEnum.DEVICEDRIVER_QKD,

            }

        ]))