Commit 56ab40bb authored by Ville Hallivuori's avatar Ville Hallivuori
Browse files

Pull request #1: vhallivu/XR_OPTICS_DRIVER_LOGIN_TO_CM 

Merge in XRCA/teraflow from vhallivu/XR_OPTICS_DRIVER_LOGIN_TO_CM to xr_development

Squashed commit of the following:

commit ba53d51d94c52491c4f70587187bf6746a9613da
Author: Ville Hallivuori <VHallivuori@infinera.com>
Date:   Fri Aug 5 13:26:40 2022 +0300

    Initial code for XR Device Driver, can connect to CM and acquire access token. No other functionality
parent 83275f91

proto/context.proto

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_P4 = 3;

  DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;

  DEVICEDRIVER_ONF_TR_352 = 5;

  DEVICEDRIVER_XR = 6;

}



enum DeviceOperationalStatusEnum {

src/automation/src/main/java/eu/teraflow/automation/Serializer.java

+4 −0
Original line number Diff line number Diff line
@@ -797,6 +797,8 @@ public class Serializer { 
                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;

            case ONF_TR_352:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;

            case XR:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;

            case UNDEFINED:

            default:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED;
@@ -816,6 +818,8 @@ public class Serializer { 
                return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;

            case DEVICEDRIVER_ONF_TR_352:

                return DeviceDriverEnum.ONF_TR_352;

            case DEVICEDRIVER_XR:

                return DeviceDriverEnum.XR;

            case DEVICEDRIVER_UNDEFINED:

            case UNRECOGNIZED:

            default:

src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java

+2 −1
Original line number Diff line number Diff line
@@ -22,5 +22,6 @@ public enum DeviceDriverEnum { 
    TRANSPORT_API,

    P4,

    IETF_NETWORK_TOPOLOGY,

    ONF_TR_352

    ONF_TR_352,

    XR

}

src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -1048,6 +1048,9 @@ class SerializerTest { 
                Arguments.of(

                        DeviceDriverEnum.ONF_TR_352,

                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352),

                Arguments.of(

                        DeviceDriverEnum.XR,

                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),

                Arguments.of(

                        DeviceDriverEnum.UNDEFINED, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED));

    }

src/common/DeviceTypes.py

+1 −0
Original line number Diff line number Diff line
@@ -24,3 +24,4 @@ class DeviceTypeEnum(Enum): 
    PACKET_ROUTER                = 'packet-router'

    PACKET_SWITCH                = 'packet-switch'

    P4_SWITCH                    = 'p4-switch'

    XR_CONSTELLATION             = 'xr-constellation'