Updates to config adaptor bundle

Issue-ID: APPC-373
Change-Id: I4c7f60c8fd8ab80bc03aab717bb8b30d0240c4bc
Signed-off-by: George, Lina (lg941u) <lg941u@att.com>

2 files changed, 1019 insertions, 932 deletions

diff --git a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
index 9f94bfabf..0b022c8b0 100644
--- a/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
+++ b/appc-config/appc-config-adaptor/provider/src/main/java/org/onap/appc/ccadaptor/CCAActivator.java
@@ -35,59 +35,86 @@ import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
 import org.osgi.framework.ServiceRegistration;
 
-public class CCAActivator implements BundleActivator {
+public class CCAActivator implements BundleActivator
+{
 
-    private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES";
-    private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR";
-    //private static final Logger log = LoggerFactory.getLogger(CCAActivator.class);
-    private static final EELFLogger log = EELFManager.getInstance().getLogger(CCAActivator.class);
-    @SuppressWarnings("rawtypes")
-    private ServiceRegistration registration = null;
+  private static final String CCA_PROP_FILE_VAR = "SDNC_CCA_PROPERTIES";
+  private static final String SDNC_CONFIG_DIR_VAR = "SDNC_CONFIG_DIR";
 
-    @Override
-    public void start(BundleContext ctx) throws Exception {
-        // Read properties
-        Properties props = new Properties();
+  @SuppressWarnings("rawtypes")
+  private ServiceRegistration registration = null;
 
-        // Read properties from appc-config-adaptor.properties
-        String propFileName = System.getenv(CCA_PROP_FILE_VAR);
-        if (propFileName == null) {
-            String propDir = System.getenv(SDNC_CONFIG_DIR_VAR);
-            if (propDir == null) {
-                throw new ConfigurationException(
-                    "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + SDNC_CONFIG_DIR_VAR + " unset");
-            }
+  //private static final Logger log = LoggerFactory.getLogger(CCAActivator.class);
+  private static final EELFLogger log = EELFManager.getInstance().getLogger(CCAActivator.class);
 
-            propFileName = propDir + "/appc-config-adaptor.properties";
-            log.warn("Environment variable " + CCA_PROP_FILE_VAR + " unset - defaulting to " + propFileName);
-        }
+  @Override
+  public void start(BundleContext ctx) throws Exception
+  {
+    // Read properties
+    Properties props = new Properties();
 
-        File propFile = new File(propFileName);
-        if (!propFile.exists()) {
-            throw new ConfigurationException("Missing configuration properties file: " + propFile);
-        }
+    // Read properties from appc-config-adaptor.properties
+    String propFileName = System.getenv(CCA_PROP_FILE_VAR);
+    if (propFileName == null)
+    {
+      String propDir = System.getenv(SDNC_CONFIG_DIR_VAR);
+      if (propDir == null)
+        throw new ConfigurationException(
+          "Cannot find config file - " + CCA_PROP_FILE_VAR + " and " + SDNC_CONFIG_DIR_VAR + " unset");
 
-        try (InputStream in = new FileInputStream(propFile)) {
-            props.load(in);
-            log.info("Loaded properties: ");
-        } catch (Exception e) {
-            throw new ConfigurationException("Could not load properties file " + propFileName, e);
-        }
+      propFileName = propDir + "/appc-config-adaptor.properties";
+      log.warn("Environment variable " + CCA_PROP_FILE_VAR + " unset - defaulting to " + propFileName);
+    }
 
-        // Advertise adaptor
-        ConfigComponentAdaptor adaptor = new ConfigComponentAdaptor(props);
-        if (registration == null) {
-            log.info("Registering service " + ConfigComponentAdaptor.class.getName());
-            registration = ctx.registerService(ConfigComponentAdaptor.class.getName(), adaptor, null);
-        }
+    File propFile = new File(propFileName);
+    if (!propFile.exists())
+      throw new ConfigurationException("Missing configuration properties file: " + propFile);
 
+    InputStream in = new FileInputStream(propFile);
+    try
+    {
+      props.load(in);
+    }
+    catch (Exception e)
+    {
+      throw new ConfigurationException("Could not load properties file " + propFileName, e);
     }
+    finally
+    {
+      try
+      {
+        in.close();
+      }
+      catch (Exception e)
+      {
+        log.warn("Could not close FileInputStream", e);
+      }
+    }
+
+    log.info("Loaded properties: ");
+    /*for (Object key : props.keySet())
+    {
+      Object value = props.get(key);
+      log.info("    " + key + "=" + value);
+    }*/
+
+    // Advertise adaptor
+    ConfigComponentAdaptor adaptor = new ConfigComponentAdaptor(props);
+    if (registration == null)
+    {
+      log.info("Registering service " + ConfigComponentAdaptor.class.getName());
+      registration = ctx.registerService(ConfigComponentAdaptor.class.getName(), adaptor, null);
+    }
+
+  }
 
-    @Override
-    public void stop(BundleContext ctx) throws Exception {
-        if (registration != null) {
-            registration.unregister();
-            registration = null;
-        }
+  @Override
+  public void stop(BundleContext ctx) throws Exception
+  {
+    if (registration != null)
+    {
+      registration.unregister();
+      registration = null;
     }
-}
+  }
+}
\ No newline at end of file
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 fb833cf73..65cf97a44 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
@@ -41,947 +41,1007 @@ 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);
-    DebugLog debugLog = new DebugLog();
-    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;
-
-    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 = "";
-        }
+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));
     }
 
