From aa55fdd712311ef7cb3b09272aebd842e0d43229 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Wed, 18 Dec 2024 09:24:08 +0200 Subject: [PATCH 1/2] fix for #30 --- .../osom/management/CROrchestrationCheckDeploymentService.java | 3 ++- .../osom/management/GCOrchestrationCheckDeploymentService.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java index 8d036fe..b69a389 100644 --- a/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java +++ b/src/main/java/org/etsi/osl/osom/management/CROrchestrationCheckDeploymentService.java @@ -91,13 +91,14 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate { Service serviceResult = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO ); return; } + rlist.add(res); } @Valid ServiceStateType currentState = aService.getState(); - ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist); + ServiceStateType nextState = aService.findNextStateBasedOnResourceList(rlist); if (!currentState.equals(nextState)) { supd.setState( nextState ); diff --git a/src/main/java/org/etsi/osl/osom/management/GCOrchestrationCheckDeploymentService.java b/src/main/java/org/etsi/osl/osom/management/GCOrchestrationCheckDeploymentService.java index 7f8d9a4..8f1e4d0 100644 --- a/src/main/java/org/etsi/osl/osom/management/GCOrchestrationCheckDeploymentService.java +++ b/src/main/java/org/etsi/osl/osom/management/GCOrchestrationCheckDeploymentService.java @@ -96,7 +96,7 @@ public class GCOrchestrationCheckDeploymentService implements JavaDelegate { @Valid ServiceStateType currentState = aService.getState(); - ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist); + ServiceStateType nextState = aService.findNextStateBasedOnResourceList(rlist); if (!currentState.equals(nextState)) { supd.setState( nextState ); -- GitLab From d1dba903cfafba6cbdb8576ca5c9cba198738d46 Mon Sep 17 00:00:00 2001 From: Christos Tranoris Date: Fri, 20 Dec 2024 11:50:27 +0200 Subject: [PATCH 2/2] fix for #30 --- .../etsi/osl/osom/management/ProcessOrderItemActionCheck.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java index 0b49e90..1addb48 100644 --- a/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java +++ b/src/main/java/org/etsi/osl/osom/management/ProcessOrderItemActionCheck.java @@ -34,6 +34,7 @@ public class ProcessOrderItemActionCheck implements JavaDelegate { ServiceOrder sor = serviceOrderManager.retrieveServiceOrder((String) execution.getVariable("orderid")); String orderItemIdToProcess = (String) execution.getVariable("orderItemId"); ServiceOrderItem soi = null; + execution.setVariable("saction", "NONE"); for (ServiceOrderItem i : sor.getOrderItem()) { if (i.getUuid().equals( orderItemIdToProcess )){ @@ -46,7 +47,6 @@ public class ProcessOrderItemActionCheck implements JavaDelegate { logger.error("In ProcessOrderItemActionCheck cannot find ServiceOrderItem orderItemIdToProcess=:" + orderItemIdToProcess); logger.error("In ProcessOrderItemActionCheck cannot find ServiceOrderItem sor.getUuid()=:" + sor.getUuid() ); logger.error("In ProcessOrderItemActionCheck cannot find ServiceOrderItem sor()=:" + sor.toString() ); - execution.setVariable("saction", "NONE"); return; } -- GitLab