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

Closes #6

parent 078b51a4
No related branches found
No related tags found
1 merge request!12Merging 2024Q2_RC into main, creating 2024Q2 Release
......@@ -115,6 +115,11 @@ public class CROrchestrationService implements JavaDelegate {
sorder.getExpectedCompletionDate(), crspec);
}
Characteristic servicecrspecLast = aService.getServiceCharacteristicByName("_CR_SPEC_LASTSEND");
servicecrspecLast.getValue().setValue( crspec );
su.addServiceCharacteristicItem(servicecrspecLast);
if ( response!=null && response.equals("OK")) {
su.setState(ServiceStateType.RESERVED);
Note successNoteItem = new Note();
......
......@@ -91,20 +91,44 @@ public class CRPatchTask implements JavaDelegate {
String response = null;
Characteristic servicecrspec = aService.getServiceCharacteristicByName("_CR_SPEC");
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);
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();
n.setAuthor(compname);
n.setDate(OffsetDateTime.now(ZoneOffset.UTC).toString());
if ( response!=null && response.equals("OK")) {
n.setText("Service Action CRPatchTask successful . Action: " + item.getAction() + ". ");
} else {
n.setText("Service Action CRPatchTask failed . Action: " + item.getAction() + ". Response = " + response);
}
supd.addNoteItem(n);
servicecrspecLast.getValue().setValue( crspec );
supd.addServiceCharacteristicItem(servicecrspecLast);
serviceOrderManager.deleteServiceActionQueueItem(item);
serviceOrderManager.updateService(aService.getId(), supd, false);
......
......@@ -83,7 +83,17 @@ public class CRTerminateTask implements JavaDelegate {
}
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) {
// TODO Auto-generated catch block
......
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