Commit 44d8f73a authored by Fotis Soldatos's avatar Fotis Soldatos
Browse files

Merge branch 'automation/update-device-domain-model' into 'develop' 

Automation/update device domain model

See merge request teraflow-h2020/controller!142
parents 4bc6c2e0 3c11df0e

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

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package eu.teraflow.automation; 


import automation.Automation;

import context.ContextOuterClass;

import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.context.model.Device;

import eu.teraflow.automation.model.DeviceRoleId;

import io.quarkus.grpc.GrpcService;

import io.smallrye.mutiny.Uni;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package eu.teraflow.automation;



import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.context.model.Device;

import io.smallrye.mutiny.Uni;



public interface AutomationService {

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

+1 −1
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package eu.teraflow.automation;



import eu.teraflow.automation.context.ContextService;

import eu.teraflow.automation.context.model.Device;

import eu.teraflow.automation.device.DeviceService;

import eu.teraflow.automation.device.model.Device;

import io.smallrye.mutiny.Uni;

import javax.enterprise.context.ApplicationScoped;

import javax.inject.Inject;

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

+218 −20
Original line number Diff line number Diff line
@@ -32,25 +32,33 @@ import eu.teraflow.automation.acl.AclLogActionEnum; 
import eu.teraflow.automation.acl.AclMatch;

import eu.teraflow.automation.acl.AclRuleSet;

import eu.teraflow.automation.acl.AclRuleTypeEnum;

import eu.teraflow.automation.context.model.ConfigActionEnum;

import eu.teraflow.automation.context.model.ConfigRule;

import eu.teraflow.automation.context.model.ConfigRuleAcl;

import eu.teraflow.automation.context.model.ConfigRuleCustom;

import eu.teraflow.automation.context.model.ConfigRuleTypeAcl;

import eu.teraflow.automation.context.model.ConfigRuleTypeCustom;

import eu.teraflow.automation.context.model.Device;

import eu.teraflow.automation.context.model.DeviceConfig;

import eu.teraflow.automation.context.model.DeviceDriverEnum;

import eu.teraflow.automation.context.model.DeviceEvent;

import eu.teraflow.automation.context.model.DeviceOperationalStatus;

import eu.teraflow.automation.context.model.EndPoint;

import eu.teraflow.automation.context.model.EndPointId;

import eu.teraflow.automation.context.model.Event;

import eu.teraflow.automation.context.model.EventTypeEnum;

import eu.teraflow.automation.device.model.ConfigActionEnum;

import eu.teraflow.automation.device.model.ConfigRule;

import eu.teraflow.automation.device.model.ConfigRuleAcl;

import eu.teraflow.automation.device.model.ConfigRuleCustom;

import eu.teraflow.automation.device.model.ConfigRuleTypeAcl;

import eu.teraflow.automation.device.model.ConfigRuleTypeCustom;

import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.device.model.DeviceConfig;

import eu.teraflow.automation.device.model.DeviceEvent;

import eu.teraflow.automation.device.model.DeviceOperationalStatus;

import eu.teraflow.automation.device.model.EndPointId;

import eu.teraflow.automation.device.model.TopologyId;

import eu.teraflow.automation.context.model.GpsPosition;

import eu.teraflow.automation.context.model.Location;

import eu.teraflow.automation.context.model.LocationTypeGpsPosition;

import eu.teraflow.automation.context.model.LocationTypeRegion;

import eu.teraflow.automation.context.model.TopologyId;

import eu.teraflow.automation.kpi_sample_types.model.KpiSampleType;

import eu.teraflow.automation.model.DeviceRole;

import eu.teraflow.automation.model.DeviceRoleId;

import eu.teraflow.automation.model.DeviceRoleType;

import java.util.stream.Collectors;

import javax.inject.Singleton;

import kpi_sample_types.KpiSampleTypes;



@Singleton

public class Serializer {
@@ -691,26 +699,216 @@ public class Serializer { 
        }

    }



    public KpiSampleTypes.KpiSampleType serialize(KpiSampleType kpiSampleType) {

        switch (kpiSampleType) {

            case PACKETS_TRANSMITTED:

                return KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED;

            case PACKETS_RECEIVED:

                return KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED;

            case BYTES_TRANSMITTED:

                return KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_BYTES_TRANSMITTED;

            case BYTES_RECEIVED:

                return KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_BYTES_RECEIVED;

            case UNKNOWN:

                return KpiSampleTypes.KpiSampleType.KPISAMPLETYPE_UNKNOWN;

            default:

                return KpiSampleTypes.KpiSampleType.UNRECOGNIZED;

        }

    }