-    @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));
-        }
-
-        String parmval = parameters.get("config-component-configUrl");
-        if ((parmval != null) && (parmval.length() > 0)) {
-            log.debug("Overwriting URL with " + parmval);
-            configUrl = 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-configPassword");
-        if ((parmval != null) && (parmval.length() > 0)) {
-            log.debug("Overwriting configPassword with " + parmval);
-            configPassword = 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;
-        }
+    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");
+                         "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;
+          }
         }
-        if ("activate".equalsIgnoreCase(action)) {
-            return activate(ctx, false);
+        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 ("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;
-
-            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
-            log.debug("SCP: SshJcraftWrapper has been instantiated");
-            debugLog.printRTAriDebug(fnName, "SCP: SshJcraftWrapper has been instantiated");
-            try {
-                if (key.equals("put")) {
-                    data = parameters.get("data");
-                    if (data != null) {
-                        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 {
-                        r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
-                        log.debug(fnName + " Command is for put: data is null");
-                    }
-                } else     // Must be a get
+        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 (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())
                 {
-                    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");
+                  String line2 = st2.nextToken();
+                  if (line2.indexOf("#") == -1)
+                    CliResponse += line2 +"\n";
                 }
-                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));
-            }
+        catch (NoSuchElementException e)
+        {
+          DebugLog.printAriDebug(fnName, "Caught a NoSuchElementException: e="+e);
         }
-        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));
+        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("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 (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, 30 * 1000, command);
-                            response += tmpResponse;
-                            if (showConfigFlag) {
-                                showConfigFlag = false;
-                                StringTokenizer st2 = new StringTokenizer(tmpResponse, "\n");
-                                //    Strip off the last line which is the command prompt from the VNF device.
-                                while (st2.hasMoreTokens()) {
-                                    String line2 = st2.nextToken();
-                                    if (line2.indexOf("#") == -1) {
-                                        CliResponse += line2 + "\n";
-                                    }
-                                }
-                            }
-                        }
-                    }
-                } 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));
-            }
+        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("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;
-                } 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;
-                    }
-                }
-                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));
+        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("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));
+            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("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");
-                        } 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;
-                        } 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;
-                            }
-                        }
-                    }
-                } catch (NoSuchElementException e) {
-                    DebugLog.printAriDebug(fnName, "Caught a NoSuchElementException: e=" + e);
-                }
-                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));
+            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;
+              }
             }
+          }
         }
-
-        debugLog.printRTAriDebug(fnName, "Unsupported action - " + action);
-        log.error("Unsupported action - " + action);
-        return ConfigStatus.FAILURE;
+        catch (NoSuchElementException e)
+        {
+          DebugLog.printAriDebug(fnName, "Caught a NoSuchElementException: e="+e);
+        }
+        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));
+      }
     }
 
