Changed to unmaintained
[appc.git] / appc-config / appc-config-adaptor / provider / src / main / java / org / onap / appc / ccadaptor / ConfigComponentAdaptor.java
index fb833cf..1928687 100644 (file)
@@ -1,49 +1,79 @@
 /*-
  * ============LICENSE_START=======================================================
- * ONAP : APP-C
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property.All rights reserved.
+ * ONAP : APPC
  * ================================================================================
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * =============================================================================
+ * Modifications Copyright (C) 2018-2019 IBM.
+ * =============================================================================
+ * Modifications Copyright (C) 2018-2019 Ericsson
+ * =============================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
  *
- *     http://www.apache.org/licenses/LICENSE-2.0
+ *      http://www.apache.org/licenses/LICENSE-2.0
  *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
+ *
  * ============LICENSE_END=========================================================
  */
 
 package org.onap.appc.ccadaptor;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-import com.sun.jersey.api.client.Client;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.core.util.Base64;
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.HttpURLConnection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.NoSuchElementException;
 import java.util.Properties;
 import java.util.StringTokenizer;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.xpath.XPath;
+import javax.xml.xpath.XPathConstants;
+import javax.xml.xpath.XPathExpressionException;
+import javax.xml.xpath.XPathFactory;
+import org.onap.appc.exceptions.APPCException;
 import org.onap.ccsdk.sli.core.sli.SvcLogicAdaptor;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
+import org.w3c.dom.Document;
+import org.w3c.dom.Node;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+import org.glassfish.jersey.oauth1.signature.Base64;
+import org.glassfish.jersey.client.ClientConfig;
+import org.glassfish.jersey.client.ClientProperties;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.Response;
 
 public class ConfigComponentAdaptor implements SvcLogicAdaptor {
 
-    private static final EELFLogger log = EELFManager.getInstance().getLogger(ConfigComponentAdaptor.class);
+    private static EELFLogger log = EELFManager.getInstance().getLogger(ConfigComponentAdaptor.class);
     DebugLog debugLog = new DebugLog();
     private String configUrl = null;
     private String configUser = null;
@@ -51,8 +81,42 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
     private String auditUrl = null;
     private String auditUser = null;
     private String auditPassword = null;
+
+    public String getConfigUrl() {
+        return configUrl;
+    }
+
+    public String getConfigUser() {
+        return configUser;
+    }
+
+    public String getConfigPassword() {
+        return configPassword;
+    }
+
+    public String getAuditUrl() {
+        return auditUrl;
+    }
+
+    public String getAuditUser() {
+        return auditUser;
+    }
+
+    public String getAuditPassword() {
+        return auditPassword;
+    }
+
+    public String getConfigCallbackUrl() {
+        return configCallbackUrl;
+    }
+
+    public String getAuditCallbackUrl() {
+        return auditCallbackUrl;
+    }
+
     private String configCallbackUrl = null;
     private String auditCallbackUrl = null;
+    private int DEFAULT_TIMEOUT_GETRUNNING_CLI = 120 * 1000 ;
 
     public ConfigComponentAdaptor(Properties props) {
         if (props != null) {
@@ -82,12 +146,12 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         HttpResponse r = new HttpResponse();
         r.code = 200;
         log.debug("ConfigComponentAdaptor.configure - key = " + key);
-        debugLog.printRTAriDebug(fnName, "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));
+        DebugLog.printRTAriDebug(fnName, "Parameters:");
+        for (Map.Entry<String, String> entry : parameters.entrySet()) {
+            log.debug("        " + entry.getKey() + " = " + entry.getValue());
+            DebugLog.printRTAriDebug(fnName, "        " + entry.getKey() + " = " + entry.getValue());
         }
 
         String parmval = parameters.get("config-component-configUrl");
@@ -98,7 +162,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
 
         parmval = parameters.get("config-component-configPassword");
         if ((parmval != null) && (parmval.length() > 0)) {
-            log.debug("Overwriting configPassword with " + parmval);
+            //log.debug("Overwriting configPassword with " + parmval);
             configPassword = parmval;
         }
 
@@ -111,7 +175,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         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");
+                "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");
         }
@@ -120,7 +184,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         }
 
         String scale = ctx.getAttribute(
-            "service-data.vnf-config-parameters-list.vnf-config-parameters[0].scale-configuration[0].network-type");
+                "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");
         }
@@ -151,7 +215,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             return audit(ctx, "RUNNING");
         }
 
