fix for supporting CR deletions requests. Related to (617b48dd) · Commits · OSL / code / org.etsi.osl.osom

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -70,7 +70,7 @@ public class FetchAcknowledgedOrders implements JavaDelegate {


		ServiceOrder sor = serviceOrderManager.retrieveServiceOrder( orderid );
		if ( sor.getStartDate() != null ) {
		if ( sor !=null && sor.getStartDate() != null ) {
		Instant instant = Instant.now() ; // Capture the current moment as seen in UTC.
		boolean canStart = sor.getStartDate().toInstant().isBefore( instant ) ;

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

+21 −20

Original line number	Diff line number	Diff line
		@@ -65,17 +65,13 @@ public class CRTerminateTask implements JavaDelegate {
		String crspec = aService.getServiceCharacteristicByName( "_CR_SPEC" ).getValue().getValue();

		if (crspec != null) {
		logger.info("Will terminate CR related to service. We need to fetchthe underlying resource" );
		logger.info("Will terminate CR related to service" );

		//we need to get the equivalent resource spec. since ServiceSpec is an RFS

		try {
		for (ResourceRef resRef : aService.getSupportingResource()) {
		Map<String, Object> map = new HashMap<>();
		map.put("currentContextCluster",getServiceCharacteristic(aService, "currentContextCluster") );
		map.put("clusterMasterURL",getServiceCharacteristic(aService, "clusterMasterURL") );
		map.put("org.etsi.osl.serviceId", aService.getId() );
		map.put("org.etsi.osl.resourceId", resRef.getId() );
		map.put("org.etsi.osl.serviceOrderId", aService.getServiceOrder().stream().findFirst().get().getId() );
		map.put("org.etsi.osl.namespace", aService.getServiceOrder().stream().findFirst().get().getId() );
		map.put("org.etsi.osl.statusCheckFieldName", getServiceCharacteristic(aService, "_CR_CHECK_FIELD") );
		@@ -85,10 +81,15 @@ public class CRTerminateTask implements JavaDelegate {
		map.put("org.etsi.osl.statusCheckValueReserved", getServiceCharacteristic(aService, "_CR_CHECKVAL_RESERVED") );
		map.put("org.etsi.osl.statusCheckValueUnknown", getServiceCharacteristic(aService, "_CR_CHECKVAL_UNKNOWN") );
		map.put("org.etsi.osl.statusCheckValueSuspended", getServiceCharacteristic(aService, "_CR_CHECKVAL_SUSPENDED") );
		for (ResourceRef resRef : aService.getSupportingResource()) {
		if (resRef.getName().contains("+_cr_temp")) {
		map.put("org.etsi.osl.resourceId", resRef.getId() );
		}
		}

		try {
		serviceOrderManager.cridgeDeletionRequest( map, crspec);

		}
		} catch (Exception e) {
		// TODO Auto-generated catch block
		e.printStackTrace();