Commit b51dc46b authored by Christos Tranoris's avatar Christos Tranoris
Browse files

fix for #13

parent 9ec252d5

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

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

          

        }

        @Valid

        ServiceStateType currentState = aService.getState();

        

	    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.getState().equals(ServiceStateType.ACTIVE)

src/main/java/org/etsi/osl/osom/serviceactions/CRTerminateTask.java

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ public class CRTerminateTask implements JavaDelegate { 
              map.put("clusterMasterURL",getServiceCharacteristic(aService, "clusterMasterURL")    );

              map.put("org.etsi.osl.serviceId", aService.getId() );

              map.put("org.etsi.osl.serviceOrderId", aService.getServiceOrder().stream().findFirst().get().getId() );

              map.put("org.etsi.osl.prefixName",getServiceCharacteristic(aService, "org.etsi.osl.prefixName")    );

              map.put("org.etsi.osl.namespace", aService.getServiceOrder().stream().findFirst().get().getId() );

              map.put("org.etsi.osl.statusCheckFieldName",  getServiceCharacteristic(aService, "_CR_CHECK_FIELD")    );

              map.put("org.etsi.osl.statusCheckValueStandby", getServiceCharacteristic(aService, "_CR_CHECKVAL_STANDBY")  );