-        if ((key.equals("put")) || (key.equals("get"))) {
+        if (("put".equals(key)) || ("get".equals(key))) {
             String loginId = parameters.get("loginId");
             String host = parameters.get("host");
             String password = parameters.get("password");
@@ -159,24 +223,25 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             String fullPathFileName = parameters.get("fullPathFileName");
             String data = null;
 
-            SshJcraftWrapper sshJcraftWrapper = new SshJcraftWrapper();
+            SshJcraftWrapper sshJcraftWrapper = getSshJcraftWrapper();
             log.debug("SCP: SshJcraftWrapper has been instantiated");
-            debugLog.printRTAriDebug(fnName, "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());
+                        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);
+                        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....");
+                            DebugLog.printRTAriDebug(fnName, "Sleeping for 180 seconds....");
+                            Thread.sleep(1000l * 180);
+                            DebugLog.printRTAriDebug(fnName, "Woke up....");
                         } catch (java.lang.InterruptedException ee) {
                             boolean ignore = true;
+                            Thread.currentThread().interrupt();
                         }
                     } else {
                         r.code = HttpURLConnection.HTTP_INTERNAL_ERROR;
@@ -185,20 +250,18 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
                 } else     // Must be a get
                 {
                     log.debug("SCP: Doing a get: fullPathFileName=" + fullPathFileName);
-                    debugLog.printRTAriDebug(fnName, "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");
+                    DebugLog.printRTAriDebug(fnName, "Got the response and putting into the ctx object");
                     ctx.setAttribute("fileContents", response);
                     log.debug("SCP: Closing the SFTP connection");
                 }
-                sshJcraftWrapper = null;
                 return (setResponseStatus(ctx, r));
             } catch (IOException e) {
                 DebugLog.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));
             }
         }
@@ -207,14 +270,13 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             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();
+            SshJcraftWrapper sshJcraftWrapper = getSshJcraftWrapper();
             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);
+                log.debug("CLI: Attempting to login: host=" + host + " loginId=" + loginId +
+                        " portNumber=" + portNumber);
+                DebugLog.printRTAriDebug(fnName, "CLI: Attempting to login: host=" + host + " loginId=" + loginId +
+                        " portNumber=" + portNumber);
                 sshJcraftWrapper.connect(host, loginId, password, Integer.parseInt(portNumber));
 
                 DebugLog.printAriDebug(fnName, "Sending 'sdc'");
