From 8141a58521f4977a390a526beb264a7778f6158d Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Thu, 19 Jun 2025 17:17:15 +0300 Subject: [PATCH 1/2] using service time window as metrico's time window --- .../MetricoOrchestrationService.java | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java index 5d938d7..156dfc2 100644 --- a/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java +++ b/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java @@ -81,26 +81,10 @@ 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); - } else{ - OffsetDateTime endTime = OffsetDateTime.now().plusHours(1); - scheduleDefinition.setScheduleDefinitionEndTime(endTime); - } + scheduleDefinition.setScheduleDefinitionEndTime(aService.getEndDate()); + scheduleDefinition.setScheduleDefinitionStartTime(aService.getStartDate()); - 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); - } else{ - OffsetDateTime startTime = OffsetDateTime.now(); - scheduleDefinition.setScheduleDefinitionStartTime(startTime); - } List scheduleDefinitions = new ArrayList<>(); scheduleDefinitions.add(scheduleDefinition); mcjFVO.setScheduleDefinition(scheduleDefinitions); -- GitLab From f6e6cc0432f8faf9f9e457bd9ed339a1bef9b62d Mon Sep 17 00:00:00 2001 From: George Tziavas Date: Mon, 23 Jun 2025 15:27:35 +0300 Subject: [PATCH 2/2] service start/end time null check --- .../management/MetricoOrchestrationService.java | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java b/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java index 156dfc2..faf1c9f 100644 --- a/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java +++ b/src/main/java/org/etsi/osl/osom/management/MetricoOrchestrationService.java @@ -82,9 +82,16 @@ public class MetricoOrchestrationService implements JavaDelegate { mcjFVO.setConsumingApplicationId(cfs_id); ScheduleDefinitionFVO scheduleDefinition = new ScheduleDefinitionFVO(); - scheduleDefinition.setScheduleDefinitionEndTime(aService.getEndDate()); - scheduleDefinition.setScheduleDefinitionStartTime(aService.getStartDate()); - + if(aService.getStartDate() != null) { + scheduleDefinition.setScheduleDefinitionStartTime(aService.getStartDate()); + } else { + scheduleDefinition.setScheduleDefinitionStartTime(OffsetDateTime.now(ZoneOffset.UTC)); + } + if(aService.getEndDate() != null) { + scheduleDefinition.setScheduleDefinitionEndTime(aService.getEndDate()); + } else { + scheduleDefinition.setScheduleDefinitionEndTime(OffsetDateTime.now(ZoneOffset.UTC).plusHours(1)); + } List scheduleDefinitions = new ArrayList<>(); scheduleDefinitions.add(scheduleDefinition); mcjFVO.setScheduleDefinition(scheduleDefinitions); -- GitLab