Skip to content
Snippets Groups Projects
Commit 449de707 authored by tranoris's avatar tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents cea1150b 108bc918
No related branches found
No related tags found
2 merge requests!12Merging 2024Q2_RC into main, creating 2024Q2 Release,!10Parent child characteristics
Pipeline #4122 failed
...@@ -94,16 +94,20 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate { ...@@ -94,16 +94,20 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate {
rlist.add(res); rlist.add(res);
} }
@Valid
ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist); ServiceStateType currentState = aService.getState();
supd.setState( nextState );
Note n = new Note();
n.setText("Service Status Changed to: " + nextState);
n.setAuthor(compname);
n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());
supd.addNoteItem(n);
aService = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO ); ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);
if (!currentState.equals(nextState)) {
supd.setState( nextState );
Note n = new Note();
n.setText("Service Status Changed to: " + nextState);
n.setAuthor(compname);
n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());
supd.addNoteItem(n);
aService = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO );
}
if ( aService!= null ) { if ( aService!= null ) {
if ( aService.getState().equals(ServiceStateType.ACTIVE) if ( aService.getState().equals(ServiceStateType.ACTIVE)
......
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