@@ -254,35 +316,34 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             return (setResponseStatus(ctx, r));
         }
         if (key.equals("GetCliRunningConfig")) {
-            debugLog.printRTAriDebug(fnName, "key was: 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();
+            String userName = parameters.get("User_name");
+            String hostIpAddress = parameters.get("Host_ip_address");
+            String password = parameters.get("Password");
+            password = EncryptionTool.getInstance().decrypt(password);
+            String portNumber = parameters.get("Port_number");
+            String getConfigTemplate = parameters.get("Get_config_template");
+            SshJcraftWrapper sshJcraftWrapper = getSshJcraftWrapper();
             log.debug("GetCliRunningConfig: sshJcraftWrapper was instantiated");
-            debugLog.printRTAriDebug(fnName, "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();
+                DebugLog.printAriDebug(fnName, "GetCliRunningConfig: User_name=" + userName +
+                        " Host_ip_address=" + hostIpAddress + " Port_number="
+                        + portNumber);
+                log.debug("GetCliRunningConfig: Attempting to login: Host_ip_address=" + hostIpAddress +
+                        " User_name=" + userName + " Port_number=" + portNumber);
                 String response = "";
                 String CliResponse = "";
                 boolean showConfigFlag = false;
-                sshJcraftWrapper.connect(Host_ip_address,
-                    User_name,
-                    Password,
-                    "",
-                    30000,
-                    Integer.parseInt(Port_number));
+                sshJcraftWrapper.connect(hostIpAddress,
+                        userName,
+                        password,
+                        "",
+                        30000,
+                        Integer.parseInt(portNumber));
                 DebugLog.printAriDebug(fnName, "GetCliRunningConfig: On the VNF device");
-                StringTokenizer st = new StringTokenizer(Get_config_template, "\n");
+                StringTokenizer st = new StringTokenizer(getConfigTemplate, "\n");
                 String command = null;
                 try {
                     while (st.hasMoreTokens()) {
@@ -304,7 +365,9 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
                             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);
+                            //DEFAULT_TIMEOUT_GETRUNNING_CLI : changed the default time out to 2 mins in 1806
+                            String tmpResponse = sshJcraftWrapper.receiveUntil(delemeter,
+                                    DEFAULT_TIMEOUT_GETRUNNING_CLI, command);
                             response += tmpResponse;
                             if (showConfigFlag) {
                                 showConfigFlag = false;
@@ -312,7 +375,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
                                 //    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) {
+                                    if (line2.indexOf('#') == -1) {
                                         CliResponse += line2 + "\n";
                                     }
                                 }
@@ -341,28 +404,28 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         }
         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 userName = parameters.get("User_name");
+            String hostIpAddress = parameters.get("Host_ip_address");
+            String password = parameters.get("Password");
+            password = EncryptionTool.getInstance().decrypt(password);
+            String portNumber = 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 ]]>]]>";
+            String commitCmd = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n <rpc xmlns=\"urn:ietf:params:xml:ns:netconf:base:1.0\" message-id=\"1\"> <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();
+                    "xml-download: User_name=" + userName + " Host_ip_address=" + hostIpAddress
+                    + " Port_number=" + portNumber);
+            SshJcraftWrapper sshJcraftWrapper = getSshJcraftWrapper();
             try {
-                sshJcraftWrapper.connect(Host_ip_address,
-                    User_name,
-                    Password,
-                    "]]>]]>",
-                    30000,
-                    Integer.parseInt(Port_number),
-                    "netconf");
+                sshJcraftWrapper.connect(hostIpAddress,
+                        userName,
+                        password,
+                        "]]>]]>",
+                        30000,
+                        Integer.parseInt(portNumber),
+                        "netconf");
                 String NetconfHelloCmd = netconfHelloCmd;
                 NetconfHelloCmd = NetconfHelloCmd + "]]>]]>";
                 log(fnName, "Sending the hello command");
@@ -373,10 +436,10 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
                 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>";
+                        "<?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");
@@ -420,27 +483,27 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         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 hostIpAddress = parameters.get("Host_ip_address");
+            String userName = parameters.get("User_name");
+            String password = parameters.get("Password");
+            password = EncryptionTool.getInstance().decrypt(password);
+            String portNumber = 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();
+                    "xml-getrunningconfig: User_name=" + userName + " Host_ip_address=" + hostIpAddress
+                    + " Port_number=" + portNumber);
+            SshJcraftWrapper sshJcraftWrapper = getSshJcraftWrapper();
             try {
                 String NetconfHelloCmd = netconfHelloCmd;
-                sshJcraftWrapper.connect(Host_ip_address,
-                    User_name,
-                    Password,
-                    "]]>]]>",
-                    30000,
-                    Integer.parseInt(Port_number),
-                    "netconf");
+                sshJcraftWrapper.connect(hostIpAddress,
+                        userName,
+                        password,
+                        "]]>]]>",
+                        30000,
+                        Integer.parseInt(portNumber),
+                        "netconf");
                 NetconfHelloCmd = NetconfHelloCmd + "]]>]]>";
                 log(fnName, ":Sending the hello command");
                 sshJcraftWrapper.send(NetconfHelloCmd);
@@ -468,37 +531,35 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             }
         }
         if (key.equals("DownloadCliConfig")) {
-            debugLog.printRTAriDebug(fnName, "key was: 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 userName = parameters.get("User_name");
+            String hostIpAddress = parameters.get("Host_ip_address");
+            String password = parameters.get("Password");
+            password = EncryptionTool.getInstance().decrypt(password);
+            String portNumber = parameters.get("Port_number");
+            String downloadConfigTemplate = 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();
+            SshJcraftWrapper sshJcraftWrapper = getSshJcraftWrapper();
             log.debug("DownloadCliConfig: sshJcraftWrapper was instantiated");
-            debugLog.printRTAriDebug(fnName, "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 = "";
+                DebugLog.printAriDebug(fnName, "DownloadCliConfig: User_name=" + userName +
+                        " Host_ip_address=" + hostIpAddress + " Port_number="
+                        + portNumber);
+                log.debug("DownloadCliConfig: Attempting to login: Host_ip_address=" + hostIpAddress +
+                        " User_name=" + userName + " Port_number=" + portNumber);
                 String CliResponse = "";
-                sshJcraftWrapper.connect(Host_ip_address,
-                    User_name,
-                    Password,
-                    "",
-                    30000,
-                    Integer.parseInt(Port_number));
+                sshJcraftWrapper.connect(hostIpAddress,
+                        userName,
+                        password,
+                        "",
+                        30000,
+                        Integer.parseInt(portNumber));
                 DebugLog.printAriDebug(fnName, "DownloadCliConfig: On the VNF device");
-                StringTokenizer st = new StringTokenizer(Download_config_template, "\n");
+                StringTokenizer st = new StringTokenizer(downloadConfigTemplate, "\n");
                 String command = null;
                 String executeConfigContentsDelemeter = null;
                 try {
@@ -512,26 +573,25 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
                             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)) {
+                                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);
+                                    "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);
+                                        timeout,
+                                        command);
                                 CliResponse += tmpResponse;
                             }
                         }
