Commit 121b854c authored by George Tziavas's avatar George Tziavas
Browse files

fixed queues and more

parent 4f1271a7

.settings/org.eclipse.jdt.apt.core.prefs

0 → 100644
+4 −0
Original line number Diff line number Diff line 
eclipse.preferences.version=1

org.eclipse.jdt.apt.aptEnabled=true

org.eclipse.jdt.apt.genSrcDir=target/generated-sources/annotations

org.eclipse.jdt.apt.genTestSrcDir=target/generated-test-sources/test-annotations

.settings/org.eclipse.jdt.core.prefs

+1 −0
Original line number Diff line number Diff line
@@ -4,5 +4,6 @@ org.eclipse.jdt.core.compiler.compliance=17 
org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled

org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning

org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore

org.eclipse.jdt.core.compiler.processAnnotations=enabled

org.eclipse.jdt.core.compiler.release=disabled

org.eclipse.jdt.core.compiler.source=17

.settings/org.eclipse.m2e.core.prefs

0 → 100644
+4 −0
Original line number Diff line number Diff line 
activeProfiles=

eclipse.preferences.version=1

resolveWorkspaceProjects=true

version=1

Documentation/FlowDiagram.puml

+16 −12
Original line number Diff line number Diff line
@@ -9,25 +9,29 @@ participant prometheus as prom 


actor   -> tmf_api: CREATE: Service Order Monitoring aaS

osom    -> osom: PROCESS ORDER

osom    -> tmf_api: CREATE: service instance of monitoring aaS (CFS)

osom    -> tmf_api: CREATE: service instance of monitoring aaS (RFS)



osom    -> amq: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:orange>payload: Service Order / Service Specification

amq     -> tmf_api: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:orange>payload: Service Order / Service Specification

tmf_api -> amq: PUBLISH EVENT: Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job

amq     -> metrico: RECEIVE EVENT: Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job

osom    -> tmf_api: CREATE: service instance of monitoring aaS (RFS)(Initial Status: Reseved)

osom    -> tmf_api: CREATE: service instance of monitoring aaS (CFS)(Initial Status: Reseved)



osom    -> amq: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:green>payload: MeasurementCollectionJobFVO

amq     -> tmf_api: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:green>payload: MeasurementCollectionJobFVO (Here I can find the MCJ ID)

tmf_api     -> amq: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:green>payload: MeasurementCollectionJob (Here I can find the MCJ ID)

osom -> tmf_api: CREATE: Resource Instance (Initial Status: Reseved)(associate to RFS)(add the MCJ UUID)

amq     -> osom: CREATE: TMF628 Measurement Collection Job \n<color:green>queue:PM_MEASUREMENT_COLLECTION_JOB_ADD \n<color:green>payload: MeasurementCollectionJob (Here I can find the MCJ ID)

tmf_api -> amq: PUBLISH EVENT: Monitoring Job Created\n<color:green>topic: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job Ref

amq     -> metrico: RECEIVE EVENT: Monitoring Job Created\n<color:green>topic: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job Ref

metrico -> tmf_api: fetch Measurement Collection Job from ref

tmf_api -> metrico: fetch Measurement Collection Job from ref

metrico    -> metrico: create METRICO job

metrico    -> amq: RESPONSE TO EVENT Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID

amq     -> tmf_api: RESPONSE TO EVENT Monitoring Job Created\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_CREATED\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID

metrico    -> amq: UPDATE Measurement Collection Job Status





metrico -> metrico: Create a java job with refresh rate

group "java job" 

    metrico -> metrico   : set how often job is done

    metrico -> prom   : send prom req

    prom -> metrico   : reply to prom req

    metrico -> metrico   : parse data from reply and cast them to performance indicator

    metrico -> amq    : UPDATE TMF628 Measurement Collection Job\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_UPDATE\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID and METRICS

    amq  -> tmf_api: UPDATE TMF628 Measurement Collection Job\n<color:green>queue: PM_MEASUREMENT_COLLECTION_JOB_UPDATE\n<color:green>payload: Measurement Collection Job with METRICO JOB_ID and METRICS

    metrico -> metrico   : parse data from reply and cast them to data access endpoint

    

    metrico -> amq    : UPDATE: Related service to the Service Inventory\n<color:red>queue:? \n<color:red>payload: ???

    amq  -> tmf_api: UPDATE: Related service to the Service Inventory\n<color:red>queue:? \n<color:red>payload: ??? 

end

src/main/java/org/etsi/osl/metrico/JsonUtil.java

0 → 100644
+15 −0
Original line number Diff line number Diff line 
package org.etsi.osl.metrico;



import com.fasterxml.jackson.annotation.JsonInclude;

import com.fasterxml.jackson.databind.ObjectMapper;



import java.io.IOException;



public class JsonUtil {



    public static <T> T toJsonObj(String content, Class<T> valueType)  throws IOException {

        ObjectMapper mapper = new ObjectMapper();

        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);

        return mapper.readValue( content, valueType);

    }

}
 
 No newline at end of file