- Currently, when a temp-service is created, all
the interfaces are pushed to the NE.
- If roadm-connections (crossconnets) are created without
the ingress power-power, it would create alarms.
- For temp-service create, we keep the optical-control-mode
in "off" state
Signed-off-by: Balagangadhar (Bala) Bathula <bb4341@att.com>
Change-Id: I9ccf6a9da74ff040a988ed86d3089e5b5a38060c
public interface RendererServiceOperations {
public interface RendererServiceOperations {
- ListenableFuture<ServiceImplementationRequestOutput> serviceImplementation(ServiceImplementationRequestInput input);
+ ListenableFuture<ServiceImplementationRequestOutput> serviceImplementation(ServiceImplementationRequestInput input,
+ boolean isTempService);
ListenableFuture<ServiceDeleteOutput> serviceDelete(ServiceDeleteInput input, Services service);
}
ListenableFuture<ServiceDeleteOutput> serviceDelete(ServiceDeleteInput input, Services service);
}
@Override
public ListenableFuture<ServiceImplementationRequestOutput>
@Override
public ListenableFuture<ServiceImplementationRequestOutput>
- serviceImplementation(ServiceImplementationRequestInput input) {
+ serviceImplementation(ServiceImplementationRequestInput input, boolean isTempService) {
LOG.info("Calling service impl request {}", input.getServiceName());
LOG.info("Calling service impl request {}", input.getServiceName());
+ LOG.debug("Check if it is temp-service {}", isTempService);
return executor.submit(new Callable<ServiceImplementationRequestOutput>() {
@Override
return executor.submit(new Callable<ServiceImplementationRequestOutput>() {
@Override
case StringConstants.SERVICE_TYPE_OTUC2:
case StringConstants.SERVICE_TYPE_OTUC3:
case StringConstants.SERVICE_TYPE_OTUC4:
case StringConstants.SERVICE_TYPE_OTUC2:
case StringConstants.SERVICE_TYPE_OTUC3:
case StringConstants.SERVICE_TYPE_OTUC4:
- if (!manageServicePathCreation(input, serviceType)) {
+ LOG.debug("Check temp service {}", isTempService);
+ if (!manageServicePathCreation(input, serviceType, isTempService)) {
return ModelMappingUtils
.createServiceImplResponse(ResponseCodes.RESPONSE_FAILED, OPERATION_FAILED);
}
return ModelMappingUtils
.createServiceImplResponse(ResponseCodes.RESPONSE_FAILED, OPERATION_FAILED);
}
private void olmPowerSetup(
RollbackProcessor rollbackProcessor,
ServicePowerSetupInput powerSetupInputAtoZ,
private void olmPowerSetup(
RollbackProcessor rollbackProcessor,
ServicePowerSetupInput powerSetupInputAtoZ,
- ServicePowerSetupInput powerSetupInputZtoA) {
+ ServicePowerSetupInput powerSetupInputZtoA, boolean isTempService) {
//TODO olmPowerSetupFutureAtoZ & olmPowerSetupFutureZtoA & olmFutures used only once
// Do notifications & LOG.info deserve this ?
//TODO use constants for LOG.info & notifications common messages
//TODO olmPowerSetupFutureAtoZ & olmPowerSetupFutureZtoA & olmFutures used only once
// Do notifications & LOG.info deserve this ?
//TODO use constants for LOG.info & notifications common messages
+ // if the service create is a temp-service, OLM will be skipped
+ if (isTempService) {
+ LOG.info("For temp-service create OLM is not computed and skipped");
+ return;
+ }
LOG.info("Olm power setup A-Z");
sendNotifications(
LOG.info("Olm power setup A-Z");
sendNotifications(
- ServicePathNotificationTypes.ServiceImplementationRequest,
- powerSetupInputAtoZ.getServiceName(),
- RpcStatusEx.Pending,
- "Olm power setup A-Z");
+ ServicePathNotificationTypes.ServiceImplementationRequest,
+ powerSetupInputAtoZ.getServiceName(),
+ RpcStatusEx.Pending,
+ "Olm power setup A-Z");
ListenableFuture<OLMRenderingResult> olmPowerSetupFutureAtoZ =
ListenableFuture<OLMRenderingResult> olmPowerSetupFutureAtoZ =
- this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputAtoZ));
+ this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputAtoZ));
LOG.info("OLM power setup Z-A");
sendNotifications(
LOG.info("OLM power setup Z-A");
sendNotifications(
- ServicePathNotificationTypes.ServiceImplementationRequest,
- powerSetupInputAtoZ.getServiceName(),
- RpcStatusEx.Pending,
- "Olm power setup Z-A");
+ ServicePathNotificationTypes.ServiceImplementationRequest,
+ powerSetupInputAtoZ.getServiceName(),
+ RpcStatusEx.Pending,
+ "Olm power setup Z-A");
ListenableFuture<OLMRenderingResult> olmPowerSetupFutureZtoA =
ListenableFuture<OLMRenderingResult> olmPowerSetupFutureZtoA =
- this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputZtoA));
-
+ this.executor.submit(new OlmPowerSetupTask(this.olmService, powerSetupInputZtoA));
ListenableFuture<List<OLMRenderingResult>> olmFutures =
ListenableFuture<List<OLMRenderingResult>> olmFutures =
- Futures.allAsList(olmPowerSetupFutureAtoZ, olmPowerSetupFutureZtoA);
+ Futures.allAsList(olmPowerSetupFutureAtoZ, olmPowerSetupFutureZtoA);
List<OLMRenderingResult> olmResults;
try {
List<OLMRenderingResult> olmResults;
try {
} catch (InterruptedException | ExecutionException | TimeoutException e) {
LOG.warn(OLM_ROLL_BACK_MSG, e);
sendNotifications(
} catch (InterruptedException | ExecutionException | TimeoutException e) {
LOG.warn(OLM_ROLL_BACK_MSG, e);
sendNotifications(
- ServicePathNotificationTypes.ServiceImplementationRequest,
- powerSetupInputAtoZ.getServiceName(),
- RpcStatusEx.Pending,
- OLM_ROLL_BACK_MSG);
+ ServicePathNotificationTypes.ServiceImplementationRequest,
+ powerSetupInputAtoZ.getServiceName(),
+ RpcStatusEx.Pending,
+ OLM_ROLL_BACK_MSG);
rollbackProcessor.addTask(
rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask("AtoZOLMTask", true, this.olmService, powerSetupInputAtoZ));
+ new OlmPowerSetupRollbackTask("AtoZOLMTask", true, this.olmService, powerSetupInputAtoZ));
rollbackProcessor.addTask(
rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask("ZtoAOLMTask", true, this.olmService, powerSetupInputZtoA));
+ new OlmPowerSetupRollbackTask("ZtoAOLMTask", true, this.olmService, powerSetupInputZtoA));
rollbackProcessor.addTask(
rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask(
- "AtoZOLMTask",
- ! olmResults.get(0).isSuccess(),
- this.olmService,
- powerSetupInputAtoZ));
+ new OlmPowerSetupRollbackTask(
+ "AtoZOLMTask",
+ !olmResults.get(0).isSuccess(),
+ this.olmService,
+ powerSetupInputAtoZ));
rollbackProcessor.addTask(
rollbackProcessor.addTask(
- new OlmPowerSetupRollbackTask(
- "ZtoAOLMTask",
- ! olmResults.get(1).isSuccess(),
- this.olmService,
- powerSetupInputZtoA));
+ new OlmPowerSetupRollbackTask(
+ "ZtoAOLMTask",
+ !olmResults.get(1).isSuccess(),
+ this.olmService,
+ powerSetupInputZtoA));
}
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
}
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
value = "UPM_UNCALLED_PRIVATE_METHOD",
justification = "call in call() method")
@edu.umd.cs.findbugs.annotations.SuppressFBWarnings(
value = "UPM_UNCALLED_PRIVATE_METHOD",
justification = "call in call() method")
- private boolean manageServicePathCreation(ServiceImplementationRequestInput input, String serviceType) {
+ private boolean manageServicePathCreation(ServiceImplementationRequestInput input, String serviceType,
+ boolean isTempService) {
ServicePathInputData servicePathInputDataAtoZ =
ModelMappingUtils
.rendererCreateServiceInputAToZ(input.getServiceName(), input.getPathDescription(), Action.Create);
ServicePathInputData servicePathInputDataAtoZ =
ModelMappingUtils
.rendererCreateServiceInputAToZ(input.getServiceName(), input.getPathDescription(), Action.Create);
//olmPowerSetupInputAtoZ,
ModelMappingUtils.createServicePowerSetupInput(renderingResults.get(0).getOlmList(), input),
//olmPowerSetupInputZtoA
//olmPowerSetupInputAtoZ,
ModelMappingUtils.createServicePowerSetupInput(renderingResults.get(0).getOlmList(), input),
//olmPowerSetupInputZtoA
- ModelMappingUtils.createServicePowerSetupInput(renderingResults.get(1).getOlmList(), input));
+ ModelMappingUtils.createServicePowerSetupInput(renderingResults.get(1).getOlmList(), input), isTempService);
if (rollbackProcessor.rollbackAllIfNecessary() > 0) {
sendNotifications(
ServicePathNotificationTypes.ServiceImplementationRequest,
if (rollbackProcessor.rollbackAllIfNecessary() > 0) {
sendNotifications(
ServicePathNotificationTypes.ServiceImplementationRequest,
LOG.info("Calling RPC service impl request {}", serviceName);
ServiceImplementationRequestOutput output = null;
try {
LOG.info("Calling RPC service impl request {}", serviceName);
ServiceImplementationRequestOutput output = null;
try {
- output = this.rendererServiceOperations.serviceImplementation(input).get();
+ output = this.rendererServiceOperations.serviceImplementation(input, false).get();
} catch (InterruptedException | ExecutionException e) {
LOG.error("RPC service implementation failed !", e);
}
} catch (InterruptedException | ExecutionException e) {
LOG.error("RPC service implementation failed !", e);
}
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result =
+ this.rendererServiceOperations.serviceImplementation(input, false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
doReturn(RpcResultBuilder.failed().buildFuture()).when(this.olmService).servicePowerSetup(any());
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
doReturn(RpcResultBuilder.failed().buildFuture()).when(this.olmService).servicePowerSetup(any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result =
+ this.rendererServiceOperations.serviceImplementation(input, false).get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
for (String tpToken : interfaceTokens) {
ServiceImplementationRequestInput input = ServiceDataUtils
.buildServiceImplementationRequestInputTerminationPointResource(tpToken);
for (String tpToken : interfaceTokens) {
ServiceImplementationRequestInput input = ServiceDataUtils
.buildServiceImplementationRequestInputTerminationPointResource(tpToken);
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input)
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false)
.get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
.get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
.buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
// writePortMapping(input, StringConstants.NETWORK_TOKEN);
doReturn(RpcResultBuilder.failed().buildFuture()).when(this.olmService).servicePowerSetup(any());
.buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
// writePortMapping(input, StringConstants.NETWORK_TOKEN);
doReturn(RpcResultBuilder.failed().buildFuture()).when(this.olmService).servicePowerSetup(any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
.setMeasurements(measurementsList)
.build();
doReturn(RpcResultBuilder.success(getPmOutput).buildFuture()).when(this.olmService).getPm(any());
.setMeasurements(measurementsList)
.build();
doReturn(RpcResultBuilder.success(getPmOutput).buildFuture()).when(this.olmService).getPm(any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
.build();
when(this.olmService.getPm(any())).thenReturn(RpcResultBuilder.success(getPmOutput).buildFuture());
.build();
when(this.olmService.getPm(any())).thenReturn(RpcResultBuilder.success(getPmOutput).buildFuture());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServiceImplementationRequestInput input = ServiceDataUtils
.buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServiceImplementationRequestInput input = ServiceDataUtils
.buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServicePathOutputBuilder mockOutputBuilder = new ServicePathOutputBuilder().setResult("success")
.setSuccess(true);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServiceImplementationRequestInput input = ServiceDataUtils
.buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
doReturn(mockOutputBuilder.build()).when(this.deviceRenderer).setupServicePath(any(), any());
ServiceImplementationRequestInput input = ServiceDataUtils
.buildServiceImplementationRequestInputTerminationPointResource(StringConstants.NETWORK_TOKEN);
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_OK, result.getConfigurationResponseCommon().getResponseCode());
}
.build();
doReturn(RpcResultBuilder.success(getPmOutput).buildFuture()).when(this.olmService).getPm(any());
.build();
doReturn(RpcResultBuilder.success(getPmOutput).buildFuture()).when(this.olmService).getPm(any());
- ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input).get();
+ ServiceImplementationRequestOutput result = this.rendererServiceOperations.serviceImplementation(input,
+ false).get();
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
assertEquals(ResponseCodes.RESPONSE_FAILED, result.getConfigurationResponseCommon().getResponseCode());
}
}
this.pceListenerImpl.setInput(new ServiceInput(input));
this.pceListenerImpl.setServiceReconfigure(false);
}
this.pceListenerImpl.setInput(new ServiceInput(input));
this.pceListenerImpl.setServiceReconfigure(false);
+ this.pceListenerImpl.setTempService(false);
this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations);
this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations);
this.rendererListenerImpl.setServiceInput(new ServiceInput(input));
this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations);
this.rendererListenerImpl.setserviceDataStoreOperations(serviceDataStoreOperations);
this.rendererListenerImpl.setServiceInput(new ServiceInput(input));
ServiceImplementationRequestInput serviceImplementationRequest =
ModelMappingUtils.createServiceImplementationRequest(input, pathDescription);
LOG.info("Sending serviceImplementation request : {}", serviceImplementationRequest);
ServiceImplementationRequestInput serviceImplementationRequest =
ModelMappingUtils.createServiceImplementationRequest(input, pathDescription);
LOG.info("Sending serviceImplementation request : {}", serviceImplementationRequest);
- this.rendererServiceOperations.serviceImplementation(serviceImplementationRequest);
+ LOG.debug("Temp-service value is {}", tempService);
+ this.rendererServiceOperations.serviceImplementation(serviceImplementationRequest, tempService);