@@ -560,13 +620,13 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             }
         }
 
-        debugLog.printRTAriDebug(fnName, "Unsupported action - " + action);
+        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);
+        DebugLog.printRTAriDebug(fileName, messg);
         log.debug(fileName + ": " + messg);
     }
 
@@ -576,7 +636,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         String nd = buildNetworkData2(ctx, ndTemplate, operation);
 
         String reqTemplate = readFile("/config-request.xml");
-        Map<String, String> param = new HashMap<String, String>();
+        Map<String, String> param = new HashMap<>();
         param.put("request-id", ctx.getAttribute("service-data.appc-request-header.svc-request-id"));
         param.put("request-type", requestType);
         param.put("callback-url", configCallbackUrl);
@@ -606,7 +666,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
 
     private ConfigStatus activate(SvcLogicContext ctx, boolean change) {
         String reqTemplate = readFile("/config-request.xml");
-        Map<String, String> param = new HashMap<String, String>();
+        Map<String, String> param = new HashMap<>();
         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");
@@ -630,7 +690,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
 
     private ConfigStatus audit(SvcLogicContext ctx, String auditLevel) {
         String reqTemplate = readFile("/audit-request.xml");
-        Map<String, String> param = new HashMap<String, String>();
+        Map<String, String> param = new HashMap<>();
         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"));
@@ -673,7 +733,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         return input;
     }
 
-    private String readFile(String fileName) {
+    protected String readFile(String fileName) {
         InputStream is = getClass().getResourceAsStream(fileName);
         InputStreamReader isr = new InputStreamReader(is);
         BufferedReader in = new BufferedReader(isr);
@@ -816,7 +876,7 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
             int i2 = template.indexOf(':', i1 + 9);
             if (i2 < 0) {
                 throw new RuntimeException(
-                    "Template error: Context variable name followed by : is required after repeat");
+                        "Template error: Context variable name followed by : is required after repeat");
             }
 
             // Find the closing }, store in i3
@@ -869,25 +929,31 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
 
     private HttpResponse sendXmlRequest(String xmlRequest, String url, String user, String password) {
         try {
-            Client client = Client.create();
-            client.setConnectTimeout(5000);
-            WebResource webResource = client.resource(url);
+            Client client = getClient();
+            WebTarget webResource = client.target(url);
 
             log.info("SENDING...............");
-            log.info(xmlRequest);
-
+            if (log.isTraceEnabled()) {
+                log.trace(xmlRequest);
+            }
+            else {
+                if(xmlRequest.length() > 255 ) {
+                    log.info(xmlRequest.substring(0, 255));
+                    log.info("\n...\n" + xmlRequest.length() +
+                            " characters in request, turn on TRACE logging to log entire request");
+                }
+                else {
+                    log.info(xmlRequest);
+                }
+            }
             String authString = user + ":" + password;
-            byte[] authEncBytes = Base64.encode(authString);
-            String authStringEnc = new String(authEncBytes);
+            String authStringEnc = Base64.encode(authString.getBytes());
             authString = "Basic " + authStringEnc;
 
-            ClientResponse response =
-                webResource.header("Authorization", authString).accept("UTF-8").type("application/xml").post(
-                    ClientResponse.class, xmlRequest);
+            Response response = getClientResponse(webResource, authString, xmlRequest);
 
             int code = response.getStatus();
-            String message = null;
-
+            String message = response.getStatusInfo().getReasonPhrase();
             log.info("RESPONSE...............");
             log.info("HTTP response code: " + code);
             log.info("HTTP response message: " + message);
@@ -926,8 +992,8 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         String fnName = "ConfigComponentAdaptor.getStringBetweenQuotes";
         DebugLog.printAriDebug(fnName, "string=" + string);
         String retString = null;
-        int start = string.indexOf("\"");
-        int end = string.lastIndexOf("\"");
+        int start = string.indexOf('\"');
+        int end = string.lastIndexOf('\"');
         retString = string.substring(start + 1, end);
         DebugLog.printAriDebug(fnName, "retString=" + retString);
         return (retString);
@@ -946,14 +1012,63 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
         return (strBuff.toString());
     }
 
-    private String trimResponse(String response) {
+  /**
+   * A supporting method to extract the data and configuration element from the NETCONF-XML response
+   * from the node and create well formatted xml.
+   *
+   * @param requestData The unformatted NETCONF-XML
+   * @return responseBuilder the extracted data
+   * @throws APPCException Exception during parsing xml data
+   */
+  private String extractFromNetconfXml(String requestData) throws APPCException {
+    log.debug("extractFromNetconfXml -- Start");
+    StringBuilder responseBuilder = new StringBuilder();
+    StringWriter stringBuffer = new StringWriter();
+    try {
+      requestData = requestData.replaceAll("]]>]]>", "");
+      DocumentBuilder documentBuilder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+      Document document = documentBuilder.parse(new InputSource(new StringReader(requestData)));
+      document.getDocumentElement().normalize();
+      XPath xPath = XPathFactory.newInstance().newXPath();
+      Node dataNode = (Node) xPath.evaluate("//data", document, XPathConstants.NODE);
+      Transformer xform = TransformerFactory.newInstance().newTransformer();
+      xform.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+      xform.setOutputProperty(OutputKeys.INDENT, "yes");
+      xform.transform(new DOMSource(dataNode), new StreamResult(stringBuffer));
+      responseBuilder.append(stringBuffer.toString());
+      if (log.isTraceEnabled()) {
+        log.trace("ConfigComponentAdaptor:extractFromNetconfXml after Extract: "
+            + responseBuilder.toString());
+      }
+    } catch (SAXException | IOException | ParserConfigurationException | TransformerException
+        | XPathExpressionException exception) {
+      throw new APPCException("Error Occured during parsing Netconf-XML", exception);
+
+    }
+    log.debug("extractFromNetconfXml -- End");
+    return responseBuilder.toString();
+  }
+
+  private String trimResponse(String response) throws APPCException {
+        response = extractFromNetconfXml(response);
+        log.debug("runningConfig before trimResponse : " + response);
         StringTokenizer line = new StringTokenizer(response, "\n");
         StringBuffer sb = new StringBuffer();
+        String runningConfig = "" ;
         boolean captureText = false;
         while (line.hasMoreTokens()) {
             String token = line.nextToken();
             if (token.indexOf("<configuration xmlns=") != -1) {
                 captureText = true;
+            }else if(token.indexOf("<data") != -1) {
+                log.debug("token-line:with in Data: "+token);
+                captureText = true;
+                continue;
+            }
+
+            if(token.indexOf("</data>") != -1) {
+                log.debug("token-line:with in </data>"+token);
+                captureText = false;
             }
             if (captureText) {
                 sb.append(token + "\n");
@@ -962,26 +1077,58 @@ public class ConfigComponentAdaptor implements SvcLogicAdaptor {
                 captureText = false;
             }
         }
-        return (sb.toString());
+        runningConfig = sb.toString();
+
+        if (log.isTraceEnabled()) {
+            log.trace("ConfigComponentAdaptor:RunningConfig after trimResponse : " + runningConfig);
+        }
+        else {
+            if (runningConfig.length() > 255) {
+                log.info("ConfigComponentAdaptor:RunningConfig after trimResponse : " +
+                        runningConfig.substring(0, 255));
+                log.info("\n...\n" + runningConfig.length() +
+                        " characters in config, turn on TRACE logging to log entire config");
+            }
+            else {
+                log.info("ConfigComponentAdaptor:RunningConfig after trimResponse : " +
+                        runningConfig);
+            }
+        }
+        log.info("ConfigComponentAdaptor:RunningConfig after trimResponse : " + runningConfig);
+        return runningConfig;
     }
 
     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 getConfigTemplate = _readFile("/home/userID/data/Get_config_template");
+        String downloadConfigTemplate = _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);
+        parameters.put("Get_config_template", getConfigTemplate);
 
         SvcLogicContext ctx = null;
         System.out.println("*************************TRACE 1*****************************");
         cca.configure(key, parameters, ctx);
     }
-}
 
+    protected SshJcraftWrapper getSshJcraftWrapper() {
+        return new SshJcraftWrapper();
+    }
+
+    protected Client getClient() {
+        ClientConfig clientConfig = new ClientConfig();
+        clientConfig.property(ClientProperties.CONNECT_TIMEOUT, 5000);
+        return ClientBuilder.newClient(clientConfig);
+    }
+
+    protected Response getClientResponse(WebTarget webResource, String authString, String xmlRequest) {
+        return webResource.request("UTF-8").header("Authorization", authString).header("Content-Type", "application/xml").post(
+                Entity.xml(xmlRequest),Response.class);
+    }
+}