add metric log filter
[ccsdk/sli/plugins.git] / restapi-call-node / provider / src / main / java / org / onap / ccsdk / sli / plugins / restapicall / RestapiCallNode.java
old mode 100644 (file)
new mode 100755 (executable)
index e550343..b4d7e1b
@@ -4,6 +4,7 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights
  *                     reserved.
+ * Modifications Copyright © 2018 IBM.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,7 +25,7 @@ package org.onap.ccsdk.sli.plugins.restapicall;
 import static java.lang.Boolean.valueOf;
 import static javax.ws.rs.client.Entity.entity;
 import static org.onap.ccsdk.sli.plugins.restapicall.AuthType.fromString;
-
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.net.SocketException;
@@ -36,6 +37,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
@@ -52,111 +54,175 @@ import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.EntityTag;
 import javax.ws.rs.core.Feature;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import org.apache.commons.lang3.StringUtils;
+import org.codehaus.jettison.json.JSONException;
+import org.codehaus.jettison.json.JSONObject;
 import org.glassfish.jersey.client.ClientProperties;
+import org.glassfish.jersey.client.HttpUrlConnectorProvider;
 import org.glassfish.jersey.client.authentication.HttpAuthenticationFeature;
 import org.glassfish.jersey.client.oauth1.ConsumerCredentials;
 import org.glassfish.jersey.client.oauth1.OAuth1ClientSupport;
