diff options
Diffstat (limited to 'appc-config/appc-flow-controller/provider/src/main')
6 files changed, 201 insertions, 156 deletions
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java index b8ace760a..baca94b36 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/FlowControlNode.java @@ -73,7 +73,7 @@ public class FlowControlNode implements SvcLogicJavaPlugin { public void processFlow(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException { log.debug("Received processParamKeys call with params : " + inParams); - String responsePrefix = inParams.get(FlowControllerConstants.INPUT_PARAM_RESPONSE_PRIFIX); + String responsePrefix = inParams.get(FlowControllerConstants.INPUT_PARAM_RESPONSE_PREFIX); try { responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix + ".") : ""; SvcLogicContext localContext = new SvcLogicContext(); diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java index 6a987df74..42f38ba46 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonParsingNode.java @@ -44,7 +44,7 @@ public class JsonParsingNode implements SvcLogicJavaPlugin { public void parse(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException { String fn = "RestServiceNode.sendRequest"; log.info("Received processParamKeys call with params : " + inParams); - String responsePrefix = inParams.get(FlowControllerConstants.INPUT_PARAM_RESPONSE_PRIFIX); + String responsePrefix = inParams.get(FlowControllerConstants.INPUT_PARAM_RESPONSE_PREFIX); responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix + ".") : ""; try { //Remove below for Block diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/PropertiesLoader.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/PropertiesLoader.java new file mode 100644 index 000000000..28792bb10 --- /dev/null +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/PropertiesLoader.java @@ -0,0 +1,20 @@ +package org.onap.appc.flow.controller.node; + +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Properties; + +class PropertiesLoader { + + private PropertiesLoader() {} + + static Properties load(String path) throws IOException { + Properties props = new Properties(); + try (InputStream propStream = new FileInputStream(path)) { + props.load(propStream); + } + return props; + } + +} diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java new file mode 100644 index 000000000..3cfea31a2 --- /dev/null +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java @@ -0,0 +1,72 @@ +package org.onap.appc.flow.controller.node; + +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.HTTP; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_CONTEXT; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_HOST_IP_ADDRESS; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_PORT_NUMBER; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_SUB_CONTEXT; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_URL; + +import com.att.eelf.configuration.EELFLogger; +import com.att.eelf.configuration.EELFManager; +import java.util.Properties; +import org.apache.commons.lang.StringUtils; +import org.onap.ccsdk.sli.core.sli.SvcLogicContext; + +/** + * Helper class for RestServiceNode + */ +class ResourceUriExtractor { + + private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class); + + private ResourceUriExtractor() { + } + + static String extractResourceUri(SvcLogicContext ctx, Properties prop) throws Exception { + String resourceUri = ctx.getAttribute(INPUT_URL); + + if (StringUtils.isBlank(resourceUri)) { + resourceUri = getAddress(ctx); + log.info("resourceUri= " + resourceUri); + resourceUri += getContext(ctx, prop); + log.info("resourceUri= " + resourceUri); + resourceUri += getSubContext(ctx, prop); + } + log.info("resourceUri= " + resourceUri); + + return resourceUri; + } + + private static String getAddress(SvcLogicContext ctx) { + String address = ctx.getAttribute(INPUT_HOST_IP_ADDRESS); + String port = ctx.getAttribute(INPUT_PORT_NUMBER); + return HTTP + address + ":" + port; + } + + private static String getContext(SvcLogicContext ctx, Properties prop) { + String context; + if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_CONTEXT))) { + context = "/" + ctx.getAttribute(INPUT_CONTEXT); + } else if (prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".context") != null) { + context = "/" + prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".context"); + } else { + throw new IllegalArgumentException("Could Not found the context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION)); + } + return context; + } + + private static String getSubContext(SvcLogicContext ctx, Properties prop) { + String subContext; + if (StringUtils.isNotBlank(ctx.getAttribute(INPUT_SUB_CONTEXT))) { + subContext = "/" + ctx.getAttribute(INPUT_SUB_CONTEXT); + } else if (prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context") != null) { + subContext = "/" + prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + ".sub-context"); + } else { + throw new IllegalArgumentException("Could Not found the sub context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION)); + } + return subContext; + } + +} diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java index d931e47f6..9d7f6e879 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java @@ -22,140 +22,101 @@ package org.onap.appc.flow.controller.node; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.APPC_FLOW_CONTROLLER; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_PARAM_RESPONSE_PREFIX; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.INPUT_REQUEST_ACTION_TYPE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_PARAM_ERROR_MESSAGE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_PARAM_STATUS; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_STATUS_FAILURE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_STATUS_MESSAGE; +import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT_STATUS_SUCCESS; + import com.att.eelf.configuration.EELFLogger; import com.att.eelf.configuration.EELFManager; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.FileInputStream; import java.io.IOException; -import java.io.InputStream; import java.util.Map; import java.util.Properties; import org.apache.commons.lang3.StringUtils; import org.onap.appc.flow.controller.data.Transaction; import org.onap.appc.flow.controller.executorImpl.RestExecutor; -import org.onap.appc.flow.controller.utils.FlowControllerConstants; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin; public class RestServiceNode implements SvcLogicJavaPlugin { - private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class); - private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR"; - - public void sendRequest(Map<String, String> inParams, SvcLogicContext ctx) throws SvcLogicException { - String fn = "RestServiceNode.sendRequest"; - log.info("Received processParamKeys call with params : " + inParams); - String responsePrefix = inParams.get(FlowControllerConstants.INPUT_PARAM_RESPONSE_PRIFIX); - try { - responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix + ".") : ""; - //Remove below for Block - for (Object key : ctx.getAttributeKeySet()) { - String parmName = (String) key; - String parmValue = ctx.getAttribute(parmName); - log.info(fn + "Getting Key = " + parmName + "and Value = " + parmValue); - } - - send(ctx, inParams); - ctx.setAttribute(responsePrefix + FlowControllerConstants.OUTPUT_PARAM_STATUS, - FlowControllerConstants.OUTPUT_STATUS_SUCCESS); - - } catch (Exception e) { - ctx.setAttribute(responsePrefix + FlowControllerConstants.OUTPUT_PARAM_STATUS, - FlowControllerConstants.OUTPUT_STATUS_FAILURE); - ctx.setAttribute(responsePrefix + FlowControllerConstants.OUTPUT_PARAM_ERROR_MESSAGE, - e.getMessage()); - log.error("Error Message : " + e.getMessage(), e); - throw new SvcLogicException(e.getMessage()); - } + private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class); + private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR"; + + public void sendRequest(Map<String, String> inParams, SvcLogicContext ctx) + throws SvcLogicException { + String fn = "RestServiceNode.sendRequest"; + log.info("Received processParamKeys call with params : " + inParams); + String responsePrefix = inParams.get(INPUT_PARAM_RESPONSE_PREFIX); + try { + responsePrefix = StringUtils.isNotBlank(responsePrefix) ? (responsePrefix + ".") : ""; + //Remove below for Block + for (Object key : ctx.getAttributeKeySet()) { + String parmName = (String) key; + String parmValue = ctx.getAttribute(parmName); + log.info(fn + "Getting Key = " + parmName + "and Value = " + parmValue); + } + + send(ctx, inParams); + ctx.setAttribute(responsePrefix + OUTPUT_PARAM_STATUS, OUTPUT_STATUS_SUCCESS); + + } catch (Exception e) { + ctx.setAttribute(responsePrefix + OUTPUT_PARAM_STATUS, OUTPUT_STATUS_FAILURE); + ctx.setAttribute(responsePrefix + OUTPUT_PARAM_ERROR_MESSAGE, e.getMessage()); + log.error("Error Message : " + e.getMessage(), e); + throw new SvcLogicException(e.getMessage()); } - - private void send(SvcLogicContext ctx, Map<String, String> inParams) throws Exception { - try { - Properties prop = loadProperties(); - log.info("Loaded Properties " + prop.toString()); - String responsePrefix = inParams.get(FlowControllerConstants.INPUT_PARAM_RESPONSE_PRIFIX); - String resourceUri = ""; - if (ctx.getAttribute(FlowControllerConstants.INPUT_URL) != null - && !(ctx.getAttribute(FlowControllerConstants.INPUT_URL).isEmpty())) { - resourceUri = ctx.getAttribute(FlowControllerConstants.INPUT_URL); - - } else { - resourceUri = resourceUri.concat(FlowControllerConstants.HTTP); - log.info("resourceUri= " + resourceUri ); - resourceUri = resourceUri.concat(ctx.getAttribute(FlowControllerConstants.INPUT_HOST_IP_ADDRESS)); - resourceUri = resourceUri.concat(":"); - resourceUri = resourceUri.concat(ctx.getAttribute(FlowControllerConstants.INPUT_PORT_NUMBER)); - - if (ctx.getAttribute(FlowControllerConstants.INPUT_CONTEXT) != null - && !ctx.getAttribute(FlowControllerConstants.INPUT_CONTEXT).isEmpty()) { - resourceUri = resourceUri - .concat("/") - .concat(ctx.getAttribute(FlowControllerConstants.INPUT_CONTEXT)); - log.info("resourceUri= " + resourceUri ); - - } else if (prop.getProperty(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) - .concat(".context")) != null ) { - log.info("resourceUri = " + resourceUri ); - resourceUri = resourceUri - .concat("/") - .concat(prop.getProperty(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) - .concat(".context"))); - - } else { - throw new Exception("Could Not found the context for operation " - + ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION)); - } - - if (ctx.getAttribute(FlowControllerConstants.INPUT_SUB_CONTEXT) != null - && !ctx.getAttribute(FlowControllerConstants.INPUT_SUB_CONTEXT).isEmpty()) { - resourceUri = resourceUri - .concat("/") - .concat(ctx.getAttribute(FlowControllerConstants.INPUT_SUB_CONTEXT)); - log.info("resourceUri" + resourceUri ); - - } else if (prop.getProperty(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) - .concat(".sub-context")) != null ) { - resourceUri = resourceUri - .concat("/") - .concat(prop.getProperty(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) - .concat(".sub-context"))); - log.info("resourceUri" + resourceUri ); - } - } - log.info("Rest Constructed URL : " + resourceUri); - - Transaction transaction = new Transaction(); - transaction.setExecutionEndPoint(resourceUri); - transaction.setExecutionRPC(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION_TYPE)); - transaction.setAction(FlowControllerConstants.INPUT_REQUEST_ACTION); - if (ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION_TYPE) == null - || ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION_TYPE).isEmpty()) { - throw new Exception("Dont know REST operation for Action " + transaction.getExecutionRPC()); - } - if (ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) == null - || ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION).isEmpty()) { - throw new Exception("Dont know request-action " + transaction.getAction()); - } - - //This code need to get changed to get the UserID and pass from a common place. - if (transaction.getuId() == null) { - transaction.setuId(prop.getProperty(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) - .concat(".default-rest-user"))); - } - if (transaction.getPswd() == null) { - transaction.setPswd(prop.getProperty(ctx.getAttribute(FlowControllerConstants.INPUT_REQUEST_ACTION) - .concat(".default-rest-pass"))); - } - - RestExecutor restRequestExecutor = new RestExecutor(); - Map<String, String> output = restRequestExecutor.execute(transaction, ctx); - - if (isValidJson(output.get("restResponse")) != null) { - ctx.setAttribute(responsePrefix + "." + FlowControllerConstants.OUTPUT_STATUS_MESSAGE, - output.get("restResponse")); + } + + private void send(SvcLogicContext ctx, Map<String, String> inParams) throws Exception { + try { + Properties prop = loadProperties(); + log.info("Loaded Properties " + prop.toString()); + String responsePrefix = inParams.get(INPUT_PARAM_RESPONSE_PREFIX); + String resourceUri = ResourceUriExtractor.extractResourceUri(ctx, prop); + log.info("Rest Constructed URL : " + resourceUri); + + Transaction transaction = new Transaction(); + transaction.setExecutionEndPoint(resourceUri); + transaction + .setExecutionRPC(ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE)); + transaction.setAction(INPUT_REQUEST_ACTION); + if (ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE) == null + || ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE).isEmpty()) { + throw new Exception("Dont know REST operation for Action " + transaction.getExecutionRPC()); + } + if (ctx.getAttribute(INPUT_REQUEST_ACTION) == null + || ctx.getAttribute(INPUT_REQUEST_ACTION).isEmpty()) { + throw new Exception("Dont know request-action " + transaction.getAction()); + } + + //This code need to get changed to get the UserID and pass from a common place. + if (transaction.getuId() == null) { + transaction + .setuId(prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + .concat(".default-rest-user"))); + } + if (transaction.getPswd() == null) { + transaction + .setPswd(prop.getProperty(ctx.getAttribute(INPUT_REQUEST_ACTION) + .concat(".default-rest-pass"))); + } + + RestExecutor restRequestExecutor = new RestExecutor(); + Map<String, String> output = restRequestExecutor.execute(transaction, ctx); + + if (isValidJson(output.get("restResponse")) != null) { + ctx.setAttribute(responsePrefix + "." + OUTPUT_STATUS_MESSAGE, + output.get("restResponse")); // JsonNode restResponse = isValidJson(output.get("restResponse")); // for (String key : inParams.keySet()) { // if(key !=null && key.startsWith("output-")){ @@ -169,46 +130,38 @@ public class RestServiceNode implements SvcLogicJavaPlugin { // ctx.setAttribute(responsePrefix + "." + key, null); // } // } - } - log.info("Response from Rest :" ); + } + log.info("Response from Rest :"); - } catch(Exception e) { - log.error("Error Message: " + e.getMessage(), e); - throw e; - } + } catch (Exception e) { + log.error("Error Message: " + e.getMessage(), e); + throw e; } + } - private Properties loadProperties() throws Exception { - Properties props = new Properties(); - String propDir = System.getenv(SDNC_CONFIG_DIR_VAR); - if (propDir == null) { - throw new Exception("Cannot find Property file -" + SDNC_CONFIG_DIR_VAR); - } - String propFile = propDir + FlowControllerConstants.APPC_FLOW_CONTROLLER; - try (InputStream propStream = new FileInputStream(propFile)) { - - props.load(propStream); - } - catch (Exception e) { - throw new Exception("Could not load properties file " + propFile, e); - } - return props; + private Properties loadProperties() throws Exception { + String directory = System.getenv(SDNC_CONFIG_DIR_VAR); + if (directory == null) { + throw new Exception("Cannot find Property file: " + SDNC_CONFIG_DIR_VAR); } - - private JsonNode isValidJson(String json) throws IOException { - JsonNode output; - log.info("Received response from Interface " + json); - if (json == null || json.isEmpty()) { - return null; - } - try { - ObjectMapper objectMapper = new ObjectMapper(); - output = objectMapper.readTree(json); - } catch(JsonProcessingException e) { - log.warn("Response received from interface is not a valid JSON block" + json, e); - return null; - } - log.info("state is " + output.findValue("state")); - return output; + String path = directory + APPC_FLOW_CONTROLLER; + return PropertiesLoader.load(path); + } + + private JsonNode isValidJson(String json) throws IOException { + JsonNode output; + log.info("Received response from Interface " + json); + if (json == null || json.isEmpty()) { + return null; + } + try { + ObjectMapper objectMapper = new ObjectMapper(); + output = objectMapper.readTree(json); + } catch (JsonProcessingException e) { + log.warn("Response received from interface is not a valid JSON block" + json, e); + return null; } + log.info("state is " + output.findValue("state")); + return output; + } } diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java index b67f19329..502438c31 100644 --- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java +++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/utils/FlowControllerConstants.java @@ -32,7 +32,7 @@ public class FlowControllerConstants { public static final String DATA_TYPE_XML = "XML"; public static final String DATA_TYPE_SQL = "SQL"; - public static final String INPUT_PARAM_RESPONSE_PRIFIX = "responsePrefix"; + public static final String INPUT_PARAM_RESPONSE_PREFIX = "responsePrefix"; public static final String OUTPUT_PARAM_STATUS = "status"; public static final String OUTPUT_PARAM_ERROR_MESSAGE = "error-message"; |