From 4a59739aba3539ef5bb043369405fa1d23d4991b Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Mon, 18 Mar 2024 15:42:24 +0100 Subject: [PATCH] SH slight clean-up after Ca bump Signed-off-by: guillaume.lambert Change-Id: I7a3e1afd1532c3fdc9633533e3174d721b93958b --- .../impl/ServiceDeleteImpl.java | 3 +- .../impl/ServiceRerouteImpl.java | 30 ++++++++++--------- .../impl/ServiceRestorationImpl.java | 2 +- .../impl/TempServiceCreateImpl.java | 2 +- .../impl/ServicehandlerImplTest.java | 19 ------------ 5 files changed, 19 insertions(+), 37 deletions(-) diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java index 6bdd8a229..1bb9d53f9 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceDeleteImpl.java @@ -82,14 +82,12 @@ public class ServiceDeleteImpl implements ServiceDelete { } //Check presence of service to be deleted Optional serviceOpt = this.serviceDataStoreOperations.getService(serviceName); - Services service; if (serviceOpt.isEmpty()) { LOG.warn(SERVICE_DELETE_MSG, LogMessages.serviceNotInDS(serviceName)); return ModelMappingUtils.createDeleteServiceReply( input, ResponseCodes.FINAL_ACK_YES, LogMessages.serviceNotInDS(serviceName), ResponseCodes.RESPONSE_FAILED); } - service = serviceOpt.orElseThrow(); LOG.debug("serviceDelete: Service '{}' found in datastore", serviceName); this.pceListener.setInput(new ServiceInput(input)); this.pceListener.setServiceReconfigure(false); @@ -101,6 +99,7 @@ public class ServiceDeleteImpl implements ServiceDelete { this.networkListener.setserviceDataStoreOperations(serviceDataStoreOperations); org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteInput serviceDeleteInput = ModelMappingUtils.createServiceDeleteInput(new ServiceInput(input)); + Services service = serviceOpt.orElseThrow(); org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.renderer.rev210915.ServiceDeleteOutput output = this.rendererServiceWrapper.performRenderer( serviceDeleteInput, ServiceNotificationTypes.ServiceDeleteResult, service); diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRerouteImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRerouteImpl.java index f6e3612b4..cb6e1b1ed 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRerouteImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRerouteImpl.java @@ -56,7 +56,6 @@ public class ServiceRerouteImpl implements ServiceReroute { LogMessages.serviceNotInDS(serviceName), ResponseCodes.RESPONSE_FAILED); } - Services service = servicesObject.orElseThrow(); Optional servicePathsObject = this.serviceDataStoreOperations.getServicePath(serviceName); if (servicePathsObject.isEmpty()) { LOG.warn("serviceReroute: {}", LogMessages.servicePathNotInDS(serviceName)); @@ -65,8 +64,8 @@ public class ServiceRerouteImpl implements ServiceReroute { LogMessages.servicePathNotInDS(serviceName), ResponseCodes.RESPONSE_FAILED); } - ServicePaths servicePaths = servicePathsObject.orElseThrow(); // serviceInput for later use maybe... + Services service = servicesObject.orElseThrow(); ServiceInput serviceInput = new ServiceInput(input); serviceInput.setServiceAEnd(service.getServiceAEnd()); serviceInput.setServiceZEnd(service.getServiceZEnd()); @@ -76,23 +75,26 @@ public class ServiceRerouteImpl implements ServiceReroute { serviceInput.setSoftConstraints(service.getSoftConstraints()); serviceInput.setCustomer(service.getCustomer()); serviceInput.setCustomerContact(service.getCustomerContact()); - // Get the network xpdr termination points + ServicePaths servicePaths = servicePathsObject.orElseThrow(); Map mapaToz = servicePaths.getPathDescription().getAToZDirection().getAToZ(); - String aendtp = ((TerminationPoint) mapaToz.get(new AToZKey(String.valueOf(mapaToz.size() - 3))) - .getResource() - .getResource()) - .getTpId(); - String zendtp = ((TerminationPoint) mapaToz.get(new AToZKey("2")) - .getResource() - .getResource()) - .getTpId(); - PathComputationRerouteRequestOutput output = this.pceServiceWrapper.performPCEReroute( service.getHardConstraints(), service.getSoftConstraints(), input.getSdncRequestHeader(), service.getServiceAEnd(), service.getServiceZEnd(), - new EndpointsBuilder().setAEndTp(aendtp).setZEndTp(zendtp).build()); - + new EndpointsBuilder() + .setAEndTp( + ((TerminationPoint) mapaToz + .get(new AToZKey(String.valueOf(mapaToz.size() - 3))) + .getResource() + .getResource()) + .getTpId()) + .setZEndTp( + ((TerminationPoint) mapaToz + .get(new AToZKey("2")) + .getResource() + .getResource()) + .getTpId()) + .build()); if (output == null) { LOG.error("serviceReroute: {}", LogMessages.PCE_FAILED); return ModelMappingUtils.createRerouteServiceReply( diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRestorationImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRestorationImpl.java index 8f0195bc6..817515ab9 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRestorationImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/ServiceRestorationImpl.java @@ -67,7 +67,7 @@ public class ServiceRestorationImpl implements ServiceRestoration { LOG.info("RPC serviceRestoration received for {}", serviceName); Optional servicesObject = this.serviceDataStoreOperations.getService(serviceName); - if (!servicesObject.isPresent()) { + if (servicesObject.isEmpty()) { LOG.warn(SERVICE_RESTORATION_MSG, LogMessages.serviceNotInDS(serviceName)); return ModelMappingUtils.createRestoreServiceReply( LogMessages.serviceNotInDS(serviceName)); diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/TempServiceCreateImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/TempServiceCreateImpl.java index e8fcdd611..cb494990a 100644 --- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/TempServiceCreateImpl.java +++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/impl/TempServiceCreateImpl.java @@ -56,7 +56,7 @@ public class TempServiceCreateImpl implements TempServiceCreate { // Validation OperationResult validationResult = ServiceCreateValidation.validateServiceCreateRequest( new ServiceInput(input), RpcActions.TempServiceCreate); - if (! validationResult.isSuccess()) { + if (!validationResult.isSuccess()) { LOG.warn(TEMP_SERVICE_CREATE_MSG, LogMessages.ABORT_VALID_FAILED); return ModelMappingUtils.createCreateServiceReply( input, ResponseCodes.FINAL_ACK_YES, diff --git a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java index 1e5639cc0..0fe165174 100644 --- a/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java +++ b/servicehandler/src/test/java/org/opendaylight/transportpce/servicehandler/impl/ServicehandlerImplTest.java @@ -152,25 +152,6 @@ public class ServicehandlerImplTest extends AbstractTest { verify(rpcProviderService, times(1)).registerRpcImplementations(any(ClassToInstanceMap.class)); } -// @Test -// void testNotImplementedRpc() throws InterruptedException, ExecutionException { -// ListenableFuture> result = new ServicehandlerImpl(rpcProviderService, -// serviceDataStoreOperations, pceListenerImpl, rendererListenerImpl, networkModelListenerImpl, -// catalogDataStoreOperations, pathComputationService, rendererServiceOperations, -// notificationPublishService) -// .serviceSrlgGet(new ServiceSrlgGetInputBuilder().build()); -// -// result.addListener(() -> endSignal.countDown(), executorService); -// endSignal.await(); -// assertNotNull(result.get()); -// assertFalse(result.get().isSuccessful()); -// assertNull(result.get().getResult()); -// assertEquals(ErrorType.RPC, result.get().getErrors().get(0).getErrorType()); -// assertEquals(ErrorSeverity.ERROR, result.get().getErrors().get(0).getSeverity()); -// assertEquals(ErrorTag.OPERATION_NOT_SUPPORTED, result.get().getErrors().get(0).getTag()); -// assertEquals("RPC not implemented yet", result.get().getErrors().get(0).getMessage()); -// } - @Test void createServiceShouldBeFailedWithEmptyInput() throws ExecutionException, InterruptedException { ListenableFuture> result = -- 2.36.6