Fix sonar issues and restore java style format

Reformat code according to Java Code Guidelines.
Refactor of DebugLog test + new JUnits

Change-Id: I4f8f03d133180f9315ab596e1093f44582d08068
Issue-ID: APPC-417
Signed-off-by: Michal Kabaj <michal.kabaj@nokia.com>

3 files changed, 974 insertions, 1021 deletions

diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
index eabe4d01b..d70f6d569 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/ConfigComponentAdaptor.java
@@ -1,26 +1,23 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APPC
+ * ONAP : APP-C
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2017 AT&T Intellectual Property.All rights reserved.
  * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *     http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
+
 package org.onap.appc.ccadaptor;
 
 import com.att.eelf.configuration.EELFLogger;
@@ -36,6 +33,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.HttpURLConnection;
+import java.nio.file.Paths;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -44,1006 +42,917 @@ import java.util.StringTokenizer;
 import org.onap.ccsdk.sli.core.sli.SvcLogicAdaptor;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 
-public class ConfigComponentAdaptor implements SvcLogicAdaptor
-{
-  private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigComponentAdaptor.class);
-
-  private String configUrl = null;
-  private String configUser = null;
-  private String configPassword = null;
-  private String auditUrl = null;
-  private String auditUser = null;
-  private String auditPassword = null;
-  private String configCallbackUrl = null;
-  private String auditCallbackUrl = null;
-  DebugLog debugLog = new DebugLog();
-
-  public ConfigComponentAdaptor(Properties props)
-  {
-    if (props != null)
-    {
-      configUrl = props.getProperty("configComponent.url", "");
-      configUser = props.getProperty("configComponent.user", "");
-      configPassword = props.getProperty("configComponent.passwd", "");
-      auditUrl = props.getProperty("auditComponent.url", "");
-      auditUser = props.getProperty("auditComponent.user", "");
-      auditPassword = props.getProperty("auditComponent.passwd", "");
-      configCallbackUrl = props.getProperty("service-configuration-notification-url", "");
-      auditCallbackUrl = props.getProperty("audit-configuration-notification-url", "");
-    }
-    else
-    {
-      configUrl = "";
-      configUser = "";
-      configPassword = "";
-      auditUrl = "";
-      auditUser = "";
-      auditPassword = "";
-      configCallbackUrl = "";
-      auditCallbackUrl = "";
-    }
-  }
-
-  @Override
-  public ConfigStatus configure(String key, Map<String, String> parameters, SvcLogicContext ctx)
-  {
-    String fnName = "ConfigComponentAdaptor.configure";
-    HttpResponse r = new HttpResponse();
-    r.code = 200;
-    log.debug("ConfigComponentAdaptor.configure - key = " + key);
-    debugLog.printRTAriDebug(fnName, "key = " + key);
-    log.debug("Parameters:");
-    debugLog.printRTAriDebug(fnName, "Parameters:");
-    for (String parmName : parameters.keySet())
-    {
-      log.debug("    " + parmName + " = " + parameters.get(parmName));
-      debugLog.printRTAriDebug(fnName, "    " + parmName + " = " + parameters.get(parmName));
+public class ConfigComponentAdaptor implements SvcLogicAdaptor {
+
+    private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigComponentAdaptor.class);
+    private static final DebugLog debugLog = new DebugLog(Paths.get(DebugLog.LOG_FILE));
+
+    private String configUrl;
+    private String configUser;
+    private String configPassword;
+    private String auditUrl;
+    private String auditUser;
+    private String auditPassword;
+    private String configCallbackUrl;
+    private String auditCallbackUrl;
+
+    public ConfigComponentAdaptor(Properties props) {
+        if (props != null) {
+            configUrl = props.getProperty("configComponent.url", "");
+            configUser = props.getProperty("configComponent.user", "");
+            configPassword = props.getProperty("configComponent.passwd", "");
+            auditUrl = props.getProperty("auditComponent.url", "");
+            auditUser = props.getProperty("auditComponent.user", "");
+            auditPassword = props.getProperty("auditComponent.passwd", "");
+            configCallbackUrl = props.getProperty("service-configuration-notification-url", "");
+            auditCallbackUrl = props.getProperty("audit-configuration-notification-url", "");
+        } 
     }
 
-    String parmval = parameters.get("config-component-configUrl");
-    if ((parmval != null) && (parmval.length() > 0))
-    {
-      log.debug("Overwriting URL with " + parmval);
-      configUrl = parmval;
-    }
+    @Override
+    public ConfigStatus configure(String key, Map<String, String> parameters, SvcLogicContext ctx) {
+        String fnName = "ConfigComponentAdaptor.configure";
+        HttpResponse r = new HttpResponse();
+        r.code = 200;
+        log.debug("ConfigComponentAdaptor.configure - key = " + key);
+        debugLog.printRTAriDebug(fnName, "key = " + key);
+        log.debug("Parameters:");
+        debugLog.printRTAriDebug(fnName, "Parameters:");
+        for (String parmName : parameters.keySet()) {
+            log.debug("    " + parmName + " = " + parameters.get(parmName));
+            debugLog.printRTAriDebug(fnName, "    " + parmName + " = " + parameters.get(parmName));
+        }
 
-    parmval = parameters.get("config-component-configPassword");
-    if ((parmval != null) && (parmval.length() > 0))
-    {
-      log.debug("Overwriting configPassword with " + parmval);
-      configPassword = parmval;
-    }
+        String parmval = parameters.get("config-component-configUrl");
+        if ((parmval != null) && (parmval.length() > 0)) {
+            log.debug("Overwriting URL with " + parmval);
+            configUrl = parmval;
+        }
 
-    parmval = parameters.get("config-component-configUser");
-    if ((parmval != null) && (parmval.length() > 0))
-    {
-      log.debug("Overwriting configUser id with " + parmval);
-      configUser = parmval;
-    }
+        parmval = parameters.get("config-component-configPassword");
+        if ((parmval != null) && (parmval.length() > 0)) {
+            log.debug("Overwriting configPassword with " + parmval);
+            configPassword = parmval;
+        }
+
+        parmval = parameters.get("config-component-configUser");
+        if ((parmval != null) && (parmval.length() > 0)) {
+            log.debug("Overwriting configUser id with " + parmval);
+            configUser = parmval;
+        }
 
-    String action = parameters.get("action");
+        String action = parameters.get("action");
 
         String chg = ctx.getAttribute(
-                       "service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name");
-        if (chg != null && "prepare".equalsIgnoreCase(action))
-          return prepare(ctx, "CHANGE", "change");
-        if (chg != null && "activate".equalsIgnoreCase(action))
-          return activate(ctx, true);
+            "service-data.vnf-config-parameters-list.vnf-config-parameters[0].update-configuration[0].block-key-name");
+        if (chg != null && "prepare".equalsIgnoreCase(action)) {
+            return prepare(ctx, "CHANGE", "change");
+        }
+        if (chg != null && "activate".equalsIgnoreCase(action)) {
+            return activate(ctx, true);
+        }
 
         String scale = ctx.getAttribute(
-                         "service-data.vnf-config-parameters-list.vnf-config-parameters[0].scale-configuration[0].network-type");
-        if (scale != null && "prepare".equalsIgnoreCase(action))
-          return prepare(ctx, "CHANGE", "scale");
-        if (scale != null && "activate".equalsIgnoreCase(action))
-          return activate(ctx, true);
-
-        if ("prepare".equalsIgnoreCase(action))
-          return prepare(ctx, "BASE", "create");
-        if ("activate".equalsIgnoreCase(action))
-          return activate(ctx, false);
-
-        if ("backup".equalsIgnoreCase(action))
-          return prepare(ctx, "BACKUP", "backup");
-        if ("restorebackup".equalsIgnoreCase(action))
-          return prepare(ctx, "RESTOREBACKUP", "restorebackup");
-        if ("deletebackup".equalsIgnoreCase(action))
-          return prepare(ctx, "DELETEBACKUP", "deletebackup");
-        if ("audit".equalsIgnoreCase(action))
-          return audit(ctx, "FULL");
-        if ("getrunningconfig".equalsIgnoreCase(action))
-          return audit(ctx, "RUNNING");
-
-    if ((key.equals("put")) || (key.equals("get")))
-    {
-      String loginId = parameters.get("loginId");
-      String host = parameters.get("host");
-      String password = parameters.get("password");
-      password = EncryptionTool.getInstance().decrypt(password);
-      String fullPathFileName = parameters.get("fullPathFileName");
-      String data = null;
-      if (key.equals("put"))
-        data = parameters.get("data");
-
-      SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-      log.debug("SCP: SshJcraftWrapper has been instantiated");
-      debugLog.printRTAriDebug(fnName, "SCP: SshJcraftWrapper has been instantiated");
-      try
-      {
-        if (key.equals("put"))
-        {
-          debugLog.printRTAriDebug(fnName, "Command is for put: Length of data is: " + data.length());
-          InputStream is = new ByteArrayInputStream(data.getBytes());
-          log.debug("SCP: Doing a put: fullPathFileName=" + fullPathFileName);
-          debugLog.printRTAriDebug(fnName, "SCP: Doing a put: fullPathFileName=" + fullPathFileName);
-          sshJcraftWrapper.put(is, fullPathFileName, host, loginId, password);
-          try
-          {
-            debugLog.printRTAriDebug(fnName, "Sleeping for 180 seconds....");
-            Thread.sleep(1000 * 180);
-            debugLog.printRTAriDebug(fnName, "Woke up....");
-          }
-          catch (java.lang.InterruptedException ee)
-          {
-            boolean ignore = true;
-          }
+            "service-data.vnf-config-parameters-list.vnf-config-parameters[0].scale-configuration[0].network-type");
+        if (scale != null && "prepare".equalsIgnoreCase(action)) {
+            return prepare(ctx, "CHANGE", "scale");
         }
-        else   // Must be a get
-        {
-          log.debug("SCP: Doing a get: fullPathFileName=" + fullPathFileName);
-          debugLog.printRTAriDebug(fnName, "SCP: Doing a get: fullPathFileName=" + fullPathFileName);
-          String response = sshJcraftWrapper.get(fullPathFileName, host, loginId, password);
-          debugLog.printRTAriDebug(fnName, "Got the response and putting into the ctx object");
-          ctx.setAttribute("fileContents", response);
-          log.debug("SCP: Closing the SFTP connection");
+        if (scale != null && "activate".equalsIgnoreCase(action)) {
+            return activate(ctx, true);
         }
-        sshJcraftWrapper = null;
-        return (setResponseStatus(ctx, r));
-      }
-      catch (IOException e)
-      {
-        DebugLog.printAriDebug(fnName, "Caught a IOException e=" + e);
-        log.debug(fnName + " : Caught a IOException e=" + e);
-        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-        r.message = e.getMessage();
-        sshJcraftWrapper = null;
-        return (setResponseStatus(ctx, r));
-      }
-    }
-    if (key.equals("cli"))
-    {
-      String loginId = parameters.get("loginId");
-      String host = parameters.get("host");
-      String password = parameters.get("password");
-      password = EncryptionTool.getInstance().decrypt(password);
-      String cliCommand = parameters.get("cli");
-      String portNumber = parameters.get("portNumber");
-      SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-      try
-      {
-        log.debug("CLI: Attempting to login: host=" + host + " loginId=" + loginId + " password=" + password +
-                  " portNumber=" + portNumber);
-        debugLog.printRTAriDebug(fnName, "CLI: Attempting to login: host=" + host + " loginId=" + loginId +
-                                 " password=" + password + " portNumber=" + portNumber);
-        sshJcraftWrapper.connect(host, loginId, password, Integer.parseInt(portNumber));
-
-        DebugLog.printAriDebug(fnName, "Sending 'sdc'");
-        String response = sshJcraftWrapper.send("sdc", ":");
-        DebugLog.printAriDebug(fnName, "Sending 1");
-        response = sshJcraftWrapper.send("1", ":");
-        DebugLog.printAriDebug(fnName, "Sending 1, the second time");
-        response = sshJcraftWrapper.send("1", "#");
-        DebugLog.printAriDebug(fnName, "Sending paging-options disable");
-        response = sshJcraftWrapper.send("paging-options disable", "#");
-        DebugLog.printAriDebug(fnName, "Sending show config");
-        response = sshJcraftWrapper.send("show config", "#");
-
-        DebugLog.printAriDebug(fnName, "response is now:'" + response + "'");
-        DebugLog.printAriDebug(fnName, "Populating the ctx object with the response");
-        ctx.setAttribute("cliOutput", response);
-        sshJcraftWrapper.closeConnection();
-        r.code = 200;
-        sshJcraftWrapper = null;
-        return (setResponseStatus(ctx, r));
-      }
-      catch (IOException e)
-      {
-        DebugLog.printAriDebug(fnName, "Caught a IOException e=" + e);
-        log.debug(fnName + " : Caught a IOException e=" + e);
-        sshJcraftWrapper.closeConnection();
-        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-        r.message = e.getMessage();
-        sshJcraftWrapper = null;
-        DebugLog.printAriDebug(fnName, "Returning error message");
-        return (setResponseStatus(ctx, r));
-      }
-    }
-    if (key.equals("escapeSql"))
-    {
-      String data = parameters.get("artifactContents");
-      log.debug("ConfigComponentAdaptor.configure - escapeSql");
-      data = escapeMySql(data);
-      ctx.setAttribute("escapedData", data);
-      return (setResponseStatus(ctx, r));
-    }
-    if(key.equals("GetCliRunningConfig"))
-    {
-      debugLog.printRTAriDebug (fnName, "key was: GetCliRunningConfig: ");
-      log.debug("key was: GetCliRunningConfig: ");
-      String User_name = parameters.get("User_name");
-      String Host_ip_address = parameters.get("Host_ip_address");
-      String Password = parameters.get("Password");
-      Password = EncryptionTool.getInstance().decrypt(Password);
-      String Port_number = parameters.get("Port_number");
-      String Get_config_template = parameters.get("Get_config_template");
-      SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-      log.debug("GetCliRunningConfig: sshJcraftWrapper was instantiated");
-      debugLog.printRTAriDebug (fnName, "GetCliRunningConfig: sshJcraftWrapper was instantiated");
-      try
-      {
-        DebugLog.printAriDebug(fnName, "GetCliRunningConfig: User_name="+User_name +" Host_ip_address="+Host_ip_address +" Password="+Password +" Port_number="+Port_number);
-        log.debug("GetCliRunningConfig: Attempting to login: Host_ip_address="+Host_ip_address +" User_name="+User_name+" Password="+Password+" Port_number="+Port_number);
-        StringBuffer sb = new StringBuffer();
-        String response = "";
-        String CliResponse = "";
-        boolean showConfigFlag = false;
-        sshJcraftWrapper.connect (Host_ip_address, User_name, Password, "", 30000, Integer.parseInt(Port_number));
-        DebugLog.printAriDebug(fnName, "GetCliRunningConfig: On the VNF device");
-        StringTokenizer st = new StringTokenizer(Get_config_template, "\n");
-        String command = null;
-        try
-        {
-          while (st.hasMoreTokens())
-          {
-            String line = st.nextToken();
-            DebugLog.printAriDebug(fnName, "line="+line);
-            if (line.indexOf("Request:") != -1)
-            {
-              DebugLog.printAriDebug(fnName, "Found a Request line: line="+line);
-              command = getStringBetweenQuotes(line);
-              DebugLog.printAriDebug(fnName, "Sending command="+command);
-              sshJcraftWrapper.send(command);
-              DebugLog.printAriDebug(fnName, "command has been sent");
-              if (line.indexOf("show config") != -1)
-              {
-                showConfigFlag = true;
-                DebugLog.printAriDebug(fnName, "GetCliRunningConfig: setting 'showConfigFlag' to true");
-                log.debug("GetCliRunningConfig: GetCliRunningConfig: setting 'showConfigFlag' to true");
-              }
+
+        if ("prepare".equalsIgnoreCase(action)) {
+            return prepare(ctx, "BASE", "create");
+        }
+        if ("activate".equalsIgnoreCase(action)) {
+            return activate(ctx, false);
+        }
+
+        if ("backup".equalsIgnoreCase(action)) {
+            return prepare(ctx, "BACKUP", "backup");
+        }
+        if ("restorebackup".equalsIgnoreCase(action)) {
+            return prepare(ctx, "RESTOREBACKUP", "restorebackup");
+        }
+        if ("deletebackup".equalsIgnoreCase(action)) {
+            return prepare(ctx, "DELETEBACKUP", "deletebackup");
+        }
+        if ("audit".equalsIgnoreCase(action)) {
+            return audit(ctx, "FULL");
+        }
+        if ("getrunningconfig".equalsIgnoreCase(action)) {
+            return audit(ctx, "RUNNING");
+        }
+
+        if ((key.equals("put")) || (key.equals("get"))) {
+            String loginId = parameters.get("loginId");
+            String host = parameters.get("host");
+            String password = parameters.get("password");
+            password = EncryptionTool.getInstance().decrypt(password);
+            String fullPathFileName = parameters.get("fullPathFileName");
+            String data = null;
+            if (key.equals("put")) {
+                data = parameters.get("data");
             }
-            if (line.indexOf("Response: Ends_With") != -1)
-            {
-              DebugLog.printAriDebug(fnName, "Found a Response line: line="+line);
-              String delemeter = getStringBetweenQuotes(line);
-              DebugLog.printAriDebug(fnName, "The delemeter="+delemeter);
-              String tmpResponse =  sshJcraftWrapper.receiveUntil(delemeter, 120*1000, command);
-              response += tmpResponse;
-              if (showConfigFlag)
-              {
-                showConfigFlag = false;
-                StringTokenizer st2 = new StringTokenizer(tmpResponse, "\n");
-                while (st2.hasMoreTokens())
+
+            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            log.debug("SCP: SshJcraftWrapper has been instantiated");
+            debugLog.printRTAriDebug(fnName, "SCP: SshJcraftWrapper has been instantiated");
+            try {
+                if (key.equals("put")) {
+                    debugLog.printRTAriDebug(fnName, "Command is for put: Length of data is: " + data.length());
+                    InputStream is = new ByteArrayInputStream(data.getBytes());
+                    log.debug("SCP: Doing a put: fullPathFileName=" + fullPathFileName);
+                    debugLog.printRTAriDebug(fnName, "SCP: Doing a put: fullPathFileName=" + fullPathFileName);
+                    sshJcraftWrapper.put(is, fullPathFileName, host, loginId, password);
+                    try {
+                        debugLog.printRTAriDebug(fnName, "Sleeping for 180 seconds....");
+                        Thread.sleep(1000 * 180);
+                        debugLog.printRTAriDebug(fnName, "Woke up....");
+                    } catch (java.lang.InterruptedException ee) {
+                        boolean ignore = true;
+                    }
+                } else   // Must be a get
                 {
-                  String line2 = st2.nextToken();
-                  if (line2.indexOf("#") == -1)
-                    CliResponse += line2 +"\n";
+                    log.debug("SCP: Doing a get: fullPathFileName=" + fullPathFileName);
+                    debugLog.printRTAriDebug(fnName, "SCP: Doing a get: fullPathFileName=" + fullPathFileName);
+                    String response = sshJcraftWrapper.get(fullPathFileName, host, loginId, password);
+                    debugLog.printRTAriDebug(fnName, "Got the response and putting into the ctx object");
+                    ctx.setAttribute("fileContents", response);
+                    log.debug("SCP: Closing the SFTP connection");
                 }
-              }
+                sshJcraftWrapper = null;
+                return (setResponseStatus(ctx, r));
+            } catch (IOException e) {
+                debugLog.printRTAriDebug(fnName, "Caught a IOException e=" + e);
+                log.debug(fnName + " : Caught a IOException e=" + e);
+                r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                r.message = e.getMessage();
+                sshJcraftWrapper = null;
+                return (setResponseStatus(ctx, r));
             }
-          }
-        }
-        catch (NoSuchElementException e)
-        {
-          DebugLog.printAriDebug(fnName, "Caught a NoSuchElementException: e="+e);
         }
-        DebugLog.printAriDebug(fnName, "CliResponse=\n"+CliResponse);
-        ctx.setAttribute("cliOutput", CliResponse);
-        sshJcraftWrapper.closeConnection();
-        r.code = 200;
-        sshJcraftWrapper = null;
-        return(setResponseStatus(ctx, r));
-      }
-      catch(IOException e)
-      {
-        DebugLog.printAriDebug(fnName, "GetCliRunningConfig: Caught a IOException e="+e);
-        log.debug(fnName +" : GetCliRunningConfig: Caught a IOException e="+e);
-        sshJcraftWrapper.closeConnection();
-        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-        r.message = e.getMessage();
-        sshJcraftWrapper = null;
-        DebugLog.printAriDebug(fnName, "GetCliRunningConfig: Returning error message");
-        return(setResponseStatus(ctx, r));
-      }
-    }
-    if(key.equals("xml-download"))
-    {
-      log(fnName, "key was:  xml-download");
-      String User_name = parameters.get("User_name");
-      String Host_ip_address = parameters.get("Host_ip_address");
-      String Password = parameters.get("Password");
-      Password = EncryptionTool.getInstance().decrypt(Password);
-      String Port_number = parameters.get("Port_number");
-      String Contents = parameters.get("Contents");
-      String netconfHelloCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n  <capabilities>\n   <capability>urn:ietf:params:netconf:base:1.0</capability>\n  <capability>urn:com:ericsson:ebase:1.1.0</capability> </capabilities>\n </hello>";
-      String terminateConnectionCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <rpc message-id=\"terminateConnection\" xmlns:netconf=\"urn:ietf:params:xml:ns:netconf:base:1.0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n <close-session/> \n </rpc>\n ]]>]]>";
-      String commitCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <rpc> <commit/> </rpc>\n ]]>]]>";
-
-      log(fnName, "xml-download: User_name="+User_name +" Host_ip_address="+Host_ip_address +" Password="+Password +" Port_number="+Port_number);
-      SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-      try
-      {
-        sshJcraftWrapper.connect (Host_ip_address, User_name, Password, "]]>]]>", 30000, Integer.parseInt(Port_number), "netconf");
-        String NetconfHelloCmd = netconfHelloCmd;
-        NetconfHelloCmd = NetconfHelloCmd +"]]>]]>";
-        log(fnName, "Sending the hello command");
-        sshJcraftWrapper.send(NetconfHelloCmd);
-        String response = sshJcraftWrapper.receiveUntil("]]>]]>", 10000, "");
-        log(fnName, "Sending xmlCmd cmd");
-        String xmlCmd = Contents;
-        String messageId = "1";
-        messageId= "\"" +messageId+"\"";
-        String loadConfigurationString = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id="+messageId+"> <edit-config> <target> <candidate /> </target> <default-operation>merge</default-operation> <config xmlns:xc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">"+xmlCmd+"</config> </edit-config> </rpc>";
-        loadConfigurationString = loadConfigurationString +"]]>]]>";
-        sshJcraftWrapper.send(loadConfigurationString);
-        DebugLog.printAriDebug(fnName,":After sending loadConfigurationString");
-        response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 600000, "");
-        if (response.indexOf("rpc-error") != -1)
-        {
-          DebugLog.printAriDebug(fnName,"Error from device: Response from device had 'rpc-error'");
-          DebugLog.printAriDebug(fnName,"response=\n"+response +"\n");
-          r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-          r.message = response;
+        if (key.equals("cli")) {
+            String loginId = parameters.get("loginId");
+            String host = parameters.get("host");
+            String password = parameters.get("password");
+            password = EncryptionTool.getInstance().decrypt(password);
+            String cliCommand = parameters.get("cli");
+            String portNumber = parameters.get("portNumber");
+            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            try {
+                log.debug("CLI: Attempting to login: host=" + host + " loginId=" + loginId + " password=" + password +
+                    " portNumber=" + portNumber);
+                debugLog.printRTAriDebug(fnName, "CLI: Attempting to login: host=" + host + " loginId=" + loginId +
+                    " password=" + password + " portNumber=" + portNumber);
+                sshJcraftWrapper.connect(host, loginId, password, Integer.parseInt(portNumber));
+
+                debugLog.printRTAriDebug(fnName, "Sending 'sdc'");
+                String response = sshJcraftWrapper.send("sdc", ":");
+                debugLog.printRTAriDebug(fnName, "Sending 1");
+                response = sshJcraftWrapper.send("1", ":");
+                debugLog.printRTAriDebug(fnName, "Sending 1, the second time");
+                response = sshJcraftWrapper.send("1", "#");
+                debugLog.printRTAriDebug(fnName, "Sending paging-options disable");
+                response = sshJcraftWrapper.send("paging-options disable", "#");
+                debugLog.printRTAriDebug(fnName, "Sending show config");
+                response = sshJcraftWrapper.send("show config", "#");
+
+                debugLog.printRTAriDebug(fnName, "response is now:'" + response + "'");
+                debugLog.printRTAriDebug(fnName, "Populating the ctx object with the response");
+                ctx.setAttribute("cliOutput", response);
+                sshJcraftWrapper.closeConnection();
+                r.code = 200;
+                sshJcraftWrapper = null;
+                return (setResponseStatus(ctx, r));
+            } catch (IOException e) {
+                debugLog.printRTAriDebug(fnName, "Caught a IOException e=" + e);
+                log.debug(fnName + " : Caught a IOException e=" + e);
+                sshJcraftWrapper.closeConnection();
+                r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                r.message = e.getMessage();
+                sshJcraftWrapper = null;
+                debugLog.printRTAriDebug(fnName, "Returning error message");
+                return (setResponseStatus(ctx, r));
+            }
         }
-        else
-        {
-          DebugLog.printAriDebug(fnName,":LoadConfiguration was a success, sending commit cmd");
-          sshJcraftWrapper.send(commitCmd);
-          DebugLog.printAriDebug(fnName,":After sending commitCmd");
-          response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 180000, "");
-          if (response.indexOf("rpc-error") != -1)
-          {
-            DebugLog.printAriDebug(fnName,"Error from device: Response from device had 'rpc-error'");
-            DebugLog.printAriDebug(fnName,"response=\n"+response +"\n");
-            r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-            r.message = response;
-          }
-          else
-          {
-            DebugLog.printAriDebug(fnName,":Looks like a success");
-            DebugLog.printAriDebug(fnName,"response=\n"+response +"\n");
-            r.code = 200;
-          }
+        if (key.equals("escapeSql")) {
+            String data = parameters.get("artifactContents");
+            log.debug("ConfigComponentAdaptor.configure - escapeSql");
+            data = escapeMySql(data);
+            ctx.setAttribute("escapedData", data);
+            return (setResponseStatus(ctx, r));
         }
-        sshJcraftWrapper.send(terminateConnectionCmd);
-        sshJcraftWrapper.closeConnection();
-        sshJcraftWrapper = null;
-        return(setResponseStatus(ctx, r));
-      }
-      catch (Exception e)
-      {
-        log(fnName, "Caught an Exception, e="+e);
-        log(fnName, "StackTrace="+DebugLog.getStackTraceString(e));
-        sshJcraftWrapper.closeConnection();
-        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-        r.message = e.getMessage();
-        sshJcraftWrapper = null;
-        log(fnName, "Returning error message");
-        return (setResponseStatus(ctx, r));
-      }
-    }
-    if(key.equals("xml-getrunningconfig"))
-    {
-      log(fnName, "key was: : xml-getrunningconfig");
-      String xmlGetRunningConfigCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\">  <get-config> <source> <running /> </source> </get-config> </rpc>\n";
-      String Host_ip_address = parameters.get("Host_ip_address");
-      String User_name = parameters.get("User_name");
-      String Password = parameters.get("Password");
-      Password = EncryptionTool.getInstance().decrypt(Password);
-      String Port_number = parameters.get("Port_number");
-      String Protocol = parameters.get("Protocol");
-      String netconfHelloCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n  <capabilities>\n   <capability>urn:ietf:params:netconf:base:1.0</capability>\n <capability>urn:com:ericsson:ebase:1.1.0</capability> </capabilities>\n </hello>";
-      String terminateConnectionCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <rpc message-id=\"terminateConnection\" xmlns:netconf=\"urn:ietf:params:xml:ns:netconf:base:1.0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n <close-session/> \n </rpc>\n ]]>]]>";
-      log(fnName, "xml-getrunningconfig: User_name="+User_name +" Host_ip_address="+Host_ip_address +" Password="+Password +" Port_number="+Port_number);
-      SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-      try
-      {
-        String NetconfHelloCmd = netconfHelloCmd;
-        sshJcraftWrapper.connect (Host_ip_address, User_name, Password, "]]>]]>", 30000, Integer.parseInt(Port_number), "netconf");
-        NetconfHelloCmd = NetconfHelloCmd +"]]>]]>";
-        log(fnName, ":Sending the hello command");
-        sshJcraftWrapper.send(NetconfHelloCmd);
-        String response = sshJcraftWrapper.receiveUntil("]]>]]>", 10000, "");
-        log(fnName, "Sending get running config command");
-        sshJcraftWrapper.send(xmlGetRunningConfigCmd +"]]>]]>\n");
-        response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 180000, "");
-        DebugLog.printAriDebug(fnName,"Response from getRunningconfigCmd="+response);
-        response = trimResponse(response);
-        ctx.setAttribute("xmlRunningConfigOutput", response);
-        sshJcraftWrapper.send(terminateConnectionCmd);
-        sshJcraftWrapper.closeConnection();
-        r.code = 200;
-        sshJcraftWrapper = null;
-        return(setResponseStatus(ctx, r));
-      }
-      catch (Exception e)
-      {
-        log(fnName, "Caught an Exception, e="+e);
-        log(fnName, "StackTrace="+DebugLog.getStackTraceString(e));
-        sshJcraftWrapper.closeConnection();
-        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-        r.message = e.getMessage();
-        sshJcraftWrapper = null;
-        log(fnName, "Returning error message");
-        return (setResponseStatus(ctx, r));
-      }
-    }
-    if(key.equals("DownloadCliConfig"))
-    {
-      debugLog.printRTAriDebug (fnName, "key was: DownloadCliConfig: ");
-      log.debug("key was: DownloadCliConfig: ");
-      String User_name = parameters.get("User_name");
-      String Host_ip_address = parameters.get("Host_ip_address");
-      String Password = parameters.get("Password");
-      Password = EncryptionTool.getInstance().decrypt(Password);
-      String Port_number = parameters.get("Port_number");
-      String Download_config_template = parameters.get("Download_config_template");
-      String Config_contents = parameters.get("Config_contents");
-      DebugLog.printAriDebug(fnName, "Contents of the 'Config_contents' are: "+Config_contents);
-      SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-      log.debug("DownloadCliConfig: sshJcraftWrapper was instantiated");
-      debugLog.printRTAriDebug (fnName, "DownloadCliConfig: sshJcraftWrapper was instantiated");
-      int timeout = 4*60*1000;
-      try
-      {
-        DebugLog.printAriDebug(fnName, "DownloadCliConfig: User_name="+User_name +" Host_ip_address="+Host_ip_address +" Password="+Password +" Port_number="+Port_number);
-        log.debug("DownloadCliConfig: Attempting to login: Host_ip_address="+Host_ip_address +" User_name="+User_name+" Password="+Password+" Port_number="+Port_number);
-        StringBuffer sb = new StringBuffer();
-        String response = "";
-        String CliResponse = "";
-        sshJcraftWrapper.connect (Host_ip_address, User_name, Password, "", 30000, Integer.parseInt(Port_number));
-        DebugLog.printAriDebug(fnName, "DownloadCliConfig: On the VNF device");
-        StringTokenizer st = new StringTokenizer(Download_config_template, "\n");
-        String command = null;
-        String executeConfigContentsDelemeter = null;
-        try
-        {
-          while (st.hasMoreTokens())
-          {
-            String line = st.nextToken();
-            DebugLog.printAriDebug(fnName, "line="+line);
-            if (line.indexOf("Request:") != -1)
-            {
-              DebugLog.printAriDebug(fnName, "Found a Request line: line="+line);
-              command = getStringBetweenQuotes(line);
-              DebugLog.printAriDebug(fnName, "Sending command="+command);
-              sshJcraftWrapper.send(command);
-              DebugLog.printAriDebug(fnName, "command has been sent");
+        if (key.equals("GetCliRunningConfig")) {
+            debugLog.printRTAriDebug(fnName, "key was: GetCliRunningConfig: ");
+            log.debug("key was: GetCliRunningConfig: ");
+            String User_name = parameters.get("User_name");
+            String Host_ip_address = parameters.get("Host_ip_address");
+            String Password = parameters.get("Password");
+            Password = EncryptionTool.getInstance().decrypt(Password);
+            String Port_number = parameters.get("Port_number");
+            String Get_config_template = parameters.get("Get_config_template");
+            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            log.debug("GetCliRunningConfig: sshJcraftWrapper was instantiated");
+            debugLog.printRTAriDebug(fnName, "GetCliRunningConfig: sshJcraftWrapper was instantiated");
+            try {
+                debugLog.printRTAriDebug(fnName,
+                    "GetCliRunningConfig: User_name=" + User_name + " Host_ip_address=" + Host_ip_address + " Password="
+                        + Password + " Port_number=" + Port_number);
+                log.debug("GetCliRunningConfig: Attempting to login: Host_ip_address=" + Host_ip_address + " User_name="
+                    + User_name + " Password=" + Password + " Port_number=" + Port_number);
+                StringBuffer sb = new StringBuffer();
+                String response = "";
+                String CliResponse = "";
+                boolean showConfigFlag = false;
+                sshJcraftWrapper
+                    .connect(Host_ip_address, User_name, Password, "", 30000, Integer.parseInt(Port_number));
+                debugLog.printRTAriDebug(fnName, "GetCliRunningConfig: On the VNF device");
+                StringTokenizer st = new StringTokenizer(Get_config_template, "\n");
+                String command = null;
+                try {
+                    while (st.hasMoreTokens()) {
+                        String line = st.nextToken();
+                        debugLog.printRTAriDebug(fnName, "line=" + line);
+                        if (line.indexOf("Request:") != -1) {
+                            debugLog.printRTAriDebug(fnName, "Found a Request line: line=" + line);
+                            command = getStringBetweenQuotes(line);
+                            debugLog.printRTAriDebug(fnName, "Sending command=" + command);
+                            sshJcraftWrapper.send(command);
+                            debugLog.printRTAriDebug(fnName, "command has been sent");
+                            if (line.indexOf("show config") != -1) {
+                                showConfigFlag = true;
+                                debugLog.printRTAriDebug(fnName, "GetCliRunningConfig: setting 'showConfigFlag' to true");
+                                log.debug("GetCliRunningConfig: GetCliRunningConfig: setting 'showConfigFlag' to true");
+                            }
+                        }
+                        if (line.indexOf("Response: Ends_With") != -1) {
+                            debugLog.printRTAriDebug(fnName, "Found a Response line: line=" + line);
+                            String delemeter = getStringBetweenQuotes(line);
+                            debugLog.printRTAriDebug(fnName, "The delemeter=" + delemeter);
+                            String tmpResponse = sshJcraftWrapper.receiveUntil(delemeter, 120 * 1000, command);
+                            response += tmpResponse;
+                            if (showConfigFlag) {
+                                showConfigFlag = false;
+                                StringTokenizer st2 = new StringTokenizer(tmpResponse, "\n");
+                                while (st2.hasMoreTokens()) {
+                                    String line2 = st2.nextToken();
+                                    if (line2.indexOf("#") == -1) {
+                                        CliResponse += line2 + "\n";
+                                    }
+                                }
+                            }
+                        }
+                    }
+                } catch (NoSuchElementException e) {
+                    debugLog.printRTAriDebug(fnName, "Caught a NoSuchElementException: e=" + e);
+                }
+                debugLog.printRTAriDebug(fnName, "CliResponse=\n" + CliResponse);
+                ctx.setAttribute("cliOutput", CliResponse);
+                sshJcraftWrapper.closeConnection();
+                r.code = 200;
+                sshJcraftWrapper = null;
+                return (setResponseStatus(ctx, r));
+            } catch (IOException e) {
+                debugLog.printRTAriDebug(fnName, "GetCliRunningConfig: Caught a IOException e=" + e);
+                log.debug(fnName + " : GetCliRunningConfig: Caught a IOException e=" + e);
+                sshJcraftWrapper.closeConnection();
+                r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                r.message = e.getMessage();
+                sshJcraftWrapper = null;
+                debugLog.printRTAriDebug(fnName, "GetCliRunningConfig: Returning error message");
+                return (setResponseStatus(ctx, r));
             }
-            else if ((line.indexOf("Response: Ends_With") != -1) && (line.indexOf("Execute_config_contents Response: Ends_With") == -1))
-            {
-              DebugLog.printAriDebug(fnName, "Found a Response line: line="+line);
-              String delemeter = getStringBetweenQuotes(line);
-              DebugLog.printAriDebug(fnName, "The delemeter="+delemeter);
-              String tmpResponse =  sshJcraftWrapper.receiveUntil(delemeter, timeout, command);
-              response += tmpResponse;
-              CliResponse += tmpResponse;
+        }
+        if (key.equals("xml-download")) {
+            log(fnName, "key was:  xml-download");
+            String User_name = parameters.get("User_name");
+            String Host_ip_address = parameters.get("Host_ip_address");
+            String Password = parameters.get("Password");
+            Password = EncryptionTool.getInstance().decrypt(Password);
+            String Port_number = parameters.get("Port_number");
+            String Contents = parameters.get("Contents");
+            String netconfHelloCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n  <capabilities>\n   <capability>urn:ietf:params:netconf:base:1.0</capability>\n  <capability>urn:com:ericsson:ebase:1.1.0</capability> </capabilities>\n </hello>";
+            String terminateConnectionCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <rpc message-id=\"terminateConnection\" xmlns:netconf=\"urn:ietf:params:xml:ns:netconf:base:1.0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n <close-session/> \n </rpc>\n ]]>]]>";
+            String commitCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <rpc> <commit/> </rpc>\n ]]>]]>";
+
+            log(fnName,
+                "xml-download: User_name=" + User_name + " Host_ip_address=" + Host_ip_address + " Password=" + Password
+                    + " Port_number=" + Port_number);
+            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            try {
+                sshJcraftWrapper
+                    .connect(Host_ip_address, User_name, Password, "]]>]]>", 30000, Integer.parseInt(Port_number),
+                        "netconf");
+                String NetconfHelloCmd = netconfHelloCmd;
+                NetconfHelloCmd = NetconfHelloCmd + "]]>]]>";
+                log(fnName, "Sending the hello command");
+                sshJcraftWrapper.send(NetconfHelloCmd);
+                String response = sshJcraftWrapper.receiveUntil("]]>]]>", 10000, "");
+                log(fnName, "Sending xmlCmd cmd");
+                String xmlCmd = Contents;
+                String messageId = "1";
+                messageId = "\"" + messageId + "\"";
+                String loadConfigurationString =
+                    "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id="
+                        + messageId
+                        + "> <edit-config> <target> <candidate /> </target> <default-operation>merge</default-operation> <config xmlns:xc=\"urn:ietf:params:xml:ns:netconf:base:1.0\">"
+                        + xmlCmd + "</config> </edit-config> </rpc>";
+                loadConfigurationString = loadConfigurationString + "]]>]]>";
+                sshJcraftWrapper.send(loadConfigurationString);
+                debugLog.printRTAriDebug(fnName, ":After sending loadConfigurationString");
+                response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 600000, "");
+                if (response.indexOf("rpc-error") != -1) {
+                    debugLog.printRTAriDebug(fnName, "Error from device: Response from device had 'rpc-error'");
+                    debugLog.printRTAriDebug(fnName, "response=\n" + response + "\n");
+                    r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                    r.message = response;
+                } else {
+                    debugLog.printRTAriDebug(fnName, ":LoadConfiguration was a success, sending commit cmd");
+                    sshJcraftWrapper.send(commitCmd);
+                    debugLog.printRTAriDebug(fnName, ":After sending commitCmd");
+                    response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 180000, "");
+                    if (response.indexOf("rpc-error") != -1) {
+                        debugLog.printRTAriDebug(fnName, "Error from device: Response from device had 'rpc-error'");
+                        debugLog.printRTAriDebug(fnName, "response=\n" + response + "\n");
+                        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                        r.message = response;
+                    } else {
+                        debugLog.printRTAriDebug(fnName, ":Looks like a success");
+                        debugLog.printRTAriDebug(fnName, "response=\n" + response + "\n");
+                        r.code = 200;
+                    }
+                }
+                sshJcraftWrapper.send(terminateConnectionCmd);
+                sshJcraftWrapper.closeConnection();
+                sshJcraftWrapper = null;
+                return (setResponseStatus(ctx, r));
+            } catch (Exception e) {
+                log(fnName, "Caught an Exception, e=" + e);
+                debugLog.outputStackTrace(e);
+                sshJcraftWrapper.closeConnection();
+                r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                r.message = e.getMessage();
+                sshJcraftWrapper = null;
+                log(fnName, "Returning error message");
+                return (setResponseStatus(ctx, r));
             }
-            else if (line.indexOf("Execute_config_contents Response: Ends_With") != -1)
-            {
-              DebugLog.printAriDebug(fnName, "Found a 'Execute_config_contents Response:' line="+line);
-              executeConfigContentsDelemeter = getStringBetweenQuotes(line);
-              DebugLog.printAriDebug(fnName, "executeConfigContentsDelemeter="+executeConfigContentsDelemeter);
-              StringTokenizer st2 = new StringTokenizer(Config_contents, "\n");
-              while (st2.hasMoreTokens())
-              {
-                String cmd = st2.nextToken();
-                DebugLog.printAriDebug(fnName, "Config_contents: cmd="+cmd);
-                sshJcraftWrapper.send(cmd);
-                String tmpResponse =  sshJcraftWrapper.receiveUntil(executeConfigContentsDelemeter, timeout, command);
-                CliResponse += tmpResponse;
-              }
+        }
+        if (key.equals("xml-getrunningconfig")) {
+            log(fnName, "key was: : xml-getrunningconfig");
+            String xmlGetRunningConfigCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> <rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\">  <get-config> <source> <running /> </source> </get-config> </rpc>\n";
+            String Host_ip_address = parameters.get("Host_ip_address");
+            String User_name = parameters.get("User_name");
+            String Password = parameters.get("Password");
+            Password = EncryptionTool.getInstance().decrypt(Password);
+            String Port_number = parameters.get("Port_number");
+            String Protocol = parameters.get("Protocol");
+            String netconfHelloCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <hello xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n  <capabilities>\n   <capability>urn:ietf:params:netconf:base:1.0</capability>\n <capability>urn:com:ericsson:ebase:1.1.0</capability> </capabilities>\n </hello>";
+            String terminateConnectionCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n  <rpc message-id=\"terminateConnection\" xmlns:netconf=\"urn:ietf:params:xml:ns:netconf:base:1.0\" xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\">\n <close-session/> \n </rpc>\n ]]>]]>";
+            log(fnName,
+                "xml-getrunningconfig: User_name=" + User_name + " Host_ip_address=" + Host_ip_address + " Password="
+                    + Password + " Port_number=" + Port_number);
+            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            try {
+                String NetconfHelloCmd = netconfHelloCmd;
+                sshJcraftWrapper
+                    .connect(Host_ip_address, User_name, Password, "]]>]]>", 30000, Integer.parseInt(Port_number),
+                        "netconf");
+                NetconfHelloCmd = NetconfHelloCmd + "]]>]]>";
+                log(fnName, ":Sending the hello command");
+                sshJcraftWrapper.send(NetconfHelloCmd);
+                String response = sshJcraftWrapper.receiveUntil("]]>]]>", 10000, "");
+                log(fnName, "Sending get running config command");
+                sshJcraftWrapper.send(xmlGetRunningConfigCmd + "]]>]]>\n");
+                response = sshJcraftWrapper.receiveUntil("</rpc-reply>", 180000, "");
+                debugLog.printRTAriDebug(fnName, "Response from getRunningconfigCmd=" + response);
+                response = trimResponse(response);
+                ctx.setAttribute("xmlRunningConfigOutput", response);
+                sshJcraftWrapper.send(terminateConnectionCmd);
+                sshJcraftWrapper.closeConnection();
+                r.code = 200;
+                sshJcraftWrapper = null;
+                return (setResponseStatus(ctx, r));
+            } catch (Exception e) {
+                log(fnName, "Caught an Exception, e=" + e);
+                debugLog.outputStackTrace(e);
+                sshJcraftWrapper.closeConnection();
+                r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                r.message = e.getMessage();
+                sshJcraftWrapper = null;
+                log(fnName, "Returning error message");
+                return (setResponseStatus(ctx, r));
             }
-          }
         }
-        catch (NoSuchElementException e)
-        {
-          DebugLog.printAriDebug(fnName, "Caught a NoSuchElementException: e="+e);
+        if (key.equals("DownloadCliConfig")) {
+            debugLog.printRTAriDebug(fnName, "key was: DownloadCliConfig: ");
+            log.debug("key was: DownloadCliConfig: ");
+            String User_name = parameters.get("User_name");
+            String Host_ip_address = parameters.get("Host_ip_address");
+            String Password = parameters.get("Password");
+            Password = EncryptionTool.getInstance().decrypt(Password);
+            String Port_number = parameters.get("Port_number");
+            String Download_config_template = parameters.get("Download_config_template");
+            String Config_contents = parameters.get("Config_contents");
+            debugLog.printRTAriDebug(fnName, "Contents of the 'Config_contents' are: " + Config_contents);
+            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            log.debug("DownloadCliConfig: sshJcraftWrapper was instantiated");
+            debugLog.printRTAriDebug(fnName, "DownloadCliConfig: sshJcraftWrapper was instantiated");
+            int timeout = 4 * 60 * 1000;
+            try {
+                debugLog.printRTAriDebug(fnName,
+                    "DownloadCliConfig: User_name=" + User_name + " Host_ip_address=" + Host_ip_address + " Password="
+                        + Password + " Port_number=" + Port_number);
+                log.debug("DownloadCliConfig: Attempting to login: Host_ip_address=" + Host_ip_address + " User_name="
+                    + User_name + " Password=" + Password + " Port_number=" + Port_number);
+                StringBuffer sb = new StringBuffer();
+                String response = "";
+                String CliResponse = "";
+                sshJcraftWrapper
+                    .connect(Host_ip_address, User_name, Password, "", 30000, Integer.parseInt(Port_number));
+                debugLog.printRTAriDebug(fnName, "DownloadCliConfig: On the VNF device");
+                StringTokenizer st = new StringTokenizer(Download_config_template, "\n");
+                String command = null;
+                String executeConfigContentsDelemeter = null;
+                try {
+                    while (st.hasMoreTokens()) {
+                        String line = st.nextToken();
+                        debugLog.printRTAriDebug(fnName, "line=" + line);
+                        if (line.indexOf("Request:") != -1) {
+                            debugLog.printRTAriDebug(fnName, "Found a Request line: line=" + line);
+                            command = getStringBetweenQuotes(line);
+                            debugLog.printRTAriDebug(fnName, "Sending command=" + command);
+                            sshJcraftWrapper.send(command);
+                            debugLog.printRTAriDebug(fnName, "command has been sent");
+                        } else if ((line.indexOf("Response: Ends_With") != -1) && (
+                            line.indexOf("Execute_config_contents Response: Ends_With") == -1)) {
+                            debugLog.printRTAriDebug(fnName, "Found a Response line: line=" + line);
+                            String delemeter = getStringBetweenQuotes(line);
+                            debugLog.printRTAriDebug(fnName, "The delemeter=" + delemeter);
+                            String tmpResponse = sshJcraftWrapper.receiveUntil(delemeter, timeout, command);
+                            response += tmpResponse;
+                            CliResponse += tmpResponse;
+                        } else if (line.indexOf("Execute_config_contents Response: Ends_With") != -1) {
+                            debugLog.printRTAriDebug(fnName, "Found a 'Execute_config_contents Response:' line=" + line);
+                            executeConfigContentsDelemeter = getStringBetweenQuotes(line);
+                            debugLog.printRTAriDebug(fnName,
+                                "executeConfigContentsDelemeter=" + executeConfigContentsDelemeter);
+                            StringTokenizer st2 = new StringTokenizer(Config_contents, "\n");
+                            while (st2.hasMoreTokens()) {
+                                String cmd = st2.nextToken();
+                                debugLog.printRTAriDebug(fnName, "Config_contents: cmd=" + cmd);
+                                sshJcraftWrapper.send(cmd);
+                                String tmpResponse = sshJcraftWrapper
+                                    .receiveUntil(executeConfigContentsDelemeter, timeout, command);
+                                CliResponse += tmpResponse;
+                            }
+                        }
+                    }
+                } catch (NoSuchElementException e) {
+                    debugLog.printRTAriDebug(fnName, "Caught a NoSuchElementException: e=" + e);
+                }
+                sshJcraftWrapper.closeConnection();
+                sshJcraftWrapper = null;
+                debugLog.printRTAriDebug(fnName, ":Escaping all the single and double quotes in the response");
+                CliResponse = CliResponse.replaceAll("\"", "\\\\\"");
+                CliResponse = CliResponse.replaceAll("\'", "\\\\'");
+                debugLog.printRTAriDebug(fnName, "CliResponse=\n" + CliResponse);
+                ctx.setAttribute("cliOutput", CliResponse);
+                r.code = 200;
+                return (setResponseStatus(ctx, r));
+            } catch (IOException e) {
+                debugLog.printRTAriDebug(fnName, "DownloadCliConfig: Caught a IOException e=" + e);
+                log.debug(fnName + " : DownloadCliConfig: Caught a IOException e=" + e);
+                sshJcraftWrapper.closeConnection();
+                r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+                r.message = e.getMessage();
+                sshJcraftWrapper = null;
+                debugLog.printRTAriDebug(fnName, "DownloadCliConfig: Returning error message");
+                return (setResponseStatus(ctx, r));
+            }
         }
-        sshJcraftWrapper.closeConnection();
-        sshJcraftWrapper = null;
-        DebugLog.printAriDebug(fnName, ":Escaping all the single and double quotes in the response");
-        CliResponse = CliResponse.replaceAll("\"", "\\\\\"");
-        CliResponse = CliResponse.replaceAll("\'", "\\\\'");
-        DebugLog.printAriDebug(fnName, "CliResponse=\n"+CliResponse);
-        ctx.setAttribute("cliOutput", CliResponse);
-        r.code = 200;
-        return(setResponseStatus(ctx, r));
-      }
-      catch(IOException e)
-      {
-        DebugLog.printAriDebug(fnName, "DownloadCliConfig: Caught a IOException e="+e);
-        log.debug(fnName +" : DownloadCliConfig: Caught a IOException e="+e);
-        sshJcraftWrapper.closeConnection();
-        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-        r.message = e.getMessage();
-        sshJcraftWrapper = null;
-        DebugLog.printAriDebug(fnName, "DownloadCliConfig: Returning error message");
-        return(setResponseStatus(ctx, r));
-      }
-    }
 
