Skip to content
Snippets Groups Projects
Commit 991d7360 authored by trantzas's avatar trantzas
Browse files

Merge branch 'issue_30' into 'develop'

MR: Update osom for service state model change

See merge request !17
parents e043086f d1dba903
No related branches found
No related tags found
2 merge requests!22MR for Release 2024Q4,!17MR: Update osom for service state model change
Pipeline #10786 passed
......@@ -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 );
......
......@@ -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 );
......
......@@ -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;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment