aboutsummaryrefslogtreecommitdiffstats
path: root/appc-config/appc-flow-controller/provider/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'appc-config/appc-flow-controller/provider/src/main')
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/EnvVariables.java26
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonValidator.java29
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/ResourceUriExtractor.java17
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/RestServiceNode.java112
-rw-r--r--appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java11
5 files changed, 115 insertions, 80 deletions
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/EnvVariables.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/EnvVariables.java
new file mode 100644
index 000000000..6cc3b7550
--- /dev/null
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/EnvVariables.java
@@ -0,0 +1,26 @@
+package org.onap.appc.flow.controller.node;
+
+import java.util.function.Function;
+
+/**
+ * Wrapper for accessing environment variables
+ */
+class EnvVariables {
+
+ private Function<String, String> envSupplier;
+
+ EnvVariables() {
+ envSupplier = System::getenv;
+ }
+
+ /**
+ * Allows to override environment variables in tests, prefer to use default constructor
+ */
+ EnvVariables(Function<String, String> envSupplier) {
+ this.envSupplier = envSupplier;
+ }
+
+ String getenv(String variable) {
+ return envSupplier.apply(variable);
+ }
+}
diff --git a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonValidator.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonValidator.java
new file mode 100644
index 000000000..78d530533
--- /dev/null
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/JsonValidator.java
@@ -0,0 +1,29 @@
+package org.onap.appc.flow.controller.node;
+
+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.IOException;
+import org.apache.commons.lang3.StringUtils;
+
+class JsonValidator {
+
+ private static final EELFLogger log = EELFManager.getInstance().getLogger(JsonValidator.class);
+
+ static JsonNode validate(String json) throws IOException {
+ if (StringUtils.isBlank(json)) {
+ return null;
+ }
+ JsonNode output = 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 output;
+ }
+
+}
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
index 0745f20ea..cd07952cf 100644
--- 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
@@ -13,6 +13,7 @@ import com.att.eelf.configuration.EELFManager;
import java.util.Properties;
import org.apache.commons.lang.StringUtils;
import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
/**
* Helper class for RestServiceNode
@@ -21,9 +22,7 @@ class ResourceUriExtractor {
private static final EELFLogger log = EELFManager.getInstance().getLogger(RestServiceNode.class);
- private ResourceUriExtractor() {}
-
- static String extractResourceUri(SvcLogicContext ctx, Properties prop) throws Exception {
+ String extractResourceUri(SvcLogicContext ctx, Properties prop) throws Exception {
String resourceUri = ctx.getAttribute(INPUT_URL);
if (StringUtils.isBlank(resourceUri)) {
@@ -38,34 +37,34 @@ class ResourceUriExtractor {
return resourceUri;
}
- private static String getAddress(SvcLogicContext ctx) {
+ private 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) {
+ private String getContext(SvcLogicContext ctx, Properties prop) throws Exception {
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));
+ throw new Exception("Could Not found the context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
}
return context;
}
- private static String getSubContext(SvcLogicContext ctx, Properties prop) {
+ private String getSubContext(SvcLogicContext ctx, Properties prop) throws Exception {
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));
+ throw new Exception("Could Not found the sub context for operation " + ctx.getAttribute(INPUT_REQUEST_ACTION));
}
return subContext;
}
-}
+} \ No newline at end of file
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 3597e0d18..184ba3b1b 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
@@ -32,10 +32,7 @@ import static org.onap.appc.flow.controller.utils.FlowControllerConstants.OUTPUT
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.IOException;
import java.util.Map;
import java.util.Properties;
import org.apache.commons.lang3.StringUtils;
@@ -50,6 +47,31 @@ 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";
+ static final String REST_RESPONSE = "restResponse";
+
+ private final TransactionHandler transactionHandler;
+ private final RestExecutor restExecutor;
+ private final ResourceUriExtractor resourceUriExtractor;
+ private final EnvVariables envVariables;
+
+ public RestServiceNode() {
+ this.transactionHandler = new TransactionHandler();
+ this.restExecutor = new RestExecutor();
+ this.resourceUriExtractor = new ResourceUriExtractor();
+ this.envVariables = new EnvVariables();
+ }
+
+ /**
+ * Constructor for tests, prefer to use no arg constructor
+ */
+ RestServiceNode(TransactionHandler transactionHandler, RestExecutor restExecutor,
+ ResourceUriExtractor uriExtractor, EnvVariables envVariables) {
+ this.transactionHandler = transactionHandler;
+ this.restExecutor = restExecutor;
+ this.resourceUriExtractor = uriExtractor;
+ this.envVariables = envVariables;
+ }
+
public void sendRequest(Map<String, String> inParams, SvcLogicContext ctx)
throws SvcLogicException {
String fn = "RestServiceNode.sendRequest";
@@ -58,84 +80,46 @@ public class RestServiceNode implements SvcLogicJavaPlugin {
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);
+ for (String key : ctx.getAttributeKeySet()) {
+ log.info(fn + "Getting Key = " + key + "and Value = " + ctx.getAttribute(key));
}
- 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(INPUT_PARAM_RESPONSE_PREFIX);
- String resourceUri = ResourceUriExtractor.extractResourceUri(ctx, prop);
+
+ String resourceUri = resourceUriExtractor.extractResourceUri(ctx, prop);
+
log.info("Rest Constructed URL : " + resourceUri);
- Transaction transaction = TransactionHandler.buildTransaction(ctx, prop, resourceUri);
-
- 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-")){
-// log.info("Found Key = " + key);
-// log.info("Found Key in Params " + inParams.get(key) + ".");
-// JsonNode setValue = restResponse.findValue(inParams.get(key));
-// log.info("Found value = " + setValue);
-// if(setValue !=null && setValue.textValue() !=null && !setValue.textValue().isEmpty())
-// ctx.setAttribute(responsePrefix + "." + key, setValue.textValue());
-// else
-// ctx.setAttribute(responsePrefix + "." + key, null);
-// }
-// }
+ Transaction transaction = transactionHandler.buildTransaction(ctx, prop, resourceUri);
+ Map<String, String> output = restExecutor.execute(transaction, ctx);
+
+ String json = output.get(REST_RESPONSE);
+ log.info("Received response from Interface " + json);
+
+ JsonNode validatedJson = JsonValidator.validate(json);
+
+ if (validatedJson != null) {
+ log.info("state is " + validatedJson.findValue("state"));
+ ctx.setAttribute(responsePrefix + OUTPUT_STATUS_MESSAGE, output.get(REST_RESPONSE));
}
- log.info("Response from Rest :");
+
+ ctx.setAttribute(responsePrefix + OUTPUT_PARAM_STATUS, OUTPUT_STATUS_SUCCESS);
} catch (Exception e) {
- log.error("Error Message: " + e.getMessage(), e);
- throw 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 Properties loadProperties() throws Exception {
- String directory = System.getenv(SDNC_CONFIG_DIR_VAR);
+ String directory = envVariables.getenv(SDNC_CONFIG_DIR_VAR);
if (directory == null) {
throw new Exception("Cannot find Property file: " + SDNC_CONFIG_DIR_VAR);
}
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/node/TransactionHandler.java b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java
index 8d10b3c7f..af9e84589 100644
--- a/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java
+++ b/appc-config/appc-flow-controller/provider/src/main/java/org/onap/appc/flow/controller/node/TransactionHandler.java
@@ -13,20 +13,17 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
*/
class TransactionHandler {
- private TransactionHandler() {}
-
- static Transaction buildTransaction(SvcLogicContext ctx, Properties prop,
- String resourceUri) throws Exception {
+ Transaction buildTransaction(SvcLogicContext ctx, Properties prop, String resourceUri)
+ throws Exception {
String inputRequestAction = ctx.getAttribute(INPUT_REQUEST_ACTION);
String inputRequestActionType = ctx.getAttribute(INPUT_REQUEST_ACTION_TYPE);
if (StringUtils.isBlank(inputRequestActionType)) {
- throw new IllegalArgumentException(
- "Don't know REST operation for Action " + inputRequestActionType);
+ throw new Exception("Don't know REST operation for Action " + inputRequestActionType);
}
if (StringUtils.isBlank(inputRequestAction)) {
- throw new IllegalArgumentException("Don't know request-action " + INPUT_REQUEST_ACTION);
+ throw new Exception("Don't know request-action " + INPUT_REQUEST_ACTION);
}
Transaction transaction = new Transaction();