-    debugLog.printRTAriDebug (fnName, "Unsupported action - " + action);
-    log.error("Unsupported action - " + action);
-    return ConfigStatus.FAILURE;
-  }
-
-  private void log (String fileName, String messg)
-  {
-    debugLog.printRTAriDebug (fileName, messg);
-    log.debug(fileName +": "+messg);
-  }
-
-  private ConfigStatus prepare(SvcLogicContext ctx, String requestType, String operation)
-  {
-    String templateName = requestType.equals("BASE") ? "/config-base.xml" : "/config-data.xml";
-    String ndTemplate = readFile(templateName);
-    String nd = buildNetworkData2(ctx, ndTemplate, operation);
-
-    String reqTemplate = readFile("/config-request.xml");
-    Map<String, String> param = new HashMap<String, String>();
-    param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
-    param.put("request-type", requestType);
-    param.put("callback-url", configCallbackUrl);
-    if (operation.equals("create") || operation.equals("change") || operation.equals("scale"))
-      param.put("action", "GenerateOnly");
-    param.put("equipment-name", ctx.getAttribute("service-data.service-information.service-instance-id"));
-    param.put("equipment-ip-address", ctx.getAttribute("service-data.vnf-config-information.vnf-host-ip-address"));
-    param.put("vendor", ctx.getAttribute("service-data.vnf-config-information.vendor"));
-    param.put("network-data", nd);
-
-    String req = null;
-    try
-    {
-      req = buildXmlRequest(param, reqTemplate);
+        debugLog.printRTAriDebug(fnName, "Unsupported action - " + action);
+        log.error("Unsupported action - " + action);
+        return ConfigStatus.FAILURE;
     }
-    catch (Exception e)
-    {
-      log.error("Error building the XML request: ", e);
-
-      HttpResponse r = new HttpResponse();
-      r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-      r.message = e.getMessage();
-      return setResponseStatus(ctx, r);
+
+    private void log(String fileName, String messg) {
+        debugLog.printRTAriDebug(fileName, messg);
+        log.debug(fileName + ": " + messg);
     }
 
-    HttpResponse r = sendXmlRequest(req, configUrl, configUser, configPassword);
-    return setResponseStatus(ctx, r);
-  }
-
-  private ConfigStatus activate(SvcLogicContext ctx, boolean change)
-  {
-    String reqTemplate = readFile("/config-request.xml");
-    Map<String, String> param = new HashMap<String, String>();
-    param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
-    param.put("callback-url", configCallbackUrl);
-    param.put("action", change ? "DownloadChange" : "DownloadBase");
-    param.put("equipment-name", ctx.getAttribute("service-data.service-information.service-instance-id"));
-
-    String req = null;
-    try
-    {
-      req = buildXmlRequest(param, reqTemplate);
+    private ConfigStatus prepare(SvcLogicContext ctx, String requestType, String operation) {
+        String templateName = requestType.equals("BASE") ? "/config-base.xml" : "/config-data.xml";
+        String ndTemplate = readFile(templateName);
+        String nd = buildNetworkData2(ctx, ndTemplate, operation);
+
+        String reqTemplate = readFile("/config-request.xml");
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
+        param.put("request-type", requestType);
+        param.put("callback-url", configCallbackUrl);
+        if (operation.equals("create") || operation.equals("change") || operation.equals("scale")) {
+            param.put("action", "GenerateOnly");
+        }
+        param.put("equipment-name", ctx.getAttribute("service-data.service-information.service-instance-id"));
+        param.put("equipment-ip-address", ctx.getAttribute("service-data.vnf-config-information.vnf-host-ip-address"));
+        param.put("vendor", ctx.getAttribute("service-data.vnf-config-information.vendor"));
+        param.put("network-data", nd);
+
+        String req = null;
+        try {
+            req = buildXmlRequest(param, reqTemplate);
+        } catch (Exception e) {
+            log.error("Error building the XML request: ", e);
+
+            HttpResponse r = new HttpResponse();
+            r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+            r.message = e.getMessage();
+            return setResponseStatus(ctx, r);
+        }
+
+        HttpResponse r = sendXmlRequest(req, configUrl, configUser, configPassword);
+        return setResponseStatus(ctx, r);
     }
-    catch (Exception e)
-    {
-      log.error("Error building the XML request: ", e);
-
-      HttpResponse r = new HttpResponse();
-      r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-      r.message = e.getMessage();
-      return setResponseStatus(ctx, r);
+
+    private ConfigStatus activate(SvcLogicContext ctx, boolean change) {
+        String reqTemplate = readFile("/config-request.xml");
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
+        param.put("callback-url", configCallbackUrl);
+        param.put("action", change ? "DownloadChange" : "DownloadBase");
+        param.put("equipment-name", ctx.getAttribute("service-data.service-information.service-instance-id"));
+
+        String req = null;
+        try {
+            req = buildXmlRequest(param, reqTemplate);
+        } catch (Exception e) {
+            log.error("Error building the XML request: ", e);
+
+            HttpResponse r = new HttpResponse();
+            r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+            r.message = e.getMessage();
+            return setResponseStatus(ctx, r);
+        }
+
+        HttpResponse r = sendXmlRequest(req, configUrl, configUser, configPassword);
+        return setResponseStatus(ctx, r);
     }
 
-    HttpResponse r = sendXmlRequest(req, configUrl, configUser, configPassword);
-    return setResponseStatus(ctx, r);
-  }
-
-  private ConfigStatus audit(SvcLogicContext ctx, String auditLevel)
-  {
-    String reqTemplate = readFile("/audit-request.xml");
-    Map<String, String> param = new HashMap<String, String>();
-    param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
-    param.put("callback-url", auditCallbackUrl);
-    param.put("equipment-name", ctx.getAttribute("service-data.service-information.service-instance-id"));
-    param.put("audit-level", auditLevel);
-
-    String req = null;
-    try
-    {
-      req = buildXmlRequest(param, reqTemplate);
+    private ConfigStatus audit(SvcLogicContext ctx, String auditLevel) {
+        String reqTemplate = readFile("/audit-request.xml");
+        Map<String, String> param = new HashMap<String, String>();
+        param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
+        param.put("callback-url", auditCallbackUrl);
+        param.put("equipment-name", ctx.getAttribute("service-data.service-information.service-instance-id"));
+        param.put("audit-level", auditLevel);
+
+        String req = null;
+        try {
+            req = buildXmlRequest(param, reqTemplate);
+        } catch (Exception e) {
+            log.error("Error building the XML request: ", e);
+
+            HttpResponse r = new HttpResponse();
+            r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+            r.message = e.getMessage();
+            return setResponseStatus(ctx, r);
+        }
+
+        HttpResponse r = sendXmlRequest(req, auditUrl, auditUser, auditPassword);
+        return setResponseStatus(ctx, r);
     }
-    catch (Exception e)
-    {
-      log.error("Error building the XML request: ", e);
-
-      HttpResponse r = new HttpResponse();
-      r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-      r.message = e.getMessage();
-      return setResponseStatus(ctx, r);
+
+    @Override
+    public ConfigStatus activate(String key, SvcLogicContext ctx) {
+        return ConfigStatus.SUCCESS;
     }
 
-    HttpResponse r = sendXmlRequest(req, auditUrl, auditUser, auditPassword);
-    return setResponseStatus(ctx, r);
-  }
-
-  @Override
-  public ConfigStatus activate(String key, SvcLogicContext ctx)
-  {
-    return ConfigStatus.SUCCESS;
-  }
-
-  @Override
-  public ConfigStatus deactivate(String key, SvcLogicContext ctx)
-  {
-    return ConfigStatus.SUCCESS;
-  }
-
-  private String escapeMySql(String input)
-  {
-    if (input == null)
-      return null;
-
-    input  =  input.replace("\\", "\\\\");
-    input = input.replace("\'", "\\'");
-    return input;
-
-  }
-
-  private String readFile(String fileName)
-  {
-    InputStream is = getClass().getResourceAsStream(fileName);
-    InputStreamReader isr = new InputStreamReader(is);
-    BufferedReader in = new BufferedReader(isr);
-    StringBuilder ss = new StringBuilder();
-    try
-    {
-      String s = in.readLine();
-      while (s != null)
-      {
-        ss.append(s).append('\n');
-        s = in.readLine();
-      }
+    @Override
+    public ConfigStatus deactivate(String key, SvcLogicContext ctx) {
+        return ConfigStatus.SUCCESS;
     }
-    catch (IOException e)
-    {
-      System.out.println("Error reading " + fileName + ": " + e.getMessage());
-      throw new RuntimeException("Error reading " + fileName + ": " + e.getMessage(), e);
+
+    private String escapeMySql(String input) {
+        if (input == null) {
+            return null;
+        }
+
+        input = input.replace("\\", "\\\\");
+        input = input.replace("\'", "\\'");
+        return input;
+
     }
-    finally
-    {
-      try
-      {
-        in.close();
-      }
-      catch (Exception e)
-      {
-        log.warn("Could not close BufferedReader", e);
-      }
-      try
-      {
-        isr.close();
-      }
-      catch (Exception e)
-      {
-        log.warn("Could not close InputStreamReader", e);
-      }
-      try
-      {
-        is.close();
-      }
-      catch (Exception e)
-      {
-        log.warn("Could not close InputStream", e);
-      }
+
+    private String readFile(String fileName) {
+        InputStream is = getClass().getResourceAsStream(fileName);
+        InputStreamReader isr = new InputStreamReader(is);
+        BufferedReader in = new BufferedReader(isr);
+        StringBuilder ss = new StringBuilder();
+        try {
+            String s = in.readLine();
+            while (s != null) {
+                ss.append(s).append('\n');
+                s = in.readLine();
+            }
+        } catch (IOException e) {
+            System.out.println("Error reading " + fileName + ": " + e.getMessage());
+            throw new RuntimeException("Error reading " + fileName + ": " + e.getMessage(), e);
+        } finally {
+            try {
+                in.close();
+            } catch (Exception e) {
+                log.warn("Could not close BufferedReader", e);
+            }
+            try {
+                isr.close();
+            } catch (Exception e) {
+                log.warn("Could not close InputStreamReader", e);
+            }
+            try {
+                is.close();
+            } catch (Exception e) {
+                log.warn("Could not close InputStream", e);
+            }
+        }
+        return ss.toString();
     }
-    return ss.toString();
-  }
-
-  private String buildXmlRequest(Map<String, String> param, String template)
-  {
-    StringBuilder ss = new StringBuilder();
-    int i = 0;
-    while (i < template.length())
-    {
-      int i1 = template.indexOf("${", i);
-      if (i1 < 0)
-      {
-        ss.append(template.substring(i));
-        break;
-      }
-
-      int i2 = template.indexOf('}', i1 + 2);
-      if (i2 < 0)
-        throw new RuntimeException("Template error: Matching } not found");
-
-      String var1 = template.substring(i1 + 2, i2);
-      String value1 = param.get(var1);
-      if (value1 == null || value1.trim().length() == 0)
-      {
-        // delete the whole element (line)
-        int i3 = template.lastIndexOf('\n', i1);
-        if (i3 < 0)
-          i3 = 0;
-        int i4 = template.indexOf('\n', i1);
-        if (i4 < 0)
-          i4 = template.length();
-
-        if (i < i3)
-          ss.append(template.substring(i, i3));
-        i = i4;
-      }
-      else
-      {
-        ss.append(template.substring(i, i1)).append(value1);
-        i = i2 + 1;
-      }
+
+    private String buildXmlRequest(Map<String, String> param, String template) {
+        StringBuilder ss = new StringBuilder();
+        int i = 0;
+        while (i < template.length()) {
+            int i1 = template.indexOf("${", i);
+            if (i1 < 0) {
+                ss.append(template.substring(i));
+                break;
+            }
+
+            int i2 = template.indexOf('}', i1 + 2);
+            if (i2 < 0) {
+                throw new RuntimeException("Template error: Matching } not found");
+            }
+
+            String var1 = template.substring(i1 + 2, i2);
+            String value1 = param.get(var1);
+            if (value1 == null || value1.trim().length() == 0) {
+                // delete the whole element (line)
+                int i3 = template.lastIndexOf('\n', i1);
+                if (i3 < 0) {
+                    i3 = 0;
+                }
+                int i4 = template.indexOf('\n', i1);
+                if (i4 < 0) {
+                    i4 = template.length();
+                }
+
+                if (i < i3) {
+                    ss.append(template.substring(i, i3));
+                }
+                i = i4;
+            } else {
+                ss.append(template.substring(i, i1)).append(value1);
+                i = i2 + 1;
+            }
+        }
+
+        return ss.toString();
     }
 
-    return ss.toString();
-  }
-
-  private String buildNetworkData2(SvcLogicContext ctx, String template, String operation)
-  {
-    log.info("Building XML started");
-    long t1 = System.currentTimeMillis();
-
-    template = expandRepeats(ctx, template, 1);
-
-    Map<String, String> mm = new HashMap<>();
-    for (String s : ctx.getAttributeKeySet())
-      mm.put(s, ctx.getAttribute(s));
-    mm.put("operation", operation);
-
-    StringBuilder ss = new StringBuilder();
-    int i = 0;
-    while (i < template.length())
-    {
-      int i1 = template.indexOf("${", i);
-      if (i1 < 0)
-      {
-        ss.append(template.substring(i));
-        break;
-      }
-
-      int i2 = template.indexOf('}', i1 + 2);
-      if (i2 < 0)
-        throw new RuntimeException("Template error: Matching } not found");
-
-      String var1 = template.substring(i1 + 2, i2);
-      String value1 = XmlUtil.getXml(mm, var1);
-      if (value1 == null || value1.trim().length() == 0)
-      {
-        int i3 = template.lastIndexOf('\n', i1);
-        if (i3 < 0)
-          i3 = 0;
-        int i4 = template.indexOf('\n', i1);
-        if (i4 < 0)
-          i4 = template.length();
-
-        if (i < i3)
-          ss.append(template.substring(i, i3));
-        i = i4;
-      }
-      else
-      {
-        ss.append(template.substring(i, i1)).append(value1);
-        i = i2 + 1;
-      }
+    private String buildNetworkData2(SvcLogicContext ctx, String template, String operation) {
+        log.info("Building XML started");
+        long t1 = System.currentTimeMillis();
+
+        template = expandRepeats(ctx, template, 1);
+
+        Map<String, String> mm = new HashMap<>();
+        for (String s : ctx.getAttributeKeySet()) {
+            mm.put(s, ctx.getAttribute(s));
+        }
+        mm.put("operation", operation);
+
+        StringBuilder ss = new StringBuilder();
+        int i = 0;
+        while (i < template.length()) {
+            int i1 = template.indexOf("${", i);
+            if (i1 < 0) {
+                ss.append(template.substring(i));
+                break;
+            }
+
+            int i2 = template.indexOf('}', i1 + 2);
+            if (i2 < 0) {
+                throw new RuntimeException("Template error: Matching } not found");
+            }
+
+            String var1 = template.substring(i1 + 2, i2);
+            String value1 = XmlUtil.getXml(mm, var1);
+            if (value1 == null || value1.trim().length() == 0) {
+                int i3 = template.lastIndexOf('\n', i1);
+                if (i3 < 0) {
+                    i3 = 0;
+                }
+                int i4 = template.indexOf('\n', i1);
+                if (i4 < 0) {
+                    i4 = template.length();
+                }
+
+                if (i < i3) {
+                    ss.append(template.substring(i, i3));
+                }
+                i = i4;
+            } else {
+                ss.append(template.substring(i, i1)).append(value1);
+                i = i2 + 1;
+            }
+        }
+
+        long t2 = System.currentTimeMillis();
+        log.info("Building XML completed. Time: " + (t2 - t1));
+
+        return ss.toString();
     }
 
-    long t2 = System.currentTimeMillis();
-    log.info("Building XML completed. Time: " + (t2 - t1));
-
-    return ss.toString();
-  }
-
-  private String expandRepeats(SvcLogicContext ctx, String template, int level)
-  {
-    StringBuilder newTemplate = new StringBuilder();
-    int k = 0;
-    while (k < template.length())
-    {
-      int i1 = template.indexOf("${repeat:", k);
-      if (i1 < 0)
-      {
-        newTemplate.append(template.substring(k));
-        break;
-      }
-
-      int i2 = template.indexOf(':', i1 + 9);
-      if (i2 < 0)
-        throw new RuntimeException(
-          "Template error: Context variable name followed by : is required after repeat");
-
-      // Find the closing }, store in i3
-      int nn = 1;
-      int i3 = -1;
-      int i = i2;
-      while (nn > 0 && i < template.length())
-      {
-        i3 = template.indexOf('}', i);
-        if (i3 < 0)
-          throw new RuntimeException("Template error: Matching } not found");
-        int i32 = template.indexOf('{', i);
-        if (i32 >= 0 && i32 < i3)
-        {
-          nn++;
-          i = i32 + 1;
+    private String expandRepeats(SvcLogicContext ctx, String template, int level) {
+        StringBuilder newTemplate = new StringBuilder();
+        int k = 0;
+        while (k < template.length()) {
+            int i1 = template.indexOf("${repeat:", k);
+            if (i1 < 0) {
+                newTemplate.append(template.substring(k));
+                break;
+            }
+
+            int i2 = template.indexOf(':', i1 + 9);
+            if (i2 < 0) {
+                throw new RuntimeException(
+                    "Template error: Context variable name followed by : is required after repeat");
+            }
+
+            // Find the closing }, store in i3
+            int nn = 1;
+            int i3 = -1;
+            int i = i2;
+            while (nn > 0 && i < template.length()) {
+                i3 = template.indexOf('}', i);
+                if (i3 < 0) {
+                    throw new RuntimeException("Template error: Matching } not found");
+                }
+                int i32 = template.indexOf('{', i);
+                if (i32 >= 0 && i32 < i3) {
+                    nn++;
+                    i = i32 + 1;
+                } else {
+                    nn--;
+                    i = i3 + 1;
+                }
+            }
+
+            String var1 = template.substring(i1 + 9, i2);
+            String value1 = ctx.getAttribute(var1);
+            log.info("     " + var1 + ": " + value1);
+            int n = 0;
+            try {
+                n = Integer.parseInt(value1);
+            } catch (Exception e) {
+                n = 0;
+            }
+
+            newTemplate.append(template.substring(k, i1));
+
+            String rpt = template.substring(i2 + 1, i3);
+
+            for (int ii = 0; ii < n; ii++) {
+                String ss = rpt.replaceAll("\\[\\$\\{" + level + "\\}\\]", "[" + ii + "]");
+                newTemplate.append(ss);
+            }
+
+            k = i3 + 1;
         }
-        else
-        {
-          nn--;
-          i = i3 + 1;
+
+        if (k == 0) {
+            return newTemplate.toString();
         }
-      }
-
-      String var1 = template.substring(i1 + 9, i2);
-      String value1 = ctx.getAttribute(var1);
-      log.info("     " + var1 + ": " + value1);
-      int n = 0;
-      try
-      {
-        n = Integer.parseInt(value1);
-      }
-      catch (Exception e)
-      {
-        n = 0;
-      }
-
-      newTemplate.append(template.substring(k, i1));
-
-      String rpt = template.substring(i2 + 1, i3);
-
-      for (int ii = 0; ii < n; ii++)
-      {
-        String ss = rpt.replaceAll("\\[\\$\\{" + level + "\\}\\]", "[" + ii + "]");
-        newTemplate.append(ss);
-      }
-
-      k = i3 + 1;
+
+        return expandRepeats(ctx, newTemplate.toString(), level + 1);
     }
 
-    if (k == 0)
-      return newTemplate.toString();
+    private HttpResponse sendXmlRequest(String xmlRequest, String url, String user, String password) {
+        try {
+            Client client = Client.create();
+            client.setConnectTimeout(5000);
+            WebResource webResource = client.resource(url);
 
-    return expandRepeats(ctx, newTemplate.toString(), level + 1);
-  }
+            log.info("SENDING...............");
+            log.info(xmlRequest);
 
-  private HttpResponse sendXmlRequest(String xmlRequest, String url, String user, String password)
-  {
-    try
-    {
-      Client client = Client.create();
-      client.setConnectTimeout(5000);
-      WebResource webResource = client.resource(url);
+            String authString = user + ":" + password;
+            byte[] authEncBytes = Base64.encode(authString);
+            String authStringEnc = new String(authEncBytes);
+            authString = "Basic " + authStringEnc;
 
-      log.info("SENDING...............");
-      log.info(xmlRequest);
+            ClientResponse response =
+                webResource.header("Authorization", authString).accept("UTF-8").type("application/xml").post(
+                    ClientResponse.class, xmlRequest);
 
-      String authString = user + ":" + password;
-      byte[] authEncBytes = Base64.encode(authString);
-      String authStringEnc = new String(authEncBytes);
-      authString = "Basic " + authStringEnc;
+            int code = response.getStatus();
+            String message = null;
 
-      ClientResponse response =
-        webResource.header("Authorization", authString).accept("UTF-8").type("application/xml").post(
-          ClientResponse.class, xmlRequest);
+            log.info("RESPONSE...............");
+            log.info("HTTP response code: " + code);
+            log.info("HTTP response message: " + message);
+            log.info("");
 
-      int code = response.getStatus();
-      String message = null;
+            HttpResponse r = new HttpResponse();
+            r.code = code;
+            r.message = message;
+            return r;
 
-      log.info("RESPONSE...............");
-      log.info("HTTP response code: " + code);
-      log.info("HTTP response message: " + message);
-      log.info("");
+        } catch (Exception e) {
+            log.error("Error sending the request: ", e);
 
-      HttpResponse r = new HttpResponse();
-      r.code = code;
-      r.message = message;
-      return r;
+            HttpResponse r = new HttpResponse();
+            r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
+            r.message = e.getMessage();
+            return r;
+        }
+    }
 
+    private static class HttpResponse {
+
+        public int code;
+        public String message;
+    }
+
+    private ConfigStatus setResponseStatus(SvcLogicContext ctx, HttpResponse r) {
+        ctx.setAttribute("error-code", String.valueOf(r.code));
+        ctx.setAttribute("error-message", r.message);
+
+        return r.code > 299 ? ConfigStatus.FAILURE : ConfigStatus.SUCCESS;
     }
-    catch (Exception e)
-    {
-      log.error("Error sending the request: ", e);
-
-      HttpResponse r = new HttpResponse();
-      r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-      r.message = e.getMessage();
-      return r;
+
+    private String getStringBetweenQuotes(String string) {
+        String fnName = "ConfigComponentAdaptor.getStringBetweenQuotes";
+        debugLog.printRTAriDebug(fnName, "string=" + string);
+        String retString = null;
+        int start = string.indexOf("\"");
+        int end = string.lastIndexOf("\"");
+        retString = string.substring(start + 1, end);
+        debugLog.printRTAriDebug(fnName, "retString=" + retString);
+        return (retString);
     }
-  }
-
-  private static class HttpResponse
-  {
-
-    public int code;
-    public String message;
-  }
-
-  private ConfigStatus setResponseStatus(SvcLogicContext ctx, HttpResponse r)
-  {
-    ctx.setAttribute("error-code", String.valueOf(r.code));
-    ctx.setAttribute("error-message", r.message);
-
-    return r.code > 299 ? ConfigStatus.FAILURE : ConfigStatus.SUCCESS;
-  }
-
-  private String getStringBetweenQuotes(String string)
-  {
-    String fnName = "ConfigComponentAdaptor.getStringBetweenQuotes";
-    DebugLog.printAriDebug(fnName, "string="+string);
-    String retString = null;
-    int start = string.indexOf("\"");
-    int end = string.lastIndexOf("\"");
-    retString = string.substring(start+1, end);
-    DebugLog.printAriDebug(fnName, "retString="+retString);
-    return(retString);
-  }
-
-  public static String _readFile(String fileName)
-  {
-    StringBuffer strBuff = new StringBuffer();
-    String line;
-    try
-    {
-      BufferedReader in = new BufferedReader(new FileReader(fileName));
-      while ((line = in.readLine()) != null)
-      {
-        strBuff.append(line+"\n");
-      }
-      in.close();
+
+    public static String _readFile(String fileName) {
+        StringBuffer strBuff = new StringBuffer();
+        String line;
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(fileName));
+            while ((line = in.readLine()) != null) {
+                strBuff.append(line + "\n");
+            }
+            in.close();
+        } catch (IOException e) {
+            System.out.println("Caught an IOException in method readFile(): e=" + e.toString());
+        }
+        return (strBuff.toString());
     }
-    catch (IOException e)
-    {
-      System.out.println("Caught an IOException in method readFile(): e="+e.toString());
+
+    private String trimResponse(String response) {
+        StringTokenizer line = new StringTokenizer(response, "\n");
+        StringBuffer sb = new StringBuffer();
+        boolean captureText = false;
+        while (line.hasMoreTokens()) {
+            String token = line.nextToken();
+            if (token.indexOf("<configuration xmlns=") != -1) {
+                captureText = true;
+            }
+            if (captureText) {
+                sb.append(token + "\n");
+            }
+            if (token.indexOf("</configuration>") != -1) {
+                captureText = false;
+            }
+        }
+        return (sb.toString());
     }
-    return (strBuff.toString());
-  }
-
-  private String trimResponse(String response)
-  {
-    StringTokenizer line = new StringTokenizer(response, "\n");
-    StringBuffer sb = new StringBuffer();
-    boolean captureText = false;
-    while (line.hasMoreTokens())
-    {
-      String token = line.nextToken();
-      if (token.indexOf("<configuration xmlns=") != -1)
-        captureText = true;
-      if (captureText)
-        sb.append(token +"\n");
-      if (token.indexOf("</configuration>") != -1)
-        captureText = false;
+
+    public static void main(String args[]) throws Exception {
+        Properties props = null;
+        System.out.println("*************************Hello*****************************");
+        ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
+        String Get_config_template = _readFile("/home/userID/data/Get_config_template");
+        String Download_config_template = _readFile("/home/userID/data/Download_config_template_2");
+        String key = "GetCliRunningConfig";
+        Map<String, String> parameters = new HashMap();
+        parameters.put("Host_ip_address", "000.00.000.00");
+        parameters.put("User_name", "root");
+        parameters.put("Password", "!bootstrap");
+        parameters.put("Port_number", "22");
+        parameters.put("Get_config_template", Get_config_template);
+        SvcLogicContext ctx = null;
+        System.out.println("*************************TRACE 1*****************************");
+        cca.configure(key, parameters, ctx);
     }
-    return(sb.toString());
-  }
-
-  public static void main (String args[])  throws Exception
-  {
-    Properties props = null;
-    System.out.println("*************************Hello*****************************");
-    ConfigComponentAdaptor cca = new ConfigComponentAdaptor(props);
-    String Get_config_template = _readFile ("/home/userID/data/Get_config_template");
-    String Download_config_template = _readFile ("/home/userID/data/Download_config_template_2");
-    String key = "GetCliRunningConfig";
-    Map<String, String> parameters = new HashMap();
-    parameters.put("Host_ip_address", "000.00.000.00");
-    parameters.put("User_name", "root");
-    parameters.put("Password", "!bootstrap");
-    parameters.put("Port_number", "22");
-    parameters.put("Get_config_template", Get_config_template);
-    SvcLogicContext ctx = null;
-    System.out.println("*************************TRACE 1*****************************");
-    cca.configure(key, parameters, ctx);
-  }
+
 }
\ No newline at end of file
diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java
index 52527844b..c3fdd98dd 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/DebugLog.java
@@ -29,53 +29,34 @@ import java.io.FileWriter;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringWriter;
+import java.nio.file.Path;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
 
-public class DebugLog {
+public final class DebugLog {
 
-    private static String fileName = "/tmp/rt.log";
+    public static final String LOG_FILE = "/tmp/rt.log";
+    private final Path path;
 
-    public static void main(String args[]) {
-        DebugLog debugLog = new DebugLog();
-        debugLog.printAriDebug("DebugLog", "The Message");
+    public DebugLog(Path path) {
+        this.path = path;
     }
 
-    public static void printAriDebug(String fn, String messg) {
-        String logMessg = getDateTime() + " " + fn + " " + messg;
-        appendToFile(logMessg + "\n");
-
-    }
-
-    public static void printRTAriDebug(String fn, String messg) {
-        // System.out.println (getDateTime() +" " +fn +" " + messg);
-        String logMessg = getDateTime() + " " + fn + " " + messg;
-        appendToFile(logMessg + "\n");
+    public void printRTAriDebug(String methodName, String message) {
+        writeToLogFile(methodName, message);
     }
 
-    public static String getDateTime() {
+    private String currentDateTime() {
         DateFormat dateFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-        // DateFormat dateFormat = new SimpleDateFormat("HH:mm:ss");
-        Date date = new Date();
-        return dateFormat.format(date);
+        return dateFormat.format(new Date());
     }
 
-    public static void appendToFile(String dataToWrite) {
-        String fn = "DebugLog.appendToFile";
-        try {
-            // First check to see if a file 'fileName' exist, if it does
-            // write to it. If it does not exist, don't write to it.
-            File tmpFile = new File(fileName);
-            if (tmpFile.exists()) {
-                BufferedWriter out = new BufferedWriter(new FileWriter(fileName, true));
-                out.write(dataToWrite);
-                out.close();
-            }
+    private void appendToFile(File logPath, String dataToWrite) {
+        try (BufferedWriter out = new BufferedWriter(new FileWriter(logPath, true))) {
+            out.write(dataToWrite);
         } catch (IOException e) {
-            DebugLog.printRTAriDebug(fn, "writeToFile() exception: " + e);
-            //System.err.println("writeToFile() exception: " + e);
             e.printStackTrace();
         }
     }
@@ -85,15 +66,26 @@ public class DebugLog {
         StringWriter sw = new StringWriter();
         e.printStackTrace(new PrintWriter(sw));
         String stackTrace = sw.toString();
-        DebugLog.printRTAriDebug(fn, "Stack trace::: " + stackTrace);
+        writeToLogFile(fn, "Stack trace::: " + stackTrace);
     }
 
-    public static String getStackTraceString(Exception e) {
-        String fn = "DebugLog.outputStackTrace";
-        StringWriter sw = new StringWriter();
-        e.printStackTrace(new PrintWriter(sw));
-        String stackTrace = sw.toString();
-        return (stackTrace);
+    private void writeToLogFile(String methodName, String message) {
+        File logPath = path.toFile();
+        if (logPath.exists()) {
+            StringBuilder logMessageBuilder = createLogMessage(methodName, message);
+            appendToFile(logPath, logMessageBuilder.toString());
+        }
     }
 
+    private StringBuilder createLogMessage(String methodName, String message) {
+        StringBuilder logMessageBuilder = new StringBuilder();
+        logMessageBuilder
+            .append(currentDateTime())
+            .append(" ")
+            .append(methodName)
+            .append(" ")
+            .append(message)
+            .append('\n');
+        return logMessageBuilder;
+    }
 }
diff --git a/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/DebugLogTest.java b/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/DebugLogTest.java
index 6fcb62675..472bdc70d 100644
--- a/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/DebugLogTest.java
+++ b/appc-config/appc-config-adaptor/provider/src/test/java/org/onap/appc/ccadaptor/DebugLogTest.java
@@ -1,38 +1,90 @@
-/*-

+/*-
  * ============LICENSE_START=======================================================
  * ONAP : APPC
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
- * Copyright (C) 2017 Amdocs

- * =============================================================================

- * Licensed under the Apache License, Version 2.0 (the "License");

- * you may not use this file except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *      http://www.apache.org/licenses/LICENSE-2.0

- * 

- * Unless required by applicable law or agreed to in writing, software

- * distributed under the License is distributed on an "AS IS" BASIS,

- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

- * See the License for the specific language governing permissions and

- * limitations under the License.

- * 

+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================

- */

-

-package org.onap.appc.ccadaptor;

-

-import org.junit.Assert;

-import org.junit.Test;

-

-public class DebugLogTest {

-    

-    @Test

-    public void TestGetDateTime() {

-        String DateTime = DebugLog.getDateTime();

-        Assert.assertNotNull(DateTime);

-    }

-

+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.appc.ccadaptor;
+
+import static junit.framework.TestCase.assertTrue;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import org.junit.AfterClass;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class DebugLogTest {
+
+    @BeforeClass
+    public static void createEmptyLogFile() throws IOException {
+        Path logPath = Paths.get(buildTestResourcePath("rt.log"));
+        Files.createFile(logPath);
+    }
+
+    @AfterClass
+    public static void removeLog() throws IOException {
+        Path existingLogPath = Paths.get(buildTestResourcePath("rt.log"));
+        Files.delete(existingLogPath);
+    }
+
+    @Test
+    public void printRTAriDebug_shouldNotDoAnything_whenLogFileDoesNotExist() {
+        // GIVEN
+        Path nonExistingLogPath = Paths.get(buildTestResourcePath("nonExisting.log"));
+
+        // WHEN
+        DebugLog debugLog = new DebugLog(nonExistingLogPath);
+        debugLog.printRTAriDebug("testMethod", "Custom Debug Message");
+
+        // THEN
+        assertTrue(Files.notExists(nonExistingLogPath));
+    }
+
+    @Test
+    public void printRTAriDebug_shouldWriteMessageToLogWithDate_whenLogFileExists() throws IOException {
+        // GIVEN
+        Path existingLogPath = Paths.get(buildTestResourcePath("rt.log"));
+
+        // WHEN
+        DebugLog debugLog = new DebugLog(existingLogPath);
+        debugLog.printRTAriDebug("testMethod", "Custom Debug Message");
+
+        // THEN
+        String logEntry = readLogEntry(existingLogPath);
+        assertTrue(logEntry.matches("\\d{4}/\\d{2}/\\d{2} \\d{2}:\\d{2}:\\d{2} testMethod Custom Debug Message"));
+    }
+
+    private static String buildTestResourcePath(String resourceName) {
+        String path = DebugLogTest.class.getClassLoader().getResource("./").getPath();
+        return path + resourceName;
+    }
+
+    private String readLogEntry(Path path) throws IOException {
+        try (BufferedReader br = new BufferedReader(new FileReader(path.toFile()))) {
+            return br.readLine();
+        }
+    }
 }
\ No newline at end of file