Commit e287654b authored by Anastasios Poimenidis's avatar Anastasios Poimenidis
Browse files

feat: send a service monitoring Kafka message for end user services

parent 6a1f860d

pom.xml

+1 −1
Changes for pom.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
    <dependency>

      <groupId>org.etsi.osl.hypo.core</groupId>

      <artifactId>common</artifactId>

      <version>1.5.4</version>

      <version>1.6.0</version>

    </dependency>



    <dependency>

src/main/java/converters/SonataServiceOrderConverters.java

+9 −0
Changes for src/main/java/converters/SonataServiceOrderConverters.java: 9 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,10 +4,12 @@ import jakarta.enterprise.context.ApplicationScoped; 
import java.time.Clock;

import java.time.OffsetDateTime;

import mappers.ObjectConverters;

import org.etsi.osl.hypo.core.common.helm.engine.HelmEngineDeploymentResult;

import org.etsi.osl.hypo.core.common.oss.client.K8sServiceOrderData;

import org.etsi.osl.hypo.core.common.oss.client.SimpleServiceOrderData;

import org.etsi.osl.hypo.core.common.service.inventory.ServiceOrderServiceActivationData;

import org.etsi.osl.hypo.core.common.service.inventory.ServiceTerminationDataWithTimer;

import org.etsi.osl.hypo.core.common.service.monitoring.ServiceMonitoringRequest;

import org.etsi.osl.hypo.core.common.sonata.SonataServiceOrder;

import org.etsi.osl.hypo.core.common.tmf.ServiceOrderData;

import org.etsi.osl.hypo.core.common.tmf.ServiceOrderEndUserData;
@@ -46,6 +48,13 @@ public class SonataServiceOrderConverters { 
                serviceOrderEndUserData);

    }



    public ServiceMonitoringRequest getServiceMonitoringRequest(

            ServiceOrderEndUserData serviceOrderEndUserData,

            HelmEngineDeploymentResult helmEngineDeploymentResult) {

        return ObjectConverters.INSTANCE.getServiceMonitoringRequest(

                serviceOrderEndUserData, helmEngineDeploymentResult);

    }



    public boolean isRequestedStartDateValidForNewServiceOrderServiceActivationProcess(

            SonataServiceOrder sonataServiceOrder) {

        OffsetDateTime systemOffsetDateTime = OffsetDateTime.now(Clock.systemUTC());

src/main/java/mappers/ObjectConverters.java

+6 −0
Changes for src/main/java/mappers/ObjectConverters.java: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ import org.etsi.osl.hypo.core.common.service.inventory.ServiceOrderServiceActiva 
import org.etsi.osl.hypo.core.common.service.inventory.ServiceTerminationData;

import org.etsi.osl.hypo.core.common.service.inventory.ServiceTerminationDataWithTimer;

import org.etsi.osl.hypo.core.common.service.inventory.ServiceUpdateData;

import org.etsi.osl.hypo.core.common.service.monitoring.ServiceMonitoringRequest;

import org.etsi.osl.hypo.core.common.sonata.K8sServiceOrderCharacteristics;

import org.etsi.osl.hypo.core.common.sonata.SonataServiceOrder;

import org.etsi.osl.hypo.core.common.telemetry.DashboardData;
@@ -184,4 +185,9 @@ public interface ObjectConverters { 


    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)

    DeleteTelemetryData getDeleteTelemetryData(ServiceTerminationData serviceTerminationData);



    @Mapping(target = "serviceId", source = "serviceOrderEndUserData.serviceId")

    ServiceMonitoringRequest getServiceMonitoringRequest(

            ServiceOrderEndUserData serviceOrderEndUserData,

            HelmEngineDeploymentResult helmEngineDeploymentResult);

}

src/main/resources/application.properties

+5 −0
Changes for src/main/resources/application.properties: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -142,6 +142,11 @@ mp.messaging.outgoing.tmf-service-dashboard-delete.connector=smallrye-kafka 
mp.messaging.outgoing.tmf-service-dashboard-delete.topic=tmf-service-dashboard-delete

mp.messaging.outgoing.tmf-service-dashboard-delete.value.serializer=org.apache.kafka.common.serialization.StringSerializer



# Configuring the outgoing channel (posting to Kafka) for Service Monitoring

mp.messaging.outgoing.service-monitor-request.connector=smallrye-kafka

mp.messaging.outgoing.service-monitor-request.topic=service-monitor-request

mp.messaging.outgoing.service-monitor-request.value.serializer=org.apache.kafka.common.serialization.StringSerializer



# Configuring the outgoing channel (posting to Helm Engine) for the registry data

mp.messaging.outgoing.helm-engine-parse.connector=smallrye-kafka

mp.messaging.outgoing.helm-engine-parse.topic=helm-engine-parse

src/main/resources/diagrams/deployServiceOverK8s/serviceOrderHandlers/serviceDeploymentProcess.bpmn2

+138 −27

File changed.

Preview size limit exceeded, changes collapsed.