Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Replaced all tabs with spaces in java and pom.xml
[so.git] / bpmn / so-bpmn-tasks / src / main / java / org / onap / so / bpmn / infrastructure / flowspecific / tasks / GenericVnfHealthCheck.java
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheck.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheck.java
index f0db5ed..98b602e 100644 (file)
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheck.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/flowspecific/tasks/GenericVnfHealthCheck.java
@@ -44,98 +44,97 @@ import org.springframework.stereotype.Component;
 @Component
 public class GenericVnfHealthCheck {
 
-       private static final Logger logger = LoggerFactory.getLogger(GenericVnfHealthCheck.class);
-       @Autowired
-       private ExceptionBuilder exceptionUtil;
-       @Autowired
-       private ExtractPojosForBB extractPojosForBB;
-       @Autowired
-       private CatalogDbClient catalogDbClient;
-       @Autowired
-       private ApplicationControllerAction appCClient;
-       
-       public void setParamsForGenericVnfHealthCheck(BuildingBlockExecution execution) {
-               
-               GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
+    private static final Logger logger = LoggerFactory.getLogger(GenericVnfHealthCheck.class);
+    @Autowired
+    private ExceptionBuilder exceptionUtil;
+    @Autowired
+    private ExtractPojosForBB extractPojosForBB;
+    @Autowired
+    private CatalogDbClient catalogDbClient;
+    @Autowired
+    private ApplicationControllerAction appCClient;
 
-               try {
-                       ControllerSelectionReference controllerSelectionReference;
-                       GenericVnf vnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID);
-                       String vnfId = vnf.getVnfId();
-                       String vnfName = vnf.getVnfName();      
-                       String vnfType = vnf.getVnfType();
-                       String oamIpAddress = vnf.getIpv4OamAddress();
-                       String actionCategory = Action.HealthCheck.toString();
-                       controllerSelectionReference = catalogDbClient.getControllerSelectionReferenceByVnfTypeAndActionCategory(vnfType, actionCategory);
-                       String controllerName = controllerSelectionReference.getControllerName();
-                       
-                       execution.setVariable("vnfId", vnfId);
-                       execution.setVariable("vnfName", vnfName);
-                       execution.setVariable("oamIpAddress", oamIpAddress);
-                       execution.setVariable("vnfHostIpAddress", oamIpAddress);
-                       execution.setVariable("msoRequestId", gBBInput.getRequestContext().getMsoRequestId());
-                       execution.setVariable("action", actionCategory);
-                       execution.setVariable("controllerType", controllerName);
-                       
-               } catch (Exception ex) {
-                       exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
-               }
-       }
-       
-       public void callAppcClient(BuildingBlockExecution execution) {
-               logger.trace("Start runAppcCommand ");
-               String appcCode = "1002";
-               String appcMessage = "";
-               try {
-                       Action action = null;
-                       action = Action.valueOf(execution.getVariable("action"));
-                       String msoRequestId = execution.getVariable("msoRequestId");
-                       String vnfId = execution.getVariable("vnfId");
-                       Optional<String> payload = null;
-                       if(execution.getVariable("payload") != null){
-                               String pay = execution.getVariable("payload");
-                               payload =  Optional.of(pay);
-                       }
-                       String controllerType = execution.getVariable("controllerType");
-                       HashMap<String, String> payloadInfo = new HashMap<String, String>();
-                       payloadInfo.put("vnfName", execution.getVariable("vnfName"));
-                       payloadInfo.put("vfModuleId",execution.getVariable("vfModuleId"));
-                       payloadInfo.put("oamIpAddress",execution.getVariable("oamIpAddress"));
-                       payloadInfo.put("vnfHostIpAddress",execution.getVariable("vnfHostIpAddress"));
-                       
-                       logger.debug("Running APP-C action: {}", action.toString());
-                       logger.debug("VNFID: {}", vnfId);
-                       //PayloadInfo contains extra information that adds on to payload before making request to appc
-                       appCClient.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
-                       appcCode = appCClient.getErrorCode();
-                       appcMessage = appCClient.getErrorMessage();
+    public void setParamsForGenericVnfHealthCheck(BuildingBlockExecution execution) {
+
+        GeneralBuildingBlock gBBInput = execution.getGeneralBuildingBlock();
+
+        try {
+            ControllerSelectionReference controllerSelectionReference;
+            GenericVnf vnf = extractPojosForBB.extractByKey(execution, ResourceKey.GENERIC_VNF_ID);
+            String vnfId = vnf.getVnfId();
+            String vnfName = vnf.getVnfName();
+            String vnfType = vnf.getVnfType();
+            String oamIpAddress = vnf.getIpv4OamAddress();
+            String actionCategory = Action.HealthCheck.toString();
+            controllerSelectionReference =
+                    catalogDbClient.getControllerSelectionReferenceByVnfTypeAndActionCategory(vnfType, actionCategory);
+            String controllerName = controllerSelectionReference.getControllerName();
+
+            execution.setVariable("vnfId", vnfId);
+            execution.setVariable("vnfName", vnfName);
+            execution.setVariable("oamIpAddress", oamIpAddress);
+            execution.setVariable("vnfHostIpAddress", oamIpAddress);
+            execution.setVariable("msoRequestId", gBBInput.getRequestContext().getMsoRequestId());
+            execution.setVariable("action", actionCategory);
+            execution.setVariable("controllerType", controllerName);
+
+        } catch (Exception ex) {
+            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, ex);
+        }
+    }
+
+    public void callAppcClient(BuildingBlockExecution execution) {
+        logger.trace("Start runAppcCommand ");
+        String appcCode = "1002";
+        String appcMessage = "";
+        try {
+            Action action = null;
+            action = Action.valueOf(execution.getVariable("action"));
+            String msoRequestId = execution.getVariable("msoRequestId");
+            String vnfId = execution.getVariable("vnfId");
+            Optional<String> payload = null;
+            if (execution.getVariable("payload") != null) {
+                String pay = execution.getVariable("payload");
+                payload = Optional.of(pay);
+            }
+            String controllerType = execution.getVariable("controllerType");
+            HashMap<String, String> payloadInfo = new HashMap<String, String>();
+            payloadInfo.put("vnfName", execution.getVariable("vnfName"));
+            payloadInfo.put("vfModuleId", execution.getVariable("vfModuleId"));
+            payloadInfo.put("oamIpAddress", execution.getVariable("oamIpAddress"));
+            payloadInfo.put("vnfHostIpAddress", execution.getVariable("vnfHostIpAddress"));
+
+            logger.debug("Running APP-C action: {}", action.toString());
+            logger.debug("VNFID: {}", vnfId);
+            // PayloadInfo contains extra information that adds on to payload before making request to appc
+            appCClient.runAppCCommand(action, msoRequestId, vnfId, payload, payloadInfo, controllerType);
+            appcCode = appCClient.getErrorCode();
+            appcMessage = appCClient.getErrorMessage();
         } catch (BpmnError ex) {
-                       logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
-                               "Caught exception in GenericVnfHealthCheck", "BPMN", ErrorCode.UnknownError.getValue(), ex);
-                       appcMessage = ex.getMessage();
+            logger.error("{} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION_ARG.toString(),
+                    "Caught exception in GenericVnfHealthCheck", "BPMN", ErrorCode.UnknownError.getValue(), ex);
+            appcMessage = ex.getMessage();
+            exceptionUtil.buildAndThrowWorkflowException(execution, Integer.parseInt(appcCode), appcMessage);
+        } catch (Exception e) {
+            if (e instanceof java.util.concurrent.TimeoutException) {
+                appcMessage = "Request to APPC timed out. ";
+                logger.error("{} {} {} {} {}", MessageEnum.RA_CONNECTION_EXCEPTION.toString(),
+                        "Caught timedOut exception in runAppcCommand in GenericVnfHealthCheck", "BPMN",
+                        ErrorCode.UnknownError.getValue(), "APPC Error", e);
+                throw e;
+            } else {
+                logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(),
+                        "Caught exception in runAppcCommand in GenericVnfHealthCheck", "BPMN",
+                        ErrorCode.UnknownError.getValue(), "APPC Error", e);
+                appcMessage = e.getMessage();
+                exceptionUtil.buildAndThrowWorkflowException(execution, Integer.parseInt(appcCode), appcMessage);
+            }
+        }
+        logger.error("Error Message: " + appcMessage);
+        logger.error("ERROR CODE: " + appcCode);
+        logger.trace("End of runAppCommand ");
+        if (appcCode != null && !appcCode.equals("0")) {
             exceptionUtil.buildAndThrowWorkflowException(execution, Integer.parseInt(appcCode), appcMessage);
-               } catch (Exception e) {
-                       if (e instanceof java.util.concurrent.TimeoutException )
-                       {
-                               appcMessage = "Request to APPC timed out. ";
-                               logger.error("{} {} {} {} {}", MessageEnum.RA_CONNECTION_EXCEPTION.toString(),
-                                       "Caught timedOut exception in runAppcCommand in GenericVnfHealthCheck", "BPMN",
-                                       ErrorCode.UnknownError.getValue(), "APPC Error", e);
-                               throw e;
-                       }
-                       else {
-                               logger.error("{} {} {} {} {}", MessageEnum.BPMN_GENERAL_EXCEPTION.toString(),
-                                       "Caught exception in runAppcCommand in GenericVnfHealthCheck", "BPMN",
-                                       ErrorCode.UnknownError.getValue(), "APPC Error", e);
-                               appcMessage = e.getMessage();
-                               exceptionUtil.buildAndThrowWorkflowException(execution, Integer.parseInt(appcCode), appcMessage);
-                       }
-               }
-               logger.error("Error Message: " + appcMessage);
-               logger.error("ERROR CODE: " + appcCode);
-               logger.trace("End of runAppCommand ");
-               if (appcCode != null && !appcCode.equals("0")) {
-                       exceptionUtil.buildAndThrowWorkflowException(execution, Integer.parseInt(appcCode), appcMessage);
-               }
-       }
+        }
+    }
 }
Service Orchestrator