summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
ab2ed53)
When creating a new service with service-create RPC, ServiceHandlerImpl
will now check that there are no existing services with the same name
in the datastore.
JIRA: TRNSPRTPCE-675
Signed-off-by: Thierry Jiao <thierry.jiao@orange.com>
Change-Id: I6ba726bc40c391077f3766f782205b2ec2c541c4
ABORT_VALID_FAILED = "Aborting: validation of service create request failed";
}
ABORT_VALID_FAILED = "Aborting: validation of service create request failed";
}
+ public static String serviceInDS(String serviceName) {
+ return "Service '" + serviceName + "' already exists in datastore";
+ }
+
public static String serviceNotInDS(String serviceName) {
return "Service '" + serviceName + "' does not exist in datastore";
}
public static String serviceNotInDS(String serviceName) {
return "Service '" + serviceName + "' does not exist in datastore";
}
// Validation
OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest(
new ServiceInput(input), RpcActions.ServiceCreate);
// Validation
OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest(
new ServiceInput(input), RpcActions.ServiceCreate);
- if (! validationResult.isSuccess()) {
+ if (!validationResult.isSuccess()) {
LOG.warn(SERVICE_CREATE_MSG, LogMessages.ABORT_VALID_FAILED);
return ModelMappingUtils.createCreateServiceReply(
input, ResponseCodes.FINAL_ACK_YES,
validationResult.getResultMessage(), ResponseCodes.RESPONSE_FAILED);
}
LOG.warn(SERVICE_CREATE_MSG, LogMessages.ABORT_VALID_FAILED);
return ModelMappingUtils.createCreateServiceReply(
input, ResponseCodes.FINAL_ACK_YES,
validationResult.getResultMessage(), ResponseCodes.RESPONSE_FAILED);
}
+ //Check any presence of services with the same name
+ String serviceName = input.getServiceName();
+ if (this.serviceDataStoreOperations.getService(serviceName).isPresent()) {
+ LOG.warn(SERVICE_CREATE_MSG, LogMessages.serviceInDS(serviceName));
+ return ModelMappingUtils.createCreateServiceReply(input, ResponseCodes.FINAL_ACK_YES,
+ LogMessages.serviceInDS(serviceName), ResponseCodes.RESPONSE_FAILED);
+ }
this.pceListenerImpl.setInput(new ServiceInput(input));
this.pceListenerImpl.setServiceReconfigure(false);
this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations);
this.pceListenerImpl.setInput(new ServiceInput(input));
this.pceListenerImpl.setServiceReconfigure(false);
this.pceListenerImpl.setserviceDataStoreOperations(this.serviceDataStoreOperations);
if (output == null) {
LOG.warn(SERVICE_CREATE_MSG, LogMessages.ABORT_PCE_FAILED);
sendNbiNotification(new PublishNotificationProcessServiceBuilder()
if (output == null) {
LOG.warn(SERVICE_CREATE_MSG, LogMessages.ABORT_PCE_FAILED);
sendNbiNotification(new PublishNotificationProcessServiceBuilder()
- .setServiceName(input.getServiceName())
+ .setServiceName(serviceName)
.setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build())
.setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build())
.setCommonId(input.getCommonId())
.setServiceAEnd(new ServiceAEndBuilder(input.getServiceAEnd()).build())
.setServiceZEnd(new ServiceZEndBuilder(input.getServiceZEnd()).build())
.setCommonId(input.getCommonId())