Commit 18be70e3 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch '35-metrico-will-use-service-order-s-start-and-end-time' into 'develop' 

Resolve "METRICO will use Service Order's START and END time"

See merge request !27
parents 95fccb50 d1c492ef

src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java

+8 −17
Original line number Diff line number Diff line
@@ -81,25 +81,16 @@ public class MetricoOrchestrationService implements JavaDelegate { 
			String cfs_id = String.valueOf(serviceCharacteristic.getValue().getValue());

			mcjFVO.setConsumingApplicationId(cfs_id);



			serviceCharacteristic = aService.getServiceCharacteristicByName("_MT_END_TIME");

			String endTimeString = 	String.valueOf(serviceCharacteristic.getValue().getValue());

			ScheduleDefinitionFVO scheduleDefinition = new ScheduleDefinitionFVO();

			if (endTimeString != null && !endTimeString.equals("")) {

				OffsetDateTime endTime = convertStringToOffsetDateTime(endTimeString, DateTimeFormat.ISO.DATE_TIME );

				scheduleDefinition.setScheduleDefinitionEndTime(endTime);

			if(aService.getStartDate() != null) {

				scheduleDefinition.setScheduleDefinitionStartTime(aService.getStartDate());

			} else {

				OffsetDateTime endTime = OffsetDateTime.now().plusHours(1);

				scheduleDefinition.setScheduleDefinitionEndTime(endTime);

				scheduleDefinition.setScheduleDefinitionStartTime(OffsetDateTime.now(ZoneOffset.UTC));

			}



			serviceCharacteristic = aService.getServiceCharacteristicByName("_MT_START_TIME");

			String startTimeString = String.valueOf(serviceCharacteristic.getValue().getValue());

			if (startTimeString != null&& !startTimeString.equals("")) {

				OffsetDateTime startTime = convertStringToOffsetDateTime(startTimeString, DateTimeFormat.ISO.DATE_TIME );

				scheduleDefinition.setScheduleDefinitionStartTime(startTime);

			if(aService.getEndDate() != null) {

				scheduleDefinition.setScheduleDefinitionEndTime(aService.getEndDate());

			} else {

				OffsetDateTime startTime = OffsetDateTime.now();

				scheduleDefinition.setScheduleDefinitionStartTime(startTime);

				scheduleDefinition.setScheduleDefinitionEndTime(OffsetDateTime.now(ZoneOffset.UTC).plusHours(1));

			}

			List<ScheduleDefinitionFVO> scheduleDefinitions = new ArrayList<>();

			scheduleDefinitions.add(scheduleDefinition);