Commit 4af69bbb authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Common / Proto / Components: 

- Added device type "TeraFlowSDN controller"
- Added driver type for IETF L2VPN
- Updated corresponding components
parent a2ece92c

proto/context.proto

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ enum DeviceDriverEnum { 
  DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;

  DEVICEDRIVER_ONF_TR_352 = 5;

  DEVICEDRIVER_XR = 6;

  DEVICEDRIVER_IETF_L2VPN = 7;

}



enum DeviceOperationalStatusEnum {

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

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

            case XR:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;

            case IETF_L2VPN:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN;

            case UNDEFINED:

            default:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED;
@@ -874,6 +876,8 @@ public class Serializer { 
                return DeviceDriverEnum.ONF_TR_352;

            case DEVICEDRIVER_XR:

                return DeviceDriverEnum.XR;

            case DEVICEDRIVER_IETF_L2VPN:

                return DeviceDriverEnum.IETF_L2VPN;

            case DEVICEDRIVER_UNDEFINED:

            case UNRECOGNIZED:

            default:

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

+2 −0
Original line number Diff line number Diff line
@@ -1215,6 +1215,8 @@ class SerializerTest { 
                        DeviceDriverEnum.ONF_TR_352,

                        ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352),

                Arguments.of(DeviceDriverEnum.XR, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),

                Arguments.of(

                        DeviceDriverEnum.IETF_L2VPN, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN),

                Arguments.of(

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

    }

src/automation/target/generated-sources/grpc/context/ContextOuterClass.java

+9 −0
Original line number Diff line number Diff line
@@ -177,6 +177,10 @@ public final class ContextOuterClass { 
     * <code>DEVICEDRIVER_XR = 6;</code>

     */

    DEVICEDRIVER_XR(6),

    /**

     * <code>DEVICEDRIVER_IETF_L2VPN = 7;</code>

     */

    DEVICEDRIVER_IETF_L2VPN(7),

    UNRECOGNIZED(-1),

    ;








@@ -212,6 +216,10 @@ public final class ContextOuterClass {







     * <code>DEVICEDRIVER_XR = 6;</code>









     */









    public static final int DEVICEDRIVER_XR_VALUE = 6;









    /**









     * <code>DEVICEDRIVER_IETF_L2VPN = 7;</code>









     */









    public static final int DEVICEDRIVER_IETF_L2VPN_VALUE = 7;

























    public final int getNumber() {








@@ -245,6 +253,7 @@ public final class ContextOuterClass {







        case 4: return DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;









        case 5: return DEVICEDRIVER_ONF_TR_352;









        case 6: return DEVICEDRIVER_XR;









        case 7: return DEVICEDRIVER_IETF_L2VPN;









        default: return null;









      }









    }

























src/common/DeviceTypes.py



+4
−1






























Original line number
Diff line number
Diff line







@@ -39,3 +39,6 @@ class DeviceTypeEnum(Enum):







    PACKET_ROUTER                   = 'packet-router'









    PACKET_SWITCH                   = 'packet-switch'









    XR_CONSTELLATION                = 'xr-constellation'



















    # ETSI TeraFlowSDN controller









    TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'