Commit 0b5a649a authored by George Tziavas's avatar George Tziavas Committed by Kostis Trantzas
Browse files

Resolve "METRICO Day2 support"

parent 73716e49

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

+6 −1
Original line number Diff line number Diff line
@@ -351,7 +351,7 @@ public class MetricoCommonMethods extends RouteBuilder { 
            map.put("mcjid", mcjId);



            Object response = template.requestBodyAndHeaders(PM_MEASUREMENT_COLLECTION_JOB_UPDATE, JsonUtil.toJsonString(mcjMVO), map);

            logger.info("JsonUtil.toJsonString(mcjMVO): \n{}", JsonUtil.toJsonString(mcjMVO));

            logger.debug("JsonUtil.toJsonString(mcjMVO): \n{}", JsonUtil.toJsonString(mcjMVO));

            if (!(response instanceof String)) {

                logger.error("MeasurementCollectionJob object is wrong.");

                return null;
@@ -383,4 +383,9 @@ public class MetricoCommonMethods extends RouteBuilder { 
        }

        return null;

    }



    public boolean notNullOrEmpty(String str) {

        return str != null && !str.isEmpty();

    }



}

src/main/java/org/etsi/osl/metrico/mapper/DataAccessEndpointMapper.java

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ package org.etsi.osl.metrico.mapper; 
import org.etsi.osl.tmf.pm628.model.DataAccessEndpoint;

import org.etsi.osl.tmf.pm628.model.DataAccessEndpointFVO;

import org.etsi.osl.tmf.pm628.model.DataAccessEndpointMVO;



import org.mapstruct.*;



@Mapper(

src/main/java/org/etsi/osl/metrico/mapper/MeasurementCollectionJobMapper.java

+1 −17
Original line number Diff line number Diff line 
package org.etsi.osl.metrico.mapper;



import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJob;

import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobFVO;

import org.etsi.osl.tmf.pm628.model.MeasurementCollectionJobMVO;

import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationRefOrValueMapper;

import org.etsi.osl.tmf.pm628.model.DataAccessEndpoint;

import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecification;

import org.etsi.osl.tmf.pm628.model.DataAccessEndpointMVO;

import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorGroupSpecificationMVO;

import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationRefOrValueMVO;

import org.etsi.osl.tmf.pm628.model.TrackingRecordMVO;

import org.etsi.osl.tmf.pm628.model.PerformanceIndicatorSpecificationRefOrValue;

import org.etsi.osl.tmf.pm628.model.TrackingRecord;

import org.etsi.osl.tmf.pm628.model.ScheduleDefinitionMVO;

import org.etsi.osl.tmf.pm628.model.FileTransferDataMVO;

import org.etsi.osl.tmf.pm628.model.FileTransferData;

import org.etsi.osl.tmf.pm628.model.ScheduleDefinition;



import org.etsi.osl.tmf.pm628.model.*;

import org.mapstruct.*;



import java.util.List;

src/main/java/org/etsi/osl/metrico/mapper/ResourceRefOrValueMapper.java

+1 −16
Original line number Diff line number Diff line 
package org.etsi.osl.metrico.mapper;



import org.etsi.osl.tmf.pm628.model.DataAccessEndpoint;

import org.etsi.osl.tmf.pm628.model.DataAccessEndpointFVO;

import org.etsi.osl.tmf.pm628.model.LogicalResource;

import org.etsi.osl.tmf.pm628.model.LogicalResourceFVO;

import org.etsi.osl.tmf.pm628.model.ResourceFVO;

import org.etsi.osl.tmf.pm628.model.Resource;

import org.etsi.osl.tmf.pm628.model.ResourceRefFVO;

import org.etsi.osl.tmf.pm628.model.ResourceRefOrValue;

import org.etsi.osl.tmf.pm628.model.ResourceRef;

import org.etsi.osl.tmf.pm628.model.DataAccessEndpointMVO;

import org.etsi.osl.tmf.pm628.model.LogicalResourceMVO;

import org.etsi.osl.tmf.pm628.model.ResourceMVO;

import org.etsi.osl.tmf.pm628.model.ResourceRefMVO;

import org.etsi.osl.tmf.pm628.model.ResourceRefOrValueFVO;

import org.etsi.osl.tmf.pm628.model.ResourceRefOrValueMVO;



import org.etsi.osl.tmf.pm628.model.*;

import org.mapstruct.*;



@Mapper(

src/main/java/org/etsi/osl/metrico/prometheus/PrometheusQueries.java

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ import reactor.core.publisher.Mono; 


import java.time.Duration;

import java.time.OffsetDateTime;

import java.time.ZoneOffset;

import java.util.concurrent.TimeUnit;



@Component