Closes #6 (60789663) · Commits · OSL / code / org.etsi.osl.osom

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

+5 −0

Original line number	Original line	Diff line number	Diff line
	@@ -115,6 +115,11 @@ public class CROrchestrationService implements JavaDelegate {
	sorder.getExpectedCompletionDate(), crspec);		sorder.getExpectedCompletionDate(), crspec);
	}		}


			Characteristic servicecrspecLast = aService.getServiceCharacteristicByName("_CR_SPEC_LASTSEND");
			servicecrspecLast.getValue().setValue( crspec );
			su.addServiceCharacteristicItem(servicecrspecLast);

	if ( response!=null && response.equals("OK")) {		if ( response!=null && response.equals("OK")) {
	su.setState(ServiceStateType.RESERVED);		su.setState(ServiceStateType.RESERVED);
	Note successNoteItem = new Note();		Note successNoteItem = new Note();

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

+25 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,19 +92,43 @@ public class CRPatchTask implements JavaDelegate {
	Characteristic servicecrspec = aService.getServiceCharacteristicByName("_CR_SPEC");		Characteristic servicecrspec = aService.getServiceCharacteristicByName("_CR_SPEC");
	String crspec = servicecrspec.getValue().getValue();		String crspec = servicecrspec.getValue().getValue();


			Characteristic servicecrspecLast = aService.getServiceCharacteristicByName("_CR_SPEC_LASTSEND");
			String crspecLast = servicecrspecLast.getValue().getValue();

			if (crspec.equals(crspecLast)) {
			logger.debug("CRPatchTask: ignore this patch request. Seems they are the same as the last one send");
			serviceOrderManager.deleteServiceActionQueueItem(item);
			return;
			}

			int retries = 0;
	response = createNewDeploymentUpdateRequest(aService, crspec);		response = createNewDeploymentUpdateRequest(aService, crspec);
			while ( response.equals("SEE OTHER")) {
			response = createNewDeploymentUpdateRequest(aService, crspec);
			Thread.sleep(1000);
			retries++;
			if (retries>100) { //will support maximum 100 registered CRIDGE in queue
			break;
			}
			}


	Note n = new Note();		Note n = new Note();
	n.setAuthor(compname);		n.setAuthor(compname);
	n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());		n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());

	if ( response!=null && response.equals("OK")) {		if ( response!=null && response.equals("OK")) {

	n.setText("Service Action CRPatchTask successful . Action: " + item.getAction() + ". ");		n.setText("Service Action CRPatchTask successful . Action: " + item.getAction() + ". ");
	} else {		} else {
	n.setText("Service Action CRPatchTask failed . Action: " + item.getAction() + ". Response = " + response);		n.setText("Service Action CRPatchTask failed . Action: " + item.getAction() + ". Response = " + response);
	}		}

	supd.addNoteItem(n);		supd.addNoteItem(n);

			servicecrspecLast.getValue().setValue( crspec );
			supd.addServiceCharacteristicItem(servicecrspecLast);

	serviceOrderManager.deleteServiceActionQueueItem(item);		serviceOrderManager.deleteServiceActionQueueItem(item);
	serviceOrderManager.updateService(aService.getId(), supd, false);		serviceOrderManager.updateService(aService.getId(), supd, false);

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

+11 −1

Original line number	Original line	Diff line number	Diff line
	@@ -83,7 +83,17 @@ public class CRTerminateTask implements JavaDelegate {
	}		}

	try {		try {
	serviceOrderManager.cridgeDeletionRequest( map, crspec);		String response = serviceOrderManager.cridgeDeletionRequest( map, crspec);

			int retries = 0;
			while ( response.equals("SEE OTHER")) {
			response = serviceOrderManager.cridgeDeletionRequest( map, crspec);
			Thread.sleep(1000);
			retries++;
			if (retries>100) { //will support maximum 100 registered CRIDGE in queue
			break;
			}
			}

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