Commit 8c3046c5 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Policy and ZTP components: 

- Aligned serializers to new additions in proto desscriptions
- Added missing ip_link proto
- Regenerated gRPC code
parent 905a4092

src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java

+32 −4
Original line number Diff line number Diff line
@@ -1160,12 +1160,26 @@ public class Serializer { 


    public ContextOuterClass.ServiceTypeEnum serialize(ServiceTypeEnum serviceTypeEnum) {

        switch (serviceTypeEnum) {

            case L2NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L2NM;

            case L3NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L3NM;

            case L2NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L2NM;

            case TAPI_CONNECTIVITY_SERVICE:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE;

            case TE:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_TE;

            case E2E:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_E2E;

            case OPTICAL_CONNECTIVITY:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY;

            case QKD:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_QKD;

            case L1NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L1NM;

            case INT:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_INT;

            case ACL:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_ACL;

            case IP_LINK:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_IP_LINK;

            case UNKNOWN:
@@ -1177,12 +1191,26 @@ public class Serializer { 


    public ServiceTypeEnum deserialize(ContextOuterClass.ServiceTypeEnum serializedServiceTypeEnum) {

        switch (serializedServiceTypeEnum) {

            case SERVICETYPE_L2NM:

                return ServiceTypeEnum.L2NM;

            case SERVICETYPE_L3NM:

                return ServiceTypeEnum.L3NM;

            case SERVICETYPE_L2NM:

                return ServiceTypeEnum.L2NM;

            case SERVICETYPE_TAPI_CONNECTIVITY_SERVICE:

                return ServiceTypeEnum.TAPI_CONNECTIVITY_SERVICE;

            case SERVICETYPE_TE:

                return ServiceTypeEnum.TE;

            case SERVICETYPE_E2E:

                return ServiceTypeEnum.E2E;

            case SERVICETYPE_OPTICAL_CONNECTIVITY:

                return ServiceTypeEnum.OPTICAL_CONNECTIVITY;

            case SERVICETYPE_QKD:

                return ServiceTypeEnum.QKD;

            case SERVICETYPE_L1NM:

                return ServiceTypeEnum.L1NM;

            case SERVICETYPE_INT:

                return ServiceTypeEnum.INT;

            case SERVICETYPE_ACL:

                return ServiceTypeEnum.ACL;

            case SERVICETYPE_IP_LINK:

                return ServiceTypeEnum.IP_LINK;

            case SERVICETYPE_UNKNOWN:

src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceTypeEnum.java

+9 −1
Original line number Diff line number Diff line
@@ -20,5 +20,13 @@ public enum ServiceTypeEnum { 
    UNKNOWN,

    L3NM,

    L2NM,

    TAPI_CONNECTIVITY_SERVICE

    TAPI_CONNECTIVITY_SERVICE,

    TE,

    E2E,

    OPTICAL_CONNECTIVITY,

    QKD,

    L1NM,

    INT,

    ACL,

    IP_LINK

}

src/policy/src/main/proto/ip_link.proto

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../../../proto/ip_link.proto
 
 No newline at end of file

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

+6618 −1939

File changed.

Preview size limit exceeded, changes collapsed.

src/policy/target/generated-sources/grpc/context/ContextService.java

+4 −0
Original line number Diff line number Diff line
@@ -114,6 +114,10 @@ public interface ContextService extends MutinyService { 


    io.smallrye.mutiny.Uni<context.ContextOuterClass.OpticalLinkList> getOpticalLinkList(context.ContextOuterClass.Empty request);



    io.smallrye.mutiny.Uni<context.ContextOuterClass.OpticalBandList> getOpticalBand(context.ContextOuterClass.Empty request);



    io.smallrye.mutiny.Uni<context.ContextOuterClass.OpticalBand> selectOpticalBand(context.ContextOuterClass.OpticalBandId request);



    io.smallrye.mutiny.Uni<context.ContextOuterClass.Empty> deleteServiceConfigRule(context.ContextOuterClass.ServiceConfigRule request);



    io.smallrye.mutiny.Multi<context.ContextOuterClass.ContextEvent> getContextEvents(context.ContextOuterClass.Empty request);