-    private void log(String fileName, String messg) {
-        debugLog.printRTAriDebug(fileName, messg);
-        log.debug(fileName + ": " + messg);
+    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);
     }
-
-    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 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 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, 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);
     }
-
-    @Override
-    public ConfigStatus deactivate(String key, SvcLogicContext ctx) {
-        return ConfigStatus.SUCCESS;
+    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 String escapeMySql(String input) {
-        if (input == null) {
-            return null;
-        }
-
-        input = input.replace("\\", "\\\\");
-        input = input.replace("\'", "\\'");
-
-        return input;
+    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();
+      }
     }
-
-    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();
+    catch (IOException e)
+    {
+      System.out.println("Error reading " + fileName + ": " + e.getMessage());
+      throw new RuntimeException("Error reading " + fileName + ": " + e.getMessage(), e);
     }
-
-    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();
+    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 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) {
-                // 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;
-            }
-        }
-
-        long t2 = System.currentTimeMillis();
-        log.info("Building XML completed. Time: " + (t2 - t1));
-
-        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 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);
-            }
+    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;
+      }
+    }
 
-            k = i3 + 1;
+    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;
         }
-
-        if (k == 0) {
-            return newTemplate.toString();
+        else
+        {
+          nn--;
+          i = i3 + 1;
         }
-
-        return expandRepeats(ctx, newTemplate.toString(), level + 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;
     }
 
-    private HttpResponse sendXmlRequest(String xmlRequest, String url, String user, String password) {
-        try {
-            Client client = Client.create();
-            client.setConnectTimeout(5000);
-            WebResource webResource = client.resource(url);
+    if (k == 0)
+      return newTemplate.toString();
 
-            log.info("SENDING...............");
-            log.info(xmlRequest);
+    return expandRepeats(ctx, newTemplate.toString(), level + 1);
+  }
 
-            String authString = user + ":" + password;
-            byte[] authEncBytes = Base64.encode(authString);
-            String authStringEnc = new String(authEncBytes);
-            authString = "Basic " + authStringEnc;
+  private HttpResponse sendXmlRequest(String xmlRequest, String url, String user, String password)
+  {
+    try
+    {
+      Client client = Client.create();
+      client.setConnectTimeout(5000);
+      WebResource webResource = client.resource(url);
 
-            ClientResponse response =
-                webResource.header("Authorization", authString).accept("UTF-8").type("application/xml").post(
-                    ClientResponse.class, xmlRequest);
+      log.info("SENDING...............");
+      log.info(xmlRequest);
 
-            int code = response.getStatus();
-            String message = null;
+      String authString = user + ":" + password;
+      byte[] authEncBytes = Base64.encode(authString);
+      String authStringEnc = new String(authEncBytes);
+      authString = "Basic " + authStringEnc;
 
-            log.info("RESPONSE...............");
-            log.info("HTTP response code: " + code);
-            log.info("HTTP response message: " + message);
-            log.info("");
+      ClientResponse response =
+        webResource.header("Authorization", authString).accept("UTF-8").type("application/xml").post(
+          ClientResponse.class, xmlRequest);
 
-            HttpResponse r = new HttpResponse();
-            r.code = code;
-            r.message = message;
-            return r;
+      int code = response.getStatus();
+      String message = null;
 
-        } 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;
-        }
-    }
+      log.info("RESPONSE...............");
+      log.info("HTTP response code: " + code);
+      log.info("HTTP response message: " + message);
+      log.info("");
 
-    private static class HttpResponse {
+      HttpResponse r = new HttpResponse();
+      r.code = code;
+      r.message = message;
+      return r;
 
-        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);
+    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;
     }
-
-    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");
-            }
-        } catch (IOException e) {
-            System.out.println("Caught an IOException in method readFile(): e=" + e.toString());
-        }
-        return (strBuff.toString());
+  }
+
+  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();
     }
-
-    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());
+    catch (IOException e)
+    {
+      System.out.println("Caught an IOException in method readFile(): e="+e.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);
+    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;
     }
-}
-
+    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