Commit 449de707 authored by Christos Tranoris's avatar Christos Tranoris
Browse files

Merge branch 'develop' into parent-child-characteristics

parents cea1150b 108bc918

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

+13 −9
Original line number Original line Diff line number Diff line
@@ -94,16 +94,20 @@ public class CROrchestrationCheckDeploymentService implements JavaDelegate { 
          rlist.add(res);

          rlist.add(res);

          

          

        }

        }

        @Valid

        ServiceStateType currentState = aService.getState();

        

        

	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);

	    ServiceStateType nextState = aService.findNextStateBasedOnSupportingResources(rlist);

	    

	    if (!currentState.equals(nextState)) {

	        supd.setState( nextState );     

	        supd.setState( nextState );     

	        Note n = new Note();

	        Note n = new Note();

	        n.setText("Service Status Changed to: " +  nextState);

	        n.setText("Service Status Changed to: " +  nextState);

	        n.setAuthor(compname);

	        n.setAuthor(compname);

	        n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

	        n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

	        supd.addNoteItem(n);	        

	        supd.addNoteItem(n);	        

        

	        aService = serviceOrderManager.updateService( aService.getId(), supd, propagateToSO );	      

	        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)