Code Review / transportpce.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Service Handler optimizations and technical debt
[transportpce.git] / servicehandler / src / main / java / org / opendaylight / transportpce / servicehandler / listeners / PceListenerImpl.java
diff --git a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java
index 65e199b4fa0470d0b762b9c0ecc807f6700ab9da..9362390e6dd61af9797b14a07facba08155df21a 100644 (file)
--- a/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java
+++ b/servicehandler/src/main/java/org/opendaylight/transportpce/servicehandler/listeners/PceListenerImpl.java
@@ -82,95 +82,107 @@ public class PceListenerImpl implements TransportpcePceListener {
     private void onPathComputationResult(ServicePathRpcResult notification) {
         LOG.info("PCE '{}' Notification received : {}",servicePathRpcResult.getNotificationType().getName(),
                 notification);
-        if (servicePathRpcResult.getStatus() == RpcStatusEx.Successful) {
-            LOG.info("PCE calculation done OK !");
-            if (servicePathRpcResult.getPathDescription() != null) {
-                PathDescription pathDescription = new PathDescriptionBuilder()
-                        .setAToZDirection(servicePathRpcResult.getPathDescription().getAToZDirection())
-                    .setZToADirection(servicePathRpcResult.getPathDescription().getZToADirection()).build();
-                LOG.info("PathDescription gets : {}", pathDescription);
-                if (!serviceFeasiblity) {
-                    if (input == null) {
-                        LOG.error("Input is null !");
-                    } else {
-                        OperationResult operationResult = null;
-                        if (tempService) {
-                            operationResult = this.serviceDataStoreOperations
-                                    .createTempService(input.getTempServiceCreateInput());
-                            if (!operationResult.isSuccess()) {
-                                LOG.error("Temp Service not created in datastore !");
-                            }
-                        } else {
-                            operationResult = this.serviceDataStoreOperations
-                                    .createService(input.getServiceCreateInput());
-                            if (!operationResult.isSuccess()) {
-                                LOG.error("Service not created in datastore !");
-                            }
-                        }
-                        ResponseParameters responseParameters = new ResponseParametersBuilder()
-                                .setPathDescription(new org.opendaylight.yang.gen.v1.http.org
-                                        .transportpce.b.c._interface.service.types.rev200128
-                                        .response.parameters.sp.response.parameters
-                                        .PathDescriptionBuilder(pathDescription).build())
-                                .build();
-                        PathComputationRequestOutput pceResponse = new PathComputationRequestOutputBuilder()
-                                .setResponseParameters(responseParameters).build();
-                        OperationResult operationServicePathSaveResult = this.serviceDataStoreOperations
-                                .createServicePath(input, pceResponse);
-                        if (!operationServicePathSaveResult.isSuccess()) {
-                            LOG.error("Service Path not created in datastore !");
-                        }
-                        ServiceImplementationRequestInput serviceImplementationRequest = ModelMappingUtils
-                                .createServiceImplementationRequest(input, pathDescription);
-                        LOG.info("Sending serviceImplementation request : {}", serviceImplementationRequest);
-                        this.rendererServiceOperations.serviceImplementation(serviceImplementationRequest);
-                    }
-                } else {
-                    LOG.warn("service-feasibility-check RPC ");
-                }
-            } else {
-                LOG.error("'PathDescription' parameter is null ");
-            }
-        } else if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) {
+        if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) {
             LOG.error("PCE path computation failed !");
+            return;
+        } else if (servicePathRpcResult.getStatus() == RpcStatusEx.Pending) {
+            LOG.warn("PCE path computation returned a Penging RpcStatusEx code!");
+            return;
+        } else if (servicePathRpcResult.getStatus() != RpcStatusEx.Successful) {
+            LOG.error("PCE path computation returned an unknown RpcStatusEx code!");
+            return;
+        }
+
+        LOG.info("PCE calculation done OK !");
+        if (servicePathRpcResult.getPathDescription() == null) {
+            LOG.error("'PathDescription' parameter is null ");
+            return;
+        }
+        PathDescription pathDescription = new PathDescriptionBuilder()
+                .setAToZDirection(servicePathRpcResult.getPathDescription().getAToZDirection())
+                .setZToADirection(servicePathRpcResult.getPathDescription().getZToADirection())
+                .build();
+        LOG.info("PathDescription gets : {}", pathDescription);
+        if (serviceFeasiblity) {
+            LOG.warn("service-feasibility-check RPC ");
+            return;
         }
+        if (input == null) {
+            LOG.error("Input is null !");
+            return;
+        }
+        OperationResult operationResult = null;
+        if (tempService) {
+            operationResult = this.serviceDataStoreOperations.createTempService(input.getTempServiceCreateInput());
+            if (!operationResult.isSuccess()) {
+                LOG.error("Temp Service not created in datastore !");
+            }
+        } else {
+            operationResult = this.serviceDataStoreOperations.createService(input.getServiceCreateInput());
+            if (!operationResult.isSuccess()) {
+                LOG.error("Service not created in datastore !");
+            }
+        }
+        ResponseParameters responseParameters = new ResponseParametersBuilder()
+                .setPathDescription(new org.opendaylight.yang.gen.v1.http.org
+                        .transportpce.b.c._interface.service.types.rev200128
+                        .response.parameters.sp.response.parameters
+                        .PathDescriptionBuilder(pathDescription).build())
+                .build();
+        PathComputationRequestOutput pceResponse = new PathComputationRequestOutputBuilder()
+                .setResponseParameters(responseParameters).build();
+        OperationResult operationServicePathSaveResult = this.serviceDataStoreOperations
+                .createServicePath(input, pceResponse);
+        if (!operationServicePathSaveResult.isSuccess()) {
+            LOG.error("Service Path not created in datastore !");
+        }
+        ServiceImplementationRequestInput serviceImplementationRequest = ModelMappingUtils
+                .createServiceImplementationRequest(input, pathDescription);
+        LOG.info("Sending serviceImplementation request : {}", serviceImplementationRequest);
+        this.rendererServiceOperations.serviceImplementation(serviceImplementationRequest);
     }
 
     /**
      * Process cancel resource result.
      */
     private void onCancelResourceResult() {
-        if (servicePathRpcResult.getStatus() == RpcStatusEx.Successful) {
-            LOG.info("PCE cancel resource done OK !");
-            OperationResult deleteServicePathOperationResult =
-                    this.serviceDataStoreOperations.deleteServicePath(input.getServiceName());
-            if (!deleteServicePathOperationResult.isSuccess()) {
-                LOG.warn("Service path was not removed from datastore!");
-            }
-            OperationResult deleteServiceOperationResult = null;
-            if (tempService) {
-                deleteServiceOperationResult =
-                        this.serviceDataStoreOperations.deleteTempService(input.getServiceName());
-                if (!deleteServiceOperationResult.isSuccess()) {
-                    LOG.warn("Service was not removed from datastore!");
-                }
-            } else {
-                deleteServiceOperationResult =
-                        this.serviceDataStoreOperations.deleteService(input.getServiceName());
-                if (!deleteServiceOperationResult.isSuccess()) {
-                    LOG.warn("Service was not removed from datastore!");
-                }
+        if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) {
+            LOG.info("PCE cancel resource failed !");
+            return;
+        } else if (servicePathRpcResult.getStatus() == RpcStatusEx.Pending) {
+            LOG.warn("PCE cancel returned a Penging RpcStatusEx code!");
+            return;
+        } else if (servicePathRpcResult.getStatus() != RpcStatusEx.Successful) {
+            LOG.error("PCE cancel returned an unknown RpcStatusEx code!");
+            return;
+        }
+        LOG.info("PCE cancel resource done OK !");
+        OperationResult deleteServicePathOperationResult =
+                this.serviceDataStoreOperations.deleteServicePath(input.getServiceName());
+        if (!deleteServicePathOperationResult.isSuccess()) {
+            LOG.warn("Service path was not removed from datastore!");
+        }
+        OperationResult deleteServiceOperationResult = null;
+        if (tempService) {
+            deleteServiceOperationResult =
+                    this.serviceDataStoreOperations.deleteTempService(input.getServiceName());
+            if (!deleteServiceOperationResult.isSuccess()) {
+                LOG.warn("Temp Service was not removed from datastore!");
             }
-            /**
-             * if it was an RPC serviceReconfigure, re-launch PCR.
-             */
-            if (this.serviceReconfigure) {
-                LOG.info("cancel resource reserve done, relaunching PCE path computation ...");
-                this.pceServiceWrapper.performPCE(input.getServiceCreateInput(), true);
-                this.serviceReconfigure = false;
+        } else {
+            deleteServiceOperationResult =
+                    this.serviceDataStoreOperations.deleteService(input.getServiceName());
+            if (!deleteServiceOperationResult.isSuccess()) {
+                LOG.warn("Service was not removed from datastore!");
             }
-        } else if (servicePathRpcResult.getStatus() == RpcStatusEx.Failed) {
-            LOG.info("PCE cancel resource failed !");
+        }
+        /**
+         * if it was an RPC serviceReconfigure, re-launch PCR.
+         */
+        if (this.serviceReconfigure) {
+            LOG.info("cancel resource reserve done, relaunching PCE path computation ...");
+            this.pceServiceWrapper.performPCE(input.getServiceCreateInput(), true);
+            this.serviceReconfigure = false;
         }
     }
 
@@ -178,24 +190,22 @@ public class PceListenerImpl implements TransportpcePceListener {
         value = "ES_COMPARING_STRINGS_WITH_EQ",
         justification = "false positives, not strings but real object references comparisons")
     private Boolean compareServicePathRpcResult(ServicePathRpcResult notification) {
-        Boolean result = true;
         if (servicePathRpcResult == null) {
-            result = false;
-        } else {
-            if (servicePathRpcResult.getNotificationType() != notification.getNotificationType()) {
-                result = false;
-            }
-            if (servicePathRpcResult.getServiceName() != notification.getServiceName()) {
-                result = false;
-            }
-            if (servicePathRpcResult.getStatus() != notification.getStatus()) {
-                result = false;
-            }
-            if (servicePathRpcResult.getStatusMessage() != notification.getStatusMessage()) {
-                result = false;
-            }
+            return false;
+        }
+        if (servicePathRpcResult.getNotificationType() != notification.getNotificationType()) {
+            return false;
+        }
+        if (servicePathRpcResult.getServiceName() != notification.getServiceName()) {
+            return false;
+        }
+        if (servicePathRpcResult.getStatus() != notification.getStatus()) {
+            return false;
+        }
+        if (servicePathRpcResult.getStatusMessage() != notification.getStatusMessage()) {
+            return false;
         }
-        return result;
+        return true;
     }
 
     public void setInput(ServiceInput serviceInput) {
Repository for Transport PCE project.