+import org.glassfish.jersey.media.multipart.MultiPart;
+import org.glassfish.jersey.media.multipart.MultiPartFeature;
+import org.glassfish.jersey.media.multipart.file.FileDataBodyPart;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicJavaPlugin;
+import org.onap.logging.filter.base.MetricLogClientFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class RestapiCallNode implements SvcLogicJavaPlugin {
 
-    protected static final String DME2_PROPERTIES_FILE_NAME = "dme2.properties";
+    protected static final String PARTNERS_FILE_NAME = "partners.json";
     protected static final String UEB_PROPERTIES_FILE_NAME = "ueb.properties";
     protected static final String DEFAULT_PROPERTIES_DIR = "/opt/onap/ccsdk/data/properties";
     protected static final String PROPERTIES_DIR_KEY = "SDNC_CONFIG_DIR";
+    protected static final int DEFAULT_HTTP_CONNECT_TIMEOUT_MS = 30000; // 30 seconds
+    protected static final int DEFAULT_HTTP_READ_TIMEOUT_MS = 600000; // 10 minutes
 
     private static final Logger log = LoggerFactory.getLogger(RestapiCallNode.class);
-    protected RetryPolicyStore retryPolicyStore;
     private String uebServers;
     private String defaultUebTemplateFileName = "/opt/bvc/restapi/templates/default-ueb-message.json";
 
+    private String responseReceivedMessage = "Response received. Time: {}";
+    private String responseHttpCodeMessage = "HTTP response code: {}";
+    private String requestPostingException = "Exception while posting http request to client ";
+    protected static final String skipSendingMessage = "skipSending";
+    protected static final String responsePrefix = "responsePrefix";
+    protected static final String restapiUrlString = "restapiUrl";
+    protected static final String restapiUserKey = "restapiUser";
+    protected static final String restapiPasswordKey = "restapiPassword";
+    protected Integer httpConnectTimeout;
+    protected Integer httpReadTimeout;
+
+    protected HashMap<String, PartnerDetails> partnerStore;
+
     public RestapiCallNode() {
         String configDir = System.getProperty(PROPERTIES_DIR_KEY, DEFAULT_PROPERTIES_DIR);
-
-        try (FileInputStream in = new FileInputStream(configDir + "/" + DME2_PROPERTIES_FILE_NAME)) {
-            Properties props = new Properties();
-            props.load(in);
-            this.retryPolicyStore = new RetryPolicyStore();
-            this.retryPolicyStore.setProxyServers(props.getProperty("proxyUrl"));
-            log.info("DME2 support enabled");
+        try {
+            String jsonString = readFile(configDir + "/" + PARTNERS_FILE_NAME);
+            JSONObject partners = new JSONObject(jsonString);
+            partnerStore = new HashMap<>();
+            loadPartners(partners);
+            log.info("Partners support enabled");
         } catch (Exception e) {
-            log.warn("DME2 properties could not be read, DME2 support will not be enabled.", e);
+            log.warn("Partners file could not be read, Partner support will not be enabled.", e);
         }
 
         try (FileInputStream in = new FileInputStream(configDir + "/" + UEB_PROPERTIES_FILE_NAME)) {
             Properties props = new Properties();
             props.load(in);
-            this.uebServers = props.getProperty("servers");
+            uebServers = props.getProperty("servers");
             log.info("UEB support enabled");
         } catch (Exception e) {
             log.warn("UEB properties could not be read, UEB support will not be enabled.", e);
         }
+        httpConnectTimeout = readOptionalInteger("HTTP_CONNECT_TIMEOUT_MS",DEFAULT_HTTP_CONNECT_TIMEOUT_MS);
+        httpReadTimeout = readOptionalInteger("HTTP_READ_TIMEOUT_MS",DEFAULT_HTTP_READ_TIMEOUT_MS);
+    }
+
+    protected void loadPartners(JSONObject partners) {
+        Iterator<String> keys = partners.keys();
+        String partnerUserKey = "user";
+        String partnerPasswordKey = "password";
+        String partnerUrlKey = "url";
+
+        while (keys.hasNext()) {
+            String partnerKey = keys.next();
+            try {
+                JSONObject partnerObject = (JSONObject) partners.get(partnerKey);
+                if (partnerObject.has(partnerUserKey) && partnerObject.has(partnerPasswordKey)) {
+                    String url = null;
+                    if (partnerObject.has(partnerUrlKey)) {
+                        url = partnerObject.getString(partnerUrlKey);
+                    }
+                    String userName = partnerObject.getString(partnerUserKey);
+                    String password = partnerObject.getString(partnerPasswordKey);
+                    PartnerDetails details = new PartnerDetails(userName, getObfuscatedVal(password), url);
+                    partnerStore.put(partnerKey, details);
+                    log.info("mapped partner using partner key " + partnerKey);
+                } else {
+                    log.info("Partner " + partnerKey + " is missing required keys, it won't be mapped");
+                }
+            } catch (JSONException e) {
+                log.info("Couldn't map the partner using partner key " + partnerKey, e);
+            }
+        }
+    }
+
+    /* Unobfuscate param value */
+    private static String getObfuscatedVal(String paramValue) {
+        String resValue = paramValue;
+        if (paramValue != null && paramValue.startsWith("${") && paramValue.endsWith("}"))
+        {
+            String paramStr = paramValue.substring(2, paramValue.length()-1);
+            if (paramStr  != null && paramStr.length() > 0)
+            {
+                String val = System.getenv(paramStr);
+                if (val != null && val.length() > 0)
+                {
+                    resValue=val;
+                    log.info("Obfuscated value RESET for param value:" + paramValue);
+                }
+            }
+        }
+        return resValue;
     }
 
     /**
      * Returns parameters from the parameter map.
      *
      * @param paramMap parameter map
-     * @param p        parameters instance
+     * @param p parameters instance
      * @return parameters filed instance
      * @throws SvcLogicException when svc logic exception occurs
      */
-    public static Parameters getParameters(Map<String, String> paramMap,
-        Parameters p)
-        throws SvcLogicException {
-        p.templateFileName = parseParam(paramMap, "templateFileName",
-            false, null);
+    public static Parameters getParameters(Map<String, String> paramMap, Parameters p) throws SvcLogicException {
+
+        p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
         p.requestBody = parseParam(paramMap, "requestBody", false, null);
-        p.restapiUrl = parseParam(paramMap, "restapiUrl", true, null);
+        p.restapiUrl = parseParam(paramMap, restapiUrlString, true, null);
+        p.restapiUrlSuffix = parseParam(paramMap, "restapiUrlSuffix", false, null);
+        if (p.restapiUrlSuffix != null) {
+            p.restapiUrl = p.restapiUrl + p.restapiUrlSuffix;
+        }
+
+        p.restapiUrl = UriBuilder.fromUri(p.restapiUrl).toTemplate();
         validateUrl(p.restapiUrl);
-        p.restapiUser = parseParam(paramMap, "restapiUser", false, null);
-        p.restapiPassword = parseParam(paramMap, "restapiPassword", false,
-            null);
-        p.oAuthConsumerKey = parseParam(paramMap, "oAuthConsumerKey",
-            false, null);
-        p.oAuthConsumerSecret = parseParam(paramMap, "oAuthConsumerSecret",
-            false, null);
-        p.oAuthSignatureMethod = parseParam(paramMap, "oAuthSignatureMethod",
-            false, null);
+
+        p.restapiUser = parseParam(paramMap, restapiUserKey, false, null);
+        p.restapiPassword = parseParam(paramMap, restapiPasswordKey, false, null);
+        p.oAuthConsumerKey = parseParam(paramMap, "oAuthConsumerKey", false, null);
+        p.oAuthConsumerSecret = parseParam(paramMap, "oAuthConsumerSecret", false, null);
+        p.oAuthSignatureMethod = parseParam(paramMap, "oAuthSignatureMethod", false, null);
         p.oAuthVersion = parseParam(paramMap, "oAuthVersion", false, null);
         p.contentType = parseParam(paramMap, "contentType", false, null);
-        p.format = Format.fromString(parseParam(paramMap, "format", false,
-            "json"));
-        p.authtype = fromString(parseParam(paramMap, "authType", false,
-            "unspecified"));
-        p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod",
-            false, "post"));
-        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
+        p.format = Format.fromString(parseParam(paramMap, "format", false, "json"));
+        p.authtype = fromString(parseParam(paramMap, "authType", false, "unspecified"));
+        p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
+        p.responsePrefix = parseParam(paramMap, responsePrefix, false, null);
         p.listNameList = getListNameList(paramMap);
-        String skipSendingStr = paramMap.get("skipSending");
+        String skipSendingStr = paramMap.get(skipSendingMessage);
         p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
-        p.convertResponse = valueOf(parseParam(paramMap, "convertResponse",
-            false, "true"));
-        p.trustStoreFileName = parseParam(paramMap, "trustStoreFileName",
-            false, null);
-        p.trustStorePassword = parseParam(paramMap, "trustStorePassword",
-            false, null);
-        p.keyStoreFileName = parseParam(paramMap, "keyStoreFileName",
-            false, null);
-        p.keyStorePassword = parseParam(paramMap, "keyStorePassword",
-            false, null);
-        p.ssl = p.trustStoreFileName != null && p.trustStorePassword != null
-            && p.keyStoreFileName != null && p.keyStorePassword != null;
-        p.customHttpHeaders = parseParam(paramMap, "customHttpHeaders",
-            false, null);
+        p.convertResponse = valueOf(parseParam(paramMap, "convertResponse", false, "true"));
+        p.trustStoreFileName = parseParam(paramMap, "trustStoreFileName", false, null);
+        p.trustStorePassword = parseParam(paramMap, "trustStorePassword", false, null);
+        p.keyStoreFileName = parseParam(paramMap, "keyStoreFileName", false, null);
+        p.keyStorePassword = parseParam(paramMap, "keyStorePassword", false, null);
+        p.ssl = p.trustStoreFileName != null && p.trustStorePassword != null && p.keyStoreFileName != null
+            && p.keyStorePassword != null;
+        p.customHttpHeaders = parseParam(paramMap, "customHttpHeaders", false, null);
         p.partner = parseParam(paramMap, "partner", false, null);
-        p.dumpHeaders = valueOf(parseParam(paramMap, "dumpHeaders",
-            false, null));
-        p.returnRequestPayload = valueOf(parseParam(
-            paramMap, "returnRequestPayload", false, null));
+        p.dumpHeaders = valueOf(parseParam(paramMap, "dumpHeaders", false, null));
+        p.returnRequestPayload = valueOf(parseParam(paramMap, "returnRequestPayload", false, null));
+        p.accept = parseParam(paramMap, "accept", false, null);
+        p.multipartFormData = valueOf(parseParam(paramMap, "multipartFormData", false, "false"));
+        p.multipartFile = parseParam(paramMap, "multipartFile", false, null);
         return p;
     }
 
@@ -166,13 +232,18 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
      * @param restapiUrl rest api URL
      * @throws SvcLogicException when URL validation fails
      */
-    private static void validateUrl(String restapiUrl)
-        throws SvcLogicException {
-        try {
-            URI.create(restapiUrl);
-        } catch (IllegalArgumentException e) {
-            throw new SvcLogicException("Invalid input of url "
-                + e.getLocalizedMessage(), e);
+    private static void validateUrl(String restapiUrl) throws SvcLogicException {
+        if (restapiUrl.contains(",")) {
+            String[] urls = restapiUrl.split(",");
+            for (String url : urls) {
+                validateUrl(url);
+            }
+        } else {
+            try {
+                URI.create(restapiUrl);
+            } catch (IllegalArgumentException e) {
+                throw new SvcLogicException("Invalid input of url " + e.getLocalizedMessage(), e);
+            }
         }
     }
 
@@ -193,18 +264,17 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     }
 
     /**
-     * Parses the parameter string map of property, validates if required,
-     * assigns default value if present and returns the value.
+     * Parses the parameter string map of property, validates if required, assigns default value if
+     * present and returns the value.
      *
      * @param paramMap string param map
-     * @param name     name of the property
+     * @param name name of the property
      * @param required if value required
-     * @param def      default value
+     * @param def default value
      * @return value of the property
      * @throws SvcLogicException if required parameter value is empty
      */
-    public static String parseParam(Map<String, String> paramMap, String name,
-        boolean required, String def)
+    public static String parseParam(Map<String, String> paramMap, String name, boolean required, String def)
         throws SvcLogicException {
         String s = paramMap.get(name);
 
@@ -239,45 +309,148 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
         value.append(s.substring(i));
 
-        log.info("Parameter {}: [{}]", name, value);
-        return value.toString();
-    }
+        log.info("Parameter {}: [{}]", name, maskPassword(name, value));
 
-    public RetryPolicyStore getRetryPolicyStore() {
-        return retryPolicyStore;
+        return value.toString();
     }
 
-    public void setRetryPolicyStore(RetryPolicyStore retryPolicyStore) {
-        this.retryPolicyStore = retryPolicyStore;
+    private static Object maskPassword(String name, Object value) {
+        String[] pwdNames = {"pwd", "passwd", "password", "Pwd", "Passwd", "Password"};
+        for (String pwdName : pwdNames) {
+            if (name.contains(pwdName)) {
+                return "**********";
+            }
+        }
+        return value;
     }
 
     /**
-     * Allows Directed Graphs  the ability to interact with REST APIs.
+     * Allows Directed Graphs the ability to interact with REST APIs.
+     *
      * @param paramMap HashMap<String,String> of parameters passed by the DG to this function
-     * <table border="1">
-     *  <thead><th>parameter</th><th>Mandatory/Optional</th><th>description</th><th>example values</th></thead>
-     *  <tbody>
-     *      <tr><td>templateFileName</td><td>Optional</td><td>full path to template file that can be used to build a request</td><td>/sdncopt/bvc/restapi/templates/vnf_service-configuration-operation_minimal.json</td></tr>
-     *      <tr><td>restapiUrl</td><td>Mandatory</td><td>url to send the request to</td><td>https://sdncodl:8543/restconf/operations/L3VNF-API:create-update-vnf-request</td></tr>
-     *      <tr><td>restapiUser</td><td>Optional</td><td>user name to use for http basic authentication</td><td>sdnc_ws</td></tr>
-     *      <tr><td>restapiPassword</td><td>Optional</td><td>unencrypted password to use for http basic authentication</td><td>plain_password</td></tr>
-     *      <tr><td>oAuthConsumerKey</td><td>Optional</td><td>Consumer key to use for http oAuth authentication</td><td>plain_key</td></tr>
-     *      <tr><td>oAuthConsumerSecret</td><td>Optional</td><td>Consumer secret to use for http oAuth authentication</td><td>plain_secret</td></tr>
-     *      <tr><td>oAuthSignatureMethod</td><td>Optional</td><td>Consumer method to use for http oAuth authentication</td><td>method</td></tr>
-     *      <tr><td>oAuthVersion</td><td>Optional</td><td>Version http oAuth authentication</td><td>version</td></tr>
-     *      <tr><td>contentType</td><td>Optional</td><td>http content type to set in the http header</td><td>usually application/json or application/xml</td></tr>
-     *      <tr><td>format</td><td>Optional</td><td>should match request body format</td><td>json or xml</td></tr>
-     *      <tr><td>httpMethod</td><td>Optional</td><td>http method to use when sending the request</td><td>get post put delete patch</td></tr>
-     *      <tr><td>responsePrefix</td><td>Optional</td><td>location the response will be written to in context memory</td><td>tmp.restapi.result</td></tr>
-     *      <tr><td>listName[i]</td><td>Optional</td><td>Used for processing XML responses with repeating elements.</td>vpn-information.vrf-details<td></td></tr>
-     *      <tr><td>skipSending</td><td>Optional</td><td></td><td>true or false</td></tr>
-     *      <tr><td>convertResponse </td><td>Optional</td><td>whether the response should be converted</td><td>true or false</td></tr>
-     *      <tr><td>customHttpHeaders</td><td>Optional</td><td>a list additional http headers to be passed in, follow the format in the example</td><td>X-CSI-MessageId=messageId,headerFieldName=headerFieldValue</td></tr>
-     *      <tr><td>dumpHeaders</td><td>Optional</td><td>when true writes http header content to context memory</td><td>true or false</td></tr>
-     *      <tr><td>partner</td><td>Optional</td><td>needed for DME2 calls</td><td>dme2proxy</td></tr>
-     *      <tr><td>returnRequestPayload</td><td>Optional</td><td>used to return payload built in the request</td><td>true or false</td></tr>
-     *  </tbody>
-     * </table>
+     *        <table border="1">
+     *        <thead>
+     *        <th>parameter</th>
+     *        <th>Mandatory/Optional</th>
+     *        <th>description</th>
+     *        <th>example values</th></thead> <tbody>
+     *        <tr>
+     *        <td>templateFileName</td>
+     *        <td>Optional</td>
+     *        <td>full path to template file that can be used to build a request</td>
+     *        <td>/sdncopt/bvc/restapi/templates/vnf_service-configuration-operation_minimal.json</td>
+     *        </tr>
+     *        <tr>
+     *        <td>restapiUrl</td>
+     *        <td>Mandatory</td>
+     *        <td>url to send the request to</td>
+     *        <td>https://sdncodl:8543/restconf/operations/L3VNF-API:create-update-vnf-request</td>
+     *        </tr>
+     *        <tr>
+     *        <td>restapiUser</td>
+     *        <td>Optional</td>
+     *        <td>user name to use for http basic authentication</td>
+     *        <td>sdnc_ws</td>
+     *        </tr>
+     *        <tr>
+     *        <td>restapiPassword</td>
+     *        <td>Optional</td>
+     *        <td>unencrypted password to use for http basic authentication</td>
+     *        <td>plain_password</td>
+     *        </tr>
+     *        <tr>
+     *        <td>oAuthConsumerKey</td>
+     *        <td>Optional</td>
+     *        <td>Consumer key to use for http oAuth authentication</td>
+     *        <td>plain_key</td>
+     *        </tr>
+     *        <tr>
+     *        <td>oAuthConsumerSecret</td>
+     *        <td>Optional</td>
+     *        <td>Consumer secret to use for http oAuth authentication</td>
+     *        <td>plain_secret</td>
+     *        </tr>
+     *        <tr>
+     *        <td>oAuthSignatureMethod</td>
+     *        <td>Optional</td>
+     *        <td>Consumer method to use for http oAuth authentication</td>
+     *        <td>method</td>
+     *        </tr>
+     *        <tr>
+     *        <td>oAuthVersion</td>
+     *        <td>Optional</td>
+     *        <td>Version http oAuth authentication</td>
+     *        <td>version</td>
+     *        </tr>
+     *        <tr>
+     *        <td>contentType</td>
+     *        <td>Optional</td>
+     *        <td>http content type to set in the http header</td>
+     *        <td>usually application/json or application/xml</td>
+     *        </tr>
+     *        <tr>
+     *        <td>format</td>
+     *        <td>Optional</td>
+     *        <td>should match request body format</td>
+     *        <td>json or xml</td>
+     *        </tr>
+     *        <tr>
+     *        <td>httpMethod</td>
+     *        <td>Optional</td>
+     *        <td>http method to use when sending the request</td>
+     *        <td>get post put delete patch</td>
+     *        </tr>
+     *        <tr>
+     *        <td>responsePrefix</td>
+     *        <td>Optional</td>
+     *        <td>location the response will be written to in context memory</td>
+     *        <td>tmp.restapi.result</td>
+     *        </tr>
+     *        <tr>
+     *        <td>listName[i]</td>
+     *        <td>Optional</td>
+     *        <td>Used for processing XML responses with repeating
+     *        elements.</td>vpn-information.vrf-details
+     *        <td></td>
+     *        </tr>
+     *        <tr>
+     *        <td>skipSending</td>
+     *        <td>Optional</td>
+     *        <td></td>
+     *        <td>true or false</td>
+     *        </tr>
+     *        <tr>
+     *        <td>convertResponse</td>
+     *        <td>Optional</td>
+     *        <td>whether the response should be converted</td>
+     *        <td>true or false</td>
+     *        </tr>
+     *        <tr>
+     *        <td>customHttpHeaders</td>
+     *        <td>Optional</td>
+     *        <td>a list additional http headers to be passed in, follow the format in the example</td>
+     *        <td>X-CSI-MessageId=messageId,headerFieldName=headerFieldValue</td>
+     *        </tr>
+     *        <tr>
+     *        <td>dumpHeaders</td>
+     *        <td>Optional</td>
+     *        <td>when true writes http header content to context memory</td>
+     *        <td>true or false</td>
+     *        </tr>
+     *        <tr>
+     *        <td>partner</td>
+     *        <td>Optional</td>
+     *        <td>used to retrieve username, password and url if partner store exists</td>
+     *        <td>aaf</td>
+     *        </tr>
+     *        <tr>
+     *        <td>returnRequestPayload</td>
+     *        <td>Optional</td>
+     *        <td>used to return payload built in the request</td>
+     *        <td>true or false</td>
+     *        </tr>
+     *        </tbody>
+     *        </table>
      * @param ctx Reference to context memory
      * @throws SvcLogicException
      * @since 11.0.2
@@ -287,15 +460,17 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         sendRequest(paramMap, ctx, null);
     }
 
-    public void sendRequest(Map<String, String> paramMap, SvcLogicContext ctx, Integer retryCount)
+    protected void sendRequest(Map<String, String> paramMap, SvcLogicContext ctx, RetryPolicy retryPolicy)
         throws SvcLogicException {
 
-        RetryPolicy retryPolicy = null;
         HttpResponse r = new HttpResponse();
         try {
+            handlePartner(paramMap);
             Parameters p = getParameters(paramMap, new Parameters());
-            if (p.partner != null) {
-                retryPolicy = retryPolicyStore.getRetryPolicy(p.partner);
+            if (p.restapiUrl.contains(",") && retryPolicy == null) {
+                String[] urls = p.restapiUrl.split(",");
+                retryPolicy = new RetryPolicy(urls, urls.length * 2);
+                p.restapiUrl = urls[0];
             }
             String pp = p.responsePrefix != null ? p.responsePrefix + '.' : "";
 
@@ -344,40 +519,26 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             }
 
             log.error("Error sending the request: " + e.getMessage(), e);
-            String prefix = parseParam(paramMap, "responsePrefix", false, null);
-            if (retryPolicy == null || shouldRetry == false) {
+            String prefix = parseParam(paramMap, responsePrefix, false, null);
+            if (retryPolicy == null || !shouldRetry) {
                 setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
             } else {
-                if (retryCount == null) {
-                    retryCount = 0;
-                }
-                String retryMessage = retryCount + " attempts were made out of " + retryPolicy.getMaximumRetries() +
-                    " maximum retries.";
-                log.debug(retryMessage);
+                log.debug(retryPolicy.getRetryMessage());
                 try {
-                    retryCount = retryCount + 1;
-                    if (retryCount < retryPolicy.getMaximumRetries() + 1) {
-                        URI uri = new URI(paramMap.get("restapiUrl"));
-                        String hostname = uri.getHost();
-                        String retryString = retryPolicy.getNextHostName(uri.toString());
-                        URI uriTwo = new URI(retryString);
-                        URI retryUri = UriBuilder.fromUri(uri).host(uriTwo.getHost()).port(uriTwo.getPort()).scheme(
-                            uriTwo.getScheme()).build();
-                        paramMap.put("restapiUrl", retryUri.toString());
-                        log.debug("URL was set to {}", retryUri.toString());
-                        log.debug("Failed to communicate with host {}. Request will be re-attempted using the host {}.",
-                            hostname, retryString);
-                        log.debug("This is retry attempt {} out of {}", retryCount, retryPolicy.getMaximumRetries());
-                        sendRequest(paramMap, ctx, retryCount);
+                    // calling getNextHostName increments the retry count so it should be called before shouldRetry
+                    String retryString = retryPolicy.getNextHostName();
+                    if (retryPolicy.shouldRetry()) {
+                        paramMap.put(restapiUrlString, retryString);
+                        log.debug("retry attempt {} will use the retry url {}", retryPolicy.getRetryCount(),
+                            retryString);
+                        sendRequest(paramMap, ctx, retryPolicy);
                     } else {
-                        log.debug("Maximum retries reached, calling setFailureResponseStatus.");
+                        log.debug("Maximum retries reached, won't attempt to retry. Calling setFailureResponseStatus.");
                         setFailureResponseStatus(ctx, prefix, e.getMessage(), r);
                     }
                 } catch (Exception ex) {
-                    log.error("Could not attempt retry.", ex);
-                    String retryErrorMessage =
-                        "Retry attempt has failed. No further retry shall be attempted, calling " +
-                            "setFailureResponseStatus.";
+                    String retryErrorMessage = "Retry attempt " + retryPolicy.getRetryCount()
+                        + "has failed with error message " + ex.getMessage();
                     setFailureResponseStatus(ctx, prefix, retryErrorMessage, r);
                 }
             }
@@ -388,10 +549,22 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
     }
 
-    protected String buildXmlJsonRequest(SvcLogicContext ctx, String template, Format format)
-        throws SvcLogicException {
+    protected void handlePartner(Map<String, String> paramMap) {
+        String partner = paramMap.get("partner");
+        if (partner != null && partner.length() > 0) {
+            PartnerDetails details = partnerStore.get(partner);
+            paramMap.put(restapiUserKey, details.username);
+            paramMap.put(restapiPasswordKey, details.password);
+            if (paramMap.get(restapiUrlString) == null) {
+                paramMap.put(restapiUrlString, details.url);
+            }
+        }
+    }
+
+    protected String buildXmlJsonRequest(SvcLogicContext ctx, String template, Format format) throws SvcLogicException {
         log.info("Building {} started", format);
         long t1 = System.currentTimeMillis();
+        String originalTemplate = template;
 
         template = expandRepeats(ctx, template, 1);
 
@@ -416,7 +589,6 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
 
             String var1 = template.substring(i1 + 2, i2);
             String value1 = format == Format.XML ? XmlJsonUtil.getXml(mm, var1) : XmlJsonUtil.getJson(mm, var1);
-            // log.info(" " + var1 + ": " + value1);
             if (value1 == null || value1.trim().length() == 0) {
                 // delete the whole element (line)
                 int i3 = template.lastIndexOf('\n', i1);
@@ -438,15 +610,15 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             }
         }
 
-        String req = format == Format.XML
-            ? XmlJsonUtil.removeEmptyStructXml(ss.toString()) : XmlJsonUtil.removeEmptyStructJson(ss.toString());
+        String req = format == Format.XML ? XmlJsonUtil.removeEmptyStructXml(ss.toString())
+            : XmlJsonUtil.removeEmptyStructJson(originalTemplate, ss.toString());
 
         if (format == Format.JSON) {
             req = XmlJsonUtil.removeLastCommaJson(req);
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Building {} completed. Time: {}", format, (t2 - t1));
+        log.info("Building {} completed. Time: {}", format, t2 - t1);
 
         return req;
     }
@@ -542,16 +714,16 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         return addAuthType(c, p);
     }
 
-    protected Client addAuthType(Client client, Parameters p) throws SvcLogicException {
+    public Client addAuthType(Client client, Parameters p) throws SvcLogicException {
         if (p.authtype == AuthType.Unspecified) {
             if (p.restapiUser != null && p.restapiPassword != null) {
                 client.register(HttpAuthenticationFeature.basic(p.restapiUser, p.restapiPassword));
-            } else if (p.oAuthConsumerKey != null && p.oAuthConsumerSecret != null
-                && p.oAuthSignatureMethod != null) {
-                Feature oAuth1Feature = OAuth1ClientSupport
-                    .builder(new ConsumerCredentials(p.oAuthConsumerKey, p.oAuthConsumerSecret))
-                    .version(p.oAuthVersion).signatureMethod(p.oAuthSignatureMethod).feature().build();
+            } else if (p.oAuthConsumerKey != null && p.oAuthConsumerSecret != null && p.oAuthSignatureMethod != null) {
+                Feature oAuth1Feature =
+                    OAuth1ClientSupport.builder(new ConsumerCredentials(p.oAuthConsumerKey, p.oAuthConsumerSecret))
+                        .version(p.oAuthVersion).signatureMethod(p.oAuthSignatureMethod).feature().build();
                 client.register(oAuth1Feature);
+
             }
         } else {
             if (p.authtype == AuthType.DIGEST) {
@@ -559,16 +731,18 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                     client.register(HttpAuthenticationFeature.digest(p.restapiUser, p.restapiPassword));
                 } else {
                     throw new SvcLogicException(
-                        "oAUTH authentication type selected but all restapiUser and restapiPassword " +
-                            "parameters doesn't exist", new Throwable());
+                        "oAUTH authentication type selected but all restapiUser and restapiPassword "
+                            + "parameters doesn't exist",
+                        new Throwable());
                 }
             } else if (p.authtype == AuthType.BASIC) {
                 if (p.restapiUser != null && p.restapiPassword != null) {
                     client.register(HttpAuthenticationFeature.basic(p.restapiUser, p.restapiPassword));
                 } else {
                     throw new SvcLogicException(
-                        "oAUTH authentication type selected but all restapiUser and restapiPassword " +
-                            "parameters doesn't exist", new Throwable());
+                        "oAUTH authentication type selected but all restapiUser and restapiPassword "
+                            + "parameters doesn't exist",
+                        new Throwable());
                 }
             } else if (p.authtype == AuthType.OAUTH) {
                 if (p.oAuthConsumerKey != null && p.oAuthConsumerSecret != null && p.oAuthSignatureMethod != null) {
@@ -578,8 +752,9 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                     client.register(oAuth1Feature);
                 } else {
                     throw new SvcLogicException(
-                        "oAUTH authentication type selected but all oAuthConsumerKey, oAuthConsumerSecret " +
-                            "and oAuthSignatureMethod parameters doesn't exist", new Throwable());
+                        "oAUTH authentication type selected but all oAuthConsumerKey, oAuthConsumerSecret "
+                            + "and oAuthSignatureMethod parameters doesn't exist",
+                        new Throwable());
                 }
             }
         }
@@ -590,12 +765,11 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
      * Receives the http response for the http request sent.
      *
      * @param request request msg
-     * @param p       parameters
+     * @param p parameters
      * @return HTTP response
      * @throws SvcLogicException when sending http request fails
      */
-    public HttpResponse sendHttpRequest(String request, Parameters p)
-        throws SvcLogicException {
+    public HttpResponse sendHttpRequest(String request, Parameters p) throws SvcLogicException {
 
         SSLContext ssl = null;
         if (p.ssl && p.restapiUrl.startsWith("https")) {
@@ -605,32 +779,87 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
 
         if (ssl != null) {
             HttpsURLConnection.setDefaultSSLSocketFactory(ssl.getSocketFactory());
-            client = ClientBuilder.newBuilder().sslContext(ssl).hostnameVerifier((s, sslSession) -> true)
-                .build();
+            client = ClientBuilder.newBuilder().sslContext(ssl).hostnameVerifier((s, sslSession) -> true).build();
         } else {
-            client = ClientBuilder.newBuilder().hostnameVerifier((s, sslSession) -> true)
-                .build();
+            client = ClientBuilder.newBuilder().hostnameVerifier((s, sslSession) -> true).build();
         }
-        client.property(ClientProperties.CONNECT_TIMEOUT, 5000);
-
+        setClientTimeouts(client);
+        // Needed to support additional HTTP methods such as PATCH
+        client.property(HttpUrlConnectorProvider.SET_METHOD_WORKAROUND, true);
+        client.register(new MetricLogClientFilter());
         WebTarget webTarget = addAuthType(client, p).target(p.restapiUrl);
 
-        log.info("Sending request:");
-        log.info(request);
         long t1 = System.currentTimeMillis();
 
         HttpResponse r = new HttpResponse();
         r.code = 200;
+        String accept = p.accept;
+        if (accept == null) {
+            accept = p.format == Format.XML ? "application/xml" : "application/json";
+        }
 
-        if (!p.skipSending) {
-            String tt = p.format == Format.XML ? "application/xml" : "application/json";
-            String tt1 = tt + ";charset=UTF-8";
-            if (p.contentType != null) {
-                tt = p.contentType;
-                tt1 = p.contentType;
+        String contentType = p.contentType;
+        if (contentType == null) {
+            contentType = accept + ";charset=UTF-8";
+        }
+
+        if (!p.skipSending && !p.multipartFormData) {
+
+            Invocation.Builder invocationBuilder = webTarget.request(contentType).accept(accept);
+
+            if (p.format == Format.NONE) {
+                invocationBuilder.header("", "");
             }
 
-            Invocation.Builder invocationBuilder = webTarget.request(tt1).accept(tt);
+            if (p.customHttpHeaders != null && p.customHttpHeaders.length() > 0) {
+                String[] keyValuePairs = p.customHttpHeaders.split(",");
+                for (String singlePair : keyValuePairs) {
+                    int equalPosition = singlePair.indexOf('=');
+                    invocationBuilder.header(singlePair.substring(0, equalPosition),
+                        singlePair.substring(equalPosition + 1, singlePair.length()));
+                }
+            }
+
+            invocationBuilder.property(ClientProperties.SUPPRESS_HTTP_COMPLIANCE_VALIDATION, true);
+
+            Response response;
+
+            try {
+                // When the HTTP operation has no body do not set the content-type
+                //setting content-type has caused errors with some servers when no body is present
+                if (request == null) {
+                    response = invocationBuilder.method(p.httpMethod.toString());
+                } else {
+                    log.info("Sending request below to url " + p.restapiUrl);
+                    log.info(request);
+                    response = invocationBuilder.method(p.httpMethod.toString(), entity(request, contentType));
+                }
+            } catch (ProcessingException | IllegalStateException e) {
+                throw new SvcLogicException(requestPostingException + e.getLocalizedMessage(), e);
+            }
+
+            r.code = response.getStatus();
+            r.headers = response.getStringHeaders();
+            EntityTag etag = response.getEntityTag();
+            if (etag != null) {
+                r.message = etag.getValue();
+            }
+            if (response.hasEntity() && r.code != 204) {
+                r.body = response.readEntity(String.class);
+            }
+        } else if (!p.skipSending && p.multipartFormData) {
+
+            WebTarget wt = client.register(MultiPartFeature.class).target(p.restapiUrl);
+
+            MultiPart multiPart = new MultiPart();
+            multiPart.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE);
+
+            FileDataBodyPart fileDataBodyPart =
+                new FileDataBodyPart("file", new File(p.multipartFile), MediaType.APPLICATION_OCTET_STREAM_TYPE);
+            multiPart.bodyPart(fileDataBodyPart);
+
+
+            Invocation.Builder invocationBuilder = wt.request(contentType).accept(accept);
 
             if (p.format == Format.NONE) {
                 invocationBuilder.header("", "");
@@ -650,10 +879,10 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             Response response;
 
             try {
-                response = invocationBuilder.method(p.httpMethod.toString(), entity(request, tt1));
+                response =
+                    invocationBuilder.method(p.httpMethod.toString(), entity(multiPart, multiPart.getMediaType()));
             } catch (ProcessingException | IllegalStateException e) {
-                throw new SvcLogicException("Exception while posting http request to client " +
-                    e.getLocalizedMessage(), e);
+                throw new SvcLogicException(requestPostingException + e.getLocalizedMessage(), e);
             }
 
             r.code = response.getStatus();
@@ -665,11 +894,12 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             if (response.hasEntity() && r.code != 204) {
                 r.body = response.readEntity(String.class);
             }
+
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Response received. Time: {}", (t2 - t1));
-        log.info("HTTP response code: {}", r.code);
+        log.info(responseReceivedMessage, t2 - t1);
+        log.info(responseHttpCodeMessage, r.code);
         log.info("HTTP response message: {}", r.message);
         logHeaders(r.headers);
         log.info("HTTP response: {}", r.body);
@@ -730,7 +960,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             r = new HttpResponse();
             r.code = 500;
             r.message = e.getMessage();
-            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            String prefix = parseParam(paramMap, responsePrefix, false, null);
             setResponseStatus(ctx, prefix, r);
         }
 
@@ -746,8 +976,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.user = parseParam(paramMap, "user", false, null);
         p.password = parseParam(paramMap, "password", false, null);
         p.httpMethod = HttpMethod.fromString(parseParam(paramMap, "httpMethod", false, "post"));
-        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-        String skipSendingStr = paramMap.get("skipSending");
+        p.responsePrefix = parseParam(paramMap, responsePrefix, false, null);
+        String skipSendingStr = paramMap.get(skipSendingMessage);
         p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         p.oAuthConsumerKey = parseParam(paramMap, "oAuthConsumerKey", false, null);
         p.oAuthVersion = parseParam(paramMap, "oAuthVersion", false, null);
@@ -787,7 +1017,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             r = new HttpResponse();
             r.code = 500;
             r.message = e.getMessage();
-            String prefix = parseParam(paramMap, "responsePrefix", false, null);
+            String prefix = parseParam(paramMap, responsePrefix, false, null);
             setResponseStatus(ctx, prefix, r);
         }
 
@@ -799,7 +1029,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
     protected HttpResponse sendHttpData(byte[] data, FileParam p) throws SvcLogicException {
 
         Client client = ClientBuilder.newBuilder().build();
-        client.property(ClientProperties.CONNECT_TIMEOUT, 5000);
+        setClientTimeouts(client);
         client.property(ClientProperties.FOLLOW_REDIRECTS, true);
         WebTarget webTarget = addAuthType(client, p).target(p.url);
 
@@ -824,8 +1054,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                     throw new SvcLogicException("Http operation" + p.httpMethod + "not supported");
                 }
             } catch (ProcessingException e) {
-                throw new SvcLogicException("Exception while posting http request to client " +
-                    e.getLocalizedMessage(), e);
+                throw new SvcLogicException(requestPostingException + e.getLocalizedMessage(), e);
             }
 
             r.code = response.getStatus();
@@ -855,8 +1084,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
                         throw new SvcLogicException("Http operation" + p.httpMethod + "not supported");
                     }
                 } catch (ProcessingException e) {
-                    throw new SvcLogicException("Exception while posting http request to client " +
-                        e.getLocalizedMessage(), e);
+                    throw new SvcLogicException(requestPostingException + e.getLocalizedMessage(), e);
                 }
 
                 r.code = response.getStatus();
@@ -871,8 +1099,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Response received. Time: {}", (t2 - t1));
-        log.info("HTTP response code: {}", r.code);
+        log.info(responseReceivedMessage, t2 - t1);
+        log.info(responseHttpCodeMessage, r.code);
         log.info("HTTP response message: {}", r.message);
         logHeaders(r.headers);
         log.info("HTTP response: {}", r.body);
@@ -885,8 +1113,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         p.topic = parseParam(paramMap, "topic", true, null);
         p.templateFileName = parseParam(paramMap, "templateFileName", false, null);
         p.rootVarName = parseParam(paramMap, "rootVarName", false, null);
-        p.responsePrefix = parseParam(paramMap, "responsePrefix", false, null);
-        String skipSendingStr = paramMap.get("skipSending");
+        p.responsePrefix = parseParam(paramMap, responsePrefix, false, null);
+        String skipSendingStr = paramMap.get(skipSendingMessage);
         p.skipSending = "true".equalsIgnoreCase(skipSendingStr);
         return p;
     }
@@ -932,7 +1160,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
 
         Client client = ClientBuilder.newBuilder().build();
-        client.property(ClientProperties.CONNECT_TIMEOUT, 5000);
+        setClientTimeouts(client);
         WebTarget webTarget = client.target(urls[0]);
 
         log.info("UEB URL: {}", urls[0]);
@@ -953,8 +1181,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
             try {
                 response = invocationBuilder.post(Entity.entity(request, tt1));
             } catch (ProcessingException e) {
-                throw new SvcLogicException("Exception while posting http request to client " +
-                    e.getLocalizedMessage(), e);
+                throw new SvcLogicException(requestPostingException + e.getLocalizedMessage(), e);
             }
             r.code = response.getStatus();
             r.headers = response.getStringHeaders();
@@ -964,8 +1191,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         }
 
         long t2 = System.currentTimeMillis();
-        log.info("Response received. Time: {}", (t2 - t1));
-        log.info("HTTP response code: {}", r.code);
+        log.info(responseReceivedMessage, t2 - t1);
+        log.info(responseHttpCodeMessage, r.code);
         logHeaders(r.headers);
         log.info("HTTP response:\n {}", r.body);
 
@@ -980,6 +1207,24 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         this.defaultUebTemplateFileName = defaultUebTemplateFileName;
     }
 
+    protected void setClientTimeouts(Client client) {
+        client.property(ClientProperties.CONNECT_TIMEOUT, httpConnectTimeout);
+        client.property(ClientProperties.READ_TIMEOUT, httpReadTimeout);
+    }
+
+    protected Integer readOptionalInteger(String propertyName, Integer defaultValue) {
+        String stringValue = System.getProperty(propertyName);
+        if (stringValue != null && stringValue.length() > 0) {
+            try {
+                return Integer.valueOf(stringValue);
+            } catch (NumberFormatException e) {
+                log.warn("property " + propertyName + " had the value " + stringValue + " that could not be converted to an Integer, default " + defaultValue + " will be used instead", e);
+            }
+        }
+        return defaultValue;
+    }
+
+
     private static class FileParam {
 
         public String fileName;
@@ -1004,4 +1249,4 @@ public class RestapiCallNode implements SvcLogicJavaPlugin {
         public String responsePrefix;
         public boolean skipSending;
     }
-}
\ No newline at end of file
+}