    public KpiSampleType deserialize(KpiSampleTypes.KpiSampleType serializedKpiSampleType) {

        switch (serializedKpiSampleType) {

            case KPISAMPLETYPE_PACKETS_TRANSMITTED:

                return KpiSampleType.PACKETS_TRANSMITTED;

            case KPISAMPLETYPE_PACKETS_RECEIVED:

                return KpiSampleType.PACKETS_RECEIVED;

            case KPISAMPLETYPE_BYTES_TRANSMITTED:

                return KpiSampleType.BYTES_TRANSMITTED;

            case KPISAMPLETYPE_BYTES_RECEIVED:

                return KpiSampleType.BYTES_RECEIVED;

            case KPISAMPLETYPE_UNKNOWN:

            default:

                return KpiSampleType.UNKNOWN;

        }

    }



    public ContextOuterClass.Location serialize(Location location) {

        final var builder = ContextOuterClass.Location.newBuilder();



        final var locationType = location.getLocationType();

        final var locationTypeSpecificType = locationType.getLocationType();



        if (locationTypeSpecificType instanceof GpsPosition) {

            final var latitude = ((GpsPosition) locationTypeSpecificType).getLatitude();

            final var longitude = ((GpsPosition) locationTypeSpecificType).getLongitude();



            final var serializedGpsPosition =

                    ContextOuterClass.GPS_Position.newBuilder()

                            .setLatitude(latitude)

                            .setLongitude(longitude)

                            .build();



            builder.setGpsPosition(serializedGpsPosition);

        }



        if (locationTypeSpecificType instanceof String) {

            final var region = ((String) locationTypeSpecificType);



            builder.setRegion(region);

        }



        return builder.build();

    }



    public Location deserialize(ContextOuterClass.Location serializedLocation) {

        final var typeOfLocation = serializedLocation.getLocationCase();



        switch (typeOfLocation) {

            case REGION:

                final var region = serializedLocation.getRegion();

                final var locationTypeRegion = new LocationTypeRegion(region);



                return new Location(locationTypeRegion);

            case GPS_POSITION:

                final var serializedGpsPosition = serializedLocation.getGpsPosition();

                final var latitude = serializedGpsPosition.getLatitude();

                final var longitude = serializedGpsPosition.getLongitude();



                final var gpsPosition = new GpsPosition(latitude, longitude);

                final var locationTypeGpsPosition = new LocationTypeGpsPosition(gpsPosition);



                return new Location(locationTypeGpsPosition);

            default:

            case LOCATION_NOT_SET:

                throw new IllegalStateException("Location value not set");

        }

    }



    public ContextOuterClass.DeviceDriverEnum serialize(DeviceDriverEnum deviceDriverEnum) {

        switch (deviceDriverEnum) {

            case OPENCONFIG:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG;

            case TRANSPORT_API:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API;

            case P4:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_P4;

            case IETF_NETWORK_TOPOLOGY:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;

            case ONF_TR_352:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;

            case UNDEFINED:

            default:

                return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_UNDEFINED;

        }

    }



    public DeviceDriverEnum deserialize(

            ContextOuterClass.DeviceDriverEnum serializedDeviceDriverEnum) {

        switch (serializedDeviceDriverEnum) {

            case DEVICEDRIVER_OPENCONFIG:

                return DeviceDriverEnum.OPENCONFIG;

            case DEVICEDRIVER_TRANSPORT_API:

                return DeviceDriverEnum.TRANSPORT_API;

            case DEVICEDRIVER_P4:

                return DeviceDriverEnum.P4;

            case DEVICEDRIVER_IETF_NETWORK_TOPOLOGY:

                return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;

            case DEVICEDRIVER_ONF_TR_352:

                return DeviceDriverEnum.ONF_TR_352;

            case DEVICEDRIVER_UNDEFINED:

            case UNRECOGNIZED:

            default:

                return DeviceDriverEnum.UNDEFINED;

        }

    }



    public ContextOuterClass.EndPoint serialize(EndPoint endPoint) {

        final var builder = ContextOuterClass.EndPoint.newBuilder();



        final var endPointId = endPoint.getEndPointId();

        final var endPointType = endPoint.getEndPointType();

        final var kpiSampleTypes = endPoint.getKpiSampleTypes();

        final var endPointLocation = endPoint.getEndPointLocation();



        final var serializedEndPointId = serialize(endPointId);

        final var serializedKpiSampleTypes =

                kpiSampleTypes.stream().map(this::serialize).collect(Collectors.toList());

        final var serializedEndPointLocation = serialize(endPointLocation);



        builder.setEndpointId(serializedEndPointId);

        builder.setEndpointType(endPointType);

        builder.addAllKpiSampleTypes(serializedKpiSampleTypes);

        builder.setEndpointLocation(serializedEndPointLocation);



        return builder.build();

    }



    public EndPoint deserialize(ContextOuterClass.EndPoint serializedEndPoint) {

        final var serializedEndPointId = serializedEndPoint.getEndpointId();

        final var endPointType = serializedEndPoint.getEndpointType();

        final var serializedKpiSampleTypes = serializedEndPoint.getKpiSampleTypesList();

        final var serializedEndPointLocation = serializedEndPoint.getEndpointLocation();



        final var endPointId = deserialize(serializedEndPointId);

        final var kpiSampleTypes =

                serializedKpiSampleTypes.stream().map(this::deserialize).collect(Collectors.toList());

        final var endPointLocation = deserialize(serializedEndPointLocation);



        return new EndPoint(endPointId, endPointType, kpiSampleTypes, endPointLocation);

    }



    public ContextOuterClass.Device serialize(Device device) {

        final var builder = ContextOuterClass.Device.newBuilder();



        final var deviceIdUuid = serializeUuid(device.getDeviceId());

        final var deviceId = DeviceId.newBuilder().setDeviceUuid(deviceIdUuid);

        final var deviceType = device.getDeviceType();

        final var deviceConfig = device.getDeviceConfig();

        final var deviceOperationalStatus = device.getDeviceOperationalStatus();

        final var deviceDrivers = device.getDeviceDrivers();

        final var deviceEndPoints = device.getEndPoints();



        final var serializedDeviceConfig = serialize(deviceConfig);

        final var serializedDeviceOperationalStatus = serialize(deviceOperationalStatus);

        final var serializedDeviceDrivers =

                deviceDrivers.stream().map(this::serialize).collect(Collectors.toList());

        final var serializedDeviceEndPoints =

                deviceEndPoints.stream().map(this::serialize).collect(Collectors.toList());



        builder.setDeviceId(deviceId);

        builder.setDeviceType(device.getDeviceType());

        builder.setDeviceConfig(serialize(device.getDeviceConfig()));

        builder.setDeviceOperationalStatus(serialize(device.getDeviceOperationalStatus()));

        builder.setDeviceType(deviceType);

        builder.setDeviceConfig(serializedDeviceConfig);

        builder.setDeviceOperationalStatus(serializedDeviceOperationalStatus);

        builder.addAllDeviceDrivers(serializedDeviceDrivers);

        builder.addAllDeviceEndpoints(serializedDeviceEndPoints);



        return builder.build();

    }



    public Device deserialize(ContextOuterClass.Device device) {

        final var id = deserialize(device.getDeviceId());

        final var type = device.getDeviceType();

        final var config = deserialize(device.getDeviceConfig());

        final var operationalStatus = deserialize(device.getDeviceOperationalStatus());



        return new Device(id, type, config, operationalStatus);

        final var serializedDeviceId = device.getDeviceId();

        final var deviceType = device.getDeviceType();

        final var serializedDeviceConfig = device.getDeviceConfig();

        final var serializedDeviceOperationalStatus = device.getDeviceOperationalStatus();

        final var serializedDeviceDrivers = device.getDeviceDriversList();

        final var serializedDeviceEndPoints = device.getDeviceEndpointsList();



        final var deviceId = deserialize(serializedDeviceId);

        final var deviceConfig = deserialize(serializedDeviceConfig);

        final var deviceOperationalStatus = deserialize(serializedDeviceOperationalStatus);

        final var deviceDrivers =

                serializedDeviceDrivers.stream().map(this::deserialize).collect(Collectors.toList());

        final var deviceEndPoints =

                serializedDeviceEndPoints.stream().map(this::deserialize).collect(Collectors.toList());



        return new Device(

                deviceId,

                deviceType,

                deviceConfig,

                deviceOperationalStatus,

                deviceDrivers,

                deviceEndPoints);

    }



    public Uuid serializeUuid(String uuid) {

src/automation/src/main/java/eu/teraflow/automation/context/ContextGateway.java

+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 


package eu.teraflow.automation.context;



import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.device.model.DeviceEvent;

import eu.teraflow.automation.context.model.Device;

import eu.teraflow.automation.context.model.DeviceEvent;

import io.smallrye.mutiny.Multi;

import io.smallrye.mutiny.Uni;