ChefAdapterImpl junits
[appc.git] / appc-adapters / appc-chef-adapter / appc-chef-adapter-bundle / src / main / java / org / onap / appc / adapter / chef / impl / ChefAdapterImpl.java
index 8307a9b..64aedcc 100644 (file)
@@ -9,62 +9,49 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  * ============LICENSE_END=========================================================
  */
-
 package org.onap.appc.adapter.chef.impl;
 
-import java.io.File;
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
-
+import java.util.Optional;
 import org.apache.commons.lang.StringUtils;
-import org.apache.http.HttpEntity;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.HttpClient;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.http.util.EntityUtils;
 import org.json.JSONException;
 import org.json.JSONObject;
-import org.onap.appc.Constants;
 import org.onap.appc.adapter.chef.ChefAdapter;
-import org.onap.appc.adapter.chef.chefapi.ApiMethod;
-import org.onap.appc.adapter.chef.chefclient.ChefApiClient;
-import org.onap.appc.configuration.Configuration;
-import org.onap.appc.configuration.ConfigurationFactory;
-import org.onap.appc.exceptions.APPCException;                                                
+import org.onap.appc.adapter.chef.chefclient.ChefApiClientFactory;
+import org.onap.appc.adapter.chef.chefclient.api.ChefApiClient;
+import org.onap.appc.adapter.chef.chefclient.api.ChefResponse;
 import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 
-import com.att.eelf.configuration.EELFLogger;
-import com.att.eelf.configuration.EELFManager;
-
 /**
- * This class implements the {@link ChefAdapter} interface. This interface
- * defines the behaviors that our service provides.
+ * This class implements the {@link ChefAdapter} interface. This interface defines the behaviors that our service
+ * provides.
  */
 public class ChefAdapterImpl implements ChefAdapter {
+
     // chef server Initialize variable
-    private String username = "";
-    private String clientPrivatekey = "";
-    private String chefserver = "";
-    private String serverAddress = "";
-    private String organizations = "";
-    
+    private String username = StringUtils.EMPTY;
+    private String clientPrivatekey = StringUtils.EMPTY;
+    private String chefserver = StringUtils.EMPTY;
+    private String serverAddress = StringUtils.EMPTY;
+    private String organizations = StringUtils.EMPTY;
+
     @SuppressWarnings("nls")
     public static final String MDC_ADAPTER = "adapter";
 
@@ -104,355 +91,254 @@ public class ChefAdapterImpl implements ChefAdapter {
 
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(ChefAdapterImpl.class);
 
-    private static final char LPAREN = '(';
-
-    private static final char NL = '\n';
-
-    private static final char QUOTE = '\'';
-
-    private static final char RPAREN = ')';
-    private static final char SPACE = ' ';
-
-    private final String CANNOT_FIND_PRIVATE_KEY_STR = "Cannot find the private key in the APPC file system, please load the private key to ";
-   
-    /**
-     * A reference to the adapter configuration object.
-     */
-    private Configuration configuration;
-
-    /**
-     * This default constructor is used as a work around because the activator wasnt
-     * getting called
-     */
-    public ChefAdapterImpl() {
-        initialize();
-    }
-    
-    public ChefAdapterImpl(Properties props) {
-        initialize();
-
-    }
-
-    /**
-     * This constructor is used primarily in the test cases to bypass initialization
-     * of the adapter for isolated, disconnected testing
-     *
-     * @param initialize
-     *            True if the adapter is to be initialized, can false if not
-     */
-     
-    public ChefAdapterImpl(boolean initialize) {
-       
-        if (initialize) {
-            initialize();
-        }
-    }
-
-    public ChefAdapterImpl(String key) {
-        initialize();
-    }
-
-    
-    
-    /**
-     * Returns the symbolic name of the adapter
-     *
-     * @return The adapter name
-     * @see org.onap.appc.adapter.chef.ChefAdapter#getAdapterName()
-     */
-    @Override
-    public String getAdapterName() {
-        return "chef adapter";
+    private static final String CANNOT_FIND_PRIVATE_KEY_STR =
+        "Cannot find the private key in the APPC file system, please load the private key to ";
+
+    private static final String POSTING_REQUEST_JSON_ERROR_STR = "Error posting request due to invalid JSON block: ";
+    private static final String POSTING_REQUEST_ERROR_STR = "Error posting request: ";
+    private static final String CHEF_CLIENT_RESULT_CODE_STR = "chefClientResult.code";
+    private static final String CHEF_SERVER_RESULT_CODE_STR = "chefServerResult.code";
+    private static final String CHEF_CLIENT_RESULT_MSG_STR = "chefClientResult.message";
+    private static final String CHEF_SERVER_RESULT_MSG_STR = "chefServerResult.message";
+    private static final String CHEF_ACTION_STR = "chefAction";
+    private static final String NODE_LIST_STR = "NodeList";
+    private final ChefApiClientFactory chefApiClientFactory;
+    private final PrivateKeyChecker privateKeyChecker;
+
+    ChefAdapterImpl(ChefApiClientFactory chefApiClientFactory, PrivateKeyChecker privateKeyChecker) {
+        this.chefApiClientFactory = chefApiClientFactory;
+        this.privateKeyChecker = privateKeyChecker;
+        logger.info("Initialize Chef Adapter");
     }
 
-   @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     @Override
-    public void VnfcEnvironment(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+    public void vnfcEnvironment(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         int code;
-        try{
         logger.info("environment of VNF-C");
-        chefInfo(params,ctx);
-        RequestContext rc = new RequestContext(ctx);
-        logger.info("Context"+ctx );
-        rc.isAlive();     
+        chefInfo(params, ctx);
         String env = params.get("Environment");
-         logger.info("Environmnet"+env );
-        if(env.equals("")){
-            chefServerResult(rc, "200", "Skip Environment block ");}
-        else{
-        JSONObject env_J = new JSONObject(env);
-        String envName = env_J.getString("name");
-        
-    
-        String message = null;
-        if (privateKeyCheck()) {
-            // update the details of an environment on the Chef server.
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-            ApiMethod am = cac.put("/environments/"+envName).body(env);
-            am.execute();
-            code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
-                if(code == 404 ){
-                    //need create a new environment
-                    am = cac.post("/environments").body(env);
-                    am.execute();
-                    code = am.getReturnCode();
-                    message = am.getResponseBodyAsString();
-                    logger.info("requestbody"+am.getReqBody());
-                }
-
+        logger.info("Environmnet" + env);
+        if (env.equals(StringUtils.EMPTY)) {
+            chefServerResult(ctx, 200, "Skip Environment block ");
         } else {
-            code = 500;
-            message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
-            doFailure(ctx,code,message);
-        }
-        chefServerResult(rc, Integer.toString(code), message);
-        }
-        }
-        
-        catch(JSONException e){
-            code =401;
-            doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-        }
-        catch(Exception e){
-            code =401;
-            doFailure(ctx, code, "Error posting request :Reason = " + e.getMessage());
+            String message;
+            if (privateKeyChecker.doesExist(clientPrivatekey)) {
+                try {
+                    JSONObject envJ = new JSONObject(env);
+                    String envName = envJ.getString("name");
+                    // update the details of an environment on the Chef server.
+                    ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+                    ChefResponse chefResponse = chefApiClient.put("/environments/" + envName, env);
+                    code = chefResponse.getStatusCode();
+                    message = chefResponse.getBody();
+                    if (code == 404) {
+                        // need create a new environment
+                        chefResponse = chefApiClient.post("/environments", env);
+                        code = chefResponse.getStatusCode();
+                        message = chefResponse.getBody();
+                        logger.info("requestbody {}", chefResponse.getBody());
+                    }
+                    chefServerResult(ctx, code, message);
+                } catch (JSONException e) {
+                    code = 401;
+                    logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
+                    doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
+                } catch (Exception e) {
+                    code = 401;
+                    logger.error(POSTING_REQUEST_ERROR_STR, e);
+                    doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + e.getMessage());
+                }
+            } else {
+                code = 500;
+                message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
+                doFailure(ctx, code, message);
+            }
         }
     }
 
     @SuppressWarnings("nls")
     @Override
-    public void VnfcNodeobjects(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+    public void vnfcNodeobjects(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         logger.info("update the nodeObjects of VNF-C");
         int code;
-        try{
-        chefInfo(params,ctx);
-        String nodeList_S = params.get("NodeList");
-        String node_S = params.get("Node");
-        if (StringUtils.isNotBlank(nodeList_S) && StringUtils.isNotBlank(node_S))
-        {
-        nodeList_S = nodeList_S.replace("[","");
-        nodeList_S = nodeList_S.replace("]","");
-        nodeList_S = nodeList_S.replace("\"","");
-        nodeList_S = nodeList_S.replace(" ","");
-        List<String> nodes = Arrays.asList(nodeList_S.split("\\s*,\\s*"));
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        code=200;
-        String message = null;
-        if (privateKeyCheck()) {
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-
-            for(int i = 0; i < nodes.size(); i++){
-                String nodeName=nodes.get(i);
-                JSONObject node_J = new JSONObject(node_S);
-                node_J.remove("name");
-                node_J.put("name",nodeName);
-                String nodeObject=node_J.toString();
-                logger.info(nodeObject);
-                ApiMethod am = cac.put("/nodes/"+nodeName).body(nodeObject);
-                am.execute();
-                code = am.getReturnCode();
-                message = am.getResponseBodyAsString();
-                if(code != 200){
-                    break;
+        try {
+            chefInfo(params, ctx);
+            String nodeListS = params.get(NODE_LIST_STR);
+            String nodeS = params.get("Node");
+            if (StringUtils.isNotBlank(nodeListS) && StringUtils.isNotBlank(nodeS)) {
+                nodeListS = nodeListS.replace("[", StringUtils.EMPTY);
+                nodeListS = nodeListS.replace("]", StringUtils.EMPTY);
+                nodeListS = nodeListS.replace("\"", StringUtils.EMPTY);
+                nodeListS = nodeListS.replace(" ", StringUtils.EMPTY);
+                List<String> nodes = Arrays.asList(nodeListS.split("\\s*,\\s*"));
+                code = 200;
+                String message = null;
+                if (privateKeyChecker.doesExist(clientPrivatekey)) {
+                    ChefApiClient cac = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+
+                    for (String nodeName: nodes) {
+                        JSONObject nodeJ = new JSONObject(nodeS);
+                        nodeJ.remove("name");
+                        nodeJ.put("name", nodeName);
+                        String nodeObject = nodeJ.toString();
+                        logger.info(nodeObject);
+                        ChefResponse chefResponse = cac.put("/nodes/" + nodeName, nodeObject);
+                        code = chefResponse.getStatusCode();
+                        message = chefResponse.getBody();
+                        if (code != 200) {
+                            break;
+                        }
+                    }
+                } else {
+                    code = 500;
+                    message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
+                    doFailure(ctx, code, message);
                 }
-
-            }
-        }else{
-            code = 500;
-            message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
-            doFailure(ctx,code,message);
+                chefServerResult(ctx, code, message);
+            } else {
+                throw new SvcLogicException("Missing Mandatory param(s) Node , NodeList ");
             }
-        chefServerResult(rc, Integer.toString(code), message);
-        }
-        
-        else
-        {
-            throw new SvcLogicException("Missing Mandatory param(s) Node , NodeList ");
-        }
-    }
-        catch(JSONException e){
-            code =401;
-            doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-        }
-        catch(Exception ex){
-            code =401;
-            doFailure(ctx, code, "Error posting request :Reason = " + ex.getMessage());
+        } catch (JSONException e) {
+            code = 401;
+            logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
+            doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
+        } catch (Exception e) {
+            code = 401;
+            logger.error(POSTING_REQUEST_ERROR_STR, e);
+            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + e.getMessage());
         }
-        
     }
 
     @Override
-    public void VnfcPushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        int code ;
-    try{
-        chefInfo(params,ctx);
-        String nodeList = params.get("NodeList");
-        if (StringUtils.isNotBlank(nodeList))
-        {
-        String isCallback = params.get("CallbackCapable");
-        String chefAction = "/pushy/jobs";
-        //need work on this
-        String pushRequest="";
-        if(isCallback.equals("true")){
-            String requestId = params.get("RequestId");
-            String callbackUrl = params.get("CallbackUrl");
-            pushRequest="{"+
-                      "\"command\": \"chef-client\","+
-                      "\"run_timeout\": 300,"+
-                      "\"nodes\":" +nodeList +","+
-                      "\"env\": {\"RequestId\": \""+ requestId +"\", \"CallbackUrl\": \""+ callbackUrl +"\"},"+
-                      "\"capture_output\": true"+
-                    "}";
-        }else{
-            pushRequest="{"+
-                  "\"command\": \"chef-client\","+
-                  "\"run_timeout\": 300,"+
-                  "\"nodes\":" +nodeList +","+
-                  "\"env\": {},"+
-                  "\"capture_output\": true"+
-                "}";
-        }
-        RequestContext rc = new RequestContext(ctx);
-
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-        ApiMethod am = cac.post(chefAction).body(pushRequest);
-
-        am.execute();
-         code = am.getReturnCode();
-         logger.info("pushRequest:"+pushRequest);
-         logger.info("requestbody:"+am.getReqBody()); 
-        
-        String message = am.getResponseBodyAsString();
-        if (code == 201) {
-            int startIndex = message.indexOf("jobs") + 5;
-            int endIndex = message.length() - 2;
-            String jobID = message.substring(startIndex, endIndex);
-            svcLogic.setAttribute("jobID", jobID);
-            logger.info(jobID);
-        }
-        chefServerResult(rc, Integer.toString(code), message);
-    }
-    
-    else
-    {
-        throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
-    }
-    }
-    catch(JSONException e){
-        code =401;
-        doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-    }
-        catch(Exception e)
-        {
+    public void vnfcPushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+        int code;
+        try {
+            chefInfo(params, ctx);
+            String nodeList = params.get(NODE_LIST_STR);
+            if (StringUtils.isNotBlank(nodeList)) {
+                String isCallback = params.get("CallbackCapable");
+                String chefAction = "/pushy/jobs";
+                // need work on this
+                String pushRequest;
+                if ("true".equals(isCallback)) {
+                    String requestId = params.get("RequestId");
+                    String callbackUrl = params.get("CallbackUrl");
+                    pushRequest = "{" + "\"command\": \"chef-client\"," + "\"run_timeout\": 300," + "\"nodes\":"
+                        + nodeList + "," + "\"env\": {\"RequestId\": \"" + requestId + "\", \"CallbackUrl\": \""
+                        + callbackUrl + "\"}," + "\"capture_output\": true" + "}";
+                } else {
+                    pushRequest = "{" + "\"command\": \"chef-client\"," + "\"run_timeout\": 300," + "\"nodes\":"
+                        + nodeList + "," + "\"env\": {}," + "\"capture_output\": true" + "}";
+                }
+                ChefApiClient cac = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+                ChefResponse chefResponse = cac.post(chefAction, pushRequest);
+                code = chefResponse.getStatusCode();
+                logger.info("pushRequest:" + pushRequest);
+                logger.info("requestbody: {}", chefResponse.getBody());
+                String message = chefResponse.getBody();
+                if (code == 201) {
+                    int startIndex = message.indexOf("jobs") + 5;
+                    int endIndex = message.length() - 2;
+                    String jobID = message.substring(startIndex, endIndex);
+                    ctx.setAttribute("jobID", jobID);
+                    logger.info(jobID);
+                }
+                chefServerResult(ctx, code, message);
+            } else {
+                throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
+            }
+        } catch (Exception e) {
             code = 401;
-            doFailure(ctx,code,e.getMessage());
+            logger.error(POSTING_REQUEST_ERROR_STR, e);
+            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + e.getMessage());
         }
-        
     }
 
-
     @SuppressWarnings("nls")
     @Override
-    public void fetchResults (Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        int code;
-        try{
-        chefInfo(params,ctx);
-        String nodeList_S = params.get("NodeList");
-        if (StringUtils.isNotBlank(nodeList_S) )
-        {
-        nodeList_S = nodeList_S.replace("[","");
-        nodeList_S = nodeList_S.replace("]","");
-        nodeList_S = nodeList_S.replace("\"","");
-        nodeList_S = nodeList_S.replace(" ","");
-        List<String> nodes = Arrays.asList(nodeList_S.split("\\s*,\\s*"));
-        JSONObject Result = new JSONObject();
-        String returnCode= "200";
-        String returnMessage="";
-        for (int i = 0; i < nodes.size(); i++){
-            String node=nodes.get(i);
-            String chefAction="/nodes/"+node;
-            
-            String message = null;
-            if (privateKeyCheck()) {
-                ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-                ApiMethod am = cac.get(chefAction);
-                am.execute();
-                code = am.getReturnCode();
-                message = am.getResponseBodyAsString();
-            } else {
-                code = 500;
-                message = "Cannot find the private key in the APPC file system, please load the private key to "
-                        + clientPrivatekey;
-                doFailure(ctx,code,message);
-            }
-            if (code==200){
-                JSONObject nodeResult = new JSONObject();
-                JSONObject allNodeData = new JSONObject(message);
-                 allNodeData=allNodeData.getJSONObject("normal");
-                    String attribute= "PushJobOutput";
-                    String resultData;
-
-                    try {
-                        resultData = allNodeData.getString(attribute);
-                    } catch (Exception exc1) {
-                        try {
-                            resultData = allNodeData.getJSONObject(attribute).toString();
-                        } catch (Exception exc2) {
-                            try {
-                                resultData = allNodeData.getJSONArray(attribute).toString();
-                            }catch (Exception exc3){
-                                returnCode = "500";
-                                returnMessage="cannot find "+attribute;
-                                break;
+    public void fetchResults(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+        int code = 200;
+        try {
+            chefInfo(params, ctx);
+            String nodeListS = params.get(NODE_LIST_STR);
+            if (StringUtils.isNotBlank(nodeListS)) {
+                nodeListS = nodeListS.replace("[", StringUtils.EMPTY);
+                nodeListS = nodeListS.replace("]", StringUtils.EMPTY);
+                nodeListS = nodeListS.replace("\"", StringUtils.EMPTY);
+                nodeListS = nodeListS.replace(" ", StringUtils.EMPTY);
+                List<String> nodes = Arrays.asList(nodeListS.split("\\s*,\\s*"));
+                JSONObject result = new JSONObject();
+                String returnMessage = StringUtils.EMPTY;
+
+                for (String node : nodes) {
+                    String chefAction = "/nodes/" + node;
+                    String message;
+                    if (privateKeyChecker.doesExist(clientPrivatekey)) {
+                        ChefResponse chefResponse = getApiMethod(chefAction);
+                        code = chefResponse.getStatusCode();
+                        message = chefResponse.getBody();
+                    } else {
+                        code = 500;
+                        message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
+                        doFailure(ctx, code, message);
+                    }
+                    if (code == 200) {
+                        JSONObject nodeResult = new JSONObject();
+                        JSONObject allNodeData = new JSONObject(message);
+                        allNodeData = allNodeData.getJSONObject("normal");
+                        String attribute = "PushJobOutput";
+
+                        String resultData = allNodeData.optString(attribute, null);
+                        if (resultData == null) {
+                            resultData = Optional.ofNullable(allNodeData.optJSONObject(attribute))
+                                .map(p -> p.toString()).orElse(null);
+                            if (resultData == null) {
+                                resultData = Optional.ofNullable(allNodeData.optJSONArray(attribute))
+                                    .map(p -> p.toString()).orElse(null);
+
+                                if (resultData == null) {
+                                    code = 500;
+                                    returnMessage = "Cannot find " + attribute;
+                                    break;
+                                }
                             }
                         }
+                        nodeResult.put(attribute, resultData);
+                        result.put(node, nodeResult);
+                        returnMessage = result.toString();
+                    } else {
+                        code = 500;
+                        returnMessage = message + " Cannot access: " + node;
+                        doFailure(ctx, code, message);
+                        break;
                     }
-                    nodeResult.put(attribute,resultData);
-
-                Result.put(node,nodeResult);
-            }else{
-                returnCode="500";
-                returnMessage = message+" Cannot access: "+ node;
-                doFailure(ctx,code,message);
-                break;
-            }
+                }
 
-        }
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        if (!returnCode.equals("500")){
-            returnMessage=Result.toString();
-            returnCode="200";
-        }
-        chefServerResult(rc, returnCode, returnMessage);
-        }
-        
-        else
-        {
-            throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
+                chefServerResult(ctx, code, returnMessage);
+            } else {
+                throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
+            }
+        } catch (JSONException e) {
+            code = 401;
+            logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
+            doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
+        } catch (Exception e) {
+            code = 401;
+            logger.error(POSTING_REQUEST_ERROR_STR , e);
+            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + e.getMessage());
         }
     }
-        catch(JSONException e){
-            code =401;
-            doFailure(ctx, code, "Error posting request  due to invalid JSON block. Reason = " + e.getMessage());
-        }
-        catch(Exception ex){
-            code =401;
-            doFailure(ctx, code, "Error posting request :Reason = " + ex.getMessage());
-        }
-        
+
+    private ChefResponse getApiMethod(String chefAction) {
+        ChefApiClient cac = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+        return cac.get(chefAction);
     }
 
     /**
      * build node object
      */
-     @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
     @Override
     public void nodeObejctBuilder(Map<String, String> params, SvcLogicContext ctx) {
         logger.info("nodeObejctBuilder");
@@ -463,415 +349,310 @@ public class ChefAdapterImpl implements ChefAdapter {
         String runList = params.get("nodeobject.run_list");
         String chefEnvironment = params.get("nodeobject.chef_environment");
         String nodeObject = "{\"json_class\":\"Chef::Node\",\"default\":{" + defaults
-                + "},\"chef_type\":\"node\",\"run_list\":[" + runList + "],\"override\":{" + overrides
-                + "},\"normal\": {" + normal + "},\"automatic\":{},\"name\":\"" + name + "\",\"chef_environment\":\""
-                + chefEnvironment + "\"}";
+            + "},\"chef_type\":\"node\",\"run_list\":[" + runList + "],\"override\":{" + overrides
+            + "},\"normal\": {" + normal + "},\"automatic\":{},\"name\":\"" + name + "\",\"chef_environment\":\""
+            + chefEnvironment + "\",}";
         logger.info(nodeObject);
-
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute("chef.nodeObject", nodeObject);
+        ctx.setAttribute("chef.nodeObject", nodeObject);
     }
 
     /**
      * send get request to chef server
-     * @throws SvcLogicException 
      */
-    public void chefInfo(Map<String, String> params,SvcLogicContext ctx) throws SvcLogicException  {
-        
-      username = params.get("username");
+    private void chefInfo(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
+
+        username = params.get("username");
         serverAddress = params.get("serverAddress");
         organizations = params.get("organizations");
-        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(serverAddress)&& StringUtils.isNotBlank(organizations))
-        {
-        chefserver = "https://" + serverAddress + "/organizations/" + organizations;
-        clientPrivatekey = "/opt/app/bvc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem";
-                logger.info( " clientPrivatekey  " + clientPrivatekey);
-        }
-        else 
-        {    
-        String    message ="Missing mandatory param(s) such as username,serverAddres,organizations";
-            doFailure(ctx,401,message);        
-            
-        }
-        
-
-    }
-
-    public Boolean privateKeyCheck() {
-        File f = new File(clientPrivatekey);
-        if (f.exists()) {
-            logger.info( "Key exists");
-            return true;
-            
+        if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(serverAddress)
+            && StringUtils.isNotBlank(organizations)) {
+            chefserver = "https://" + serverAddress + "/organizations/" + organizations;
+            clientPrivatekey = "/opt/onap/appc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem";
+            logger.info(" clientPrivatekey  " + clientPrivatekey);
         } else {
-                logger.info( "Key doesnot exists");
-            return false;
+            doFailure(ctx, 401, "Missing mandatory param(s) such as username, serverAddress, organizations");
         }
-
     }
+
     @SuppressWarnings("nls")
     @Override
     public void retrieveData(Map<String, String> params, SvcLogicContext ctx) {
-        String contextData = "someValue";
         String allConfigData = params.get("allConfig");
         String key = params.get("key");
         String dgContext = params.get("dgContext");
-        JSONObject josnConfig = new JSONObject(allConfigData);
+        JSONObject jsonConfig = new JSONObject(allConfigData);
+        String contextData = fetchContextData(key, jsonConfig);
 
+        ctx.setAttribute(dgContext, contextData);
+    }
+
+    private String fetchContextData(String key, JSONObject jsonConfig) {
         try {
-            contextData = josnConfig.getString(key);
-        } catch (Exception ex) {
+            return jsonConfig.getString(key);
+        } catch (Exception e) {
+            logger.error("Failed getting string value corresponding to " + key + ". Trying to fetch nested json object", e);
             try {
-                contextData = josnConfig.getJSONObject(key).toString();
-            } catch (Exception exc) {
-                contextData = josnConfig.getJSONArray(key).toString();
+                return jsonConfig.getJSONObject(key).toString();
+            } catch (Exception ex) {
+                logger.error("Failed getting json object corresponding to " + key + ". Trying to fetch array", ex);
+                return jsonConfig.getJSONArray(key).toString();
             }
         }
-
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute(dgContext, contextData);
     }
 
     @SuppressWarnings("nls")
     @Override
     public void combineStrings(Map<String, String> params, SvcLogicContext ctx) {
-
         String string1 = params.get("String1");
         String string2 = params.get("String2");
         String dgContext = params.get("dgContext");
         String contextData = string1 + string2;
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute(dgContext, contextData);
+        ctx.setAttribute(dgContext, contextData);
     }
 
     /**
      * Send GET request to chef server
-     * @throws SvcLogicException 
      */
-     @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
 
     @Override
     public void chefGet(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         logger.info("chef get method");
-        chefInfo(params,ctx);
-        String chefAction = params.get("chefAction");
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
+        chefInfo(params, ctx);
+        String chefAction = params.get(CHEF_ACTION_STR);
         int code;
-        String message = null;
-
-        if (privateKeyCheck()) {
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-            ApiMethod am = cac.get(chefAction);
-            am.execute();
-            code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
+        String message;
+
+        if (privateKeyChecker.doesExist(clientPrivatekey)) {
+            ChefResponse chefResponse = getApiMethod(chefAction);
+            code = chefResponse.getStatusCode();
+            message = chefResponse.getBody();
         } else {
             code = 500;
-            message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
+            message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
-        chefServerResult(rc, Integer.toString(code), message);
+        chefServerResult(ctx, code, message);
     }
 
     /**
      * Send PUT request to chef server
-     * @throws SvcLogicException 
      */
-     @SuppressWarnings("nls")
+    @SuppressWarnings("nls")
 
     @Override
     public void chefPut(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        chefInfo(params,ctx);
-        String chefAction = params.get("chefAction");
+        chefInfo(params, ctx);
+        String chefAction = params.get(CHEF_ACTION_STR);
         String chefNodeStr = params.get("chefRequestBody");
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
         int code;
         String message;
-        if (privateKeyCheck()) {
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+        if (privateKeyChecker.doesExist(clientPrivatekey)) {
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
 
-            ApiMethod am = cac.put(chefAction).body(chefNodeStr);
-            am.execute();
-            code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
+            ChefResponse chefResponse = chefApiClient.put(chefAction, chefNodeStr);
+            code = chefResponse.getStatusCode();
+            message = chefResponse.getBody();
         } else {
             code = 500;
-            message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
-
+            message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         logger.info(code + "   " + message);
-        chefServerResult(rc, Integer.toString(code), message);
+        chefServerResult(ctx, code, message);
     }
 
     /**
-     *  send Post request to chef server
-     * @throws SvcLogicException 
+     * send Post request to chef server
      */
     @Override
     public void chefPost(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        chefInfo(params,ctx);
+        chefInfo(params, ctx);
         logger.info("chef Post method");
         logger.info(username + " " + clientPrivatekey + " " + chefserver + " " + organizations);
         String chefNodeStr = params.get("chefRequestBody");
-        String chefAction = params.get("chefAction");
+        String chefAction = params.get(CHEF_ACTION_STR);
 
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
         int code;
         String message;
         // should load pem from somewhere else
-        if (privateKeyCheck()) {
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
+        if (privateKeyChecker.doesExist(clientPrivatekey)) {
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
 
             // need pass path into it
             // "/nodes/testnode"
-            ApiMethod am = cac.post(chefAction).body(chefNodeStr);
-            am.execute();
-            code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
+            ChefResponse chefResponse = chefApiClient.post(chefAction, chefNodeStr);
+            code = chefResponse.getStatusCode();
+            message = chefResponse.getBody();
         } else {
             code = 500;
             message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         logger.info(code + "   " + message);
-        chefServerResult(rc, Integer.toString(code), message);
+        chefServerResult(ctx, code, message);
     }
 
     /**
      * send delete request to chef server
-     * @throws SvcLogicException 
      */
     @Override
     public void chefDelete(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         logger.info("chef delete method");
-        chefInfo(params,ctx);
-        String chefAction = params.get("chefAction");
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
+        chefInfo(params, ctx);
+        String chefAction = params.get(CHEF_ACTION_STR);
         int code;
-        String message =null;
-        if (privateKeyCheck()) {
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-            ApiMethod am = cac.delete(chefAction);
-            am.execute();
-            code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
+        String message;
+        if (privateKeyChecker.doesExist(clientPrivatekey)) {
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+            ChefResponse chefResponse = chefApiClient.delete(chefAction);
+            code = chefResponse.getStatusCode();
+            message = chefResponse.getBody();
         } else {
             code = 500;
-         message = "Cannot find the private key in the APPC file system, please load the private key to "
-                    + clientPrivatekey;
-
+            message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         logger.info(code + "   " + message);
-        chefServerResult(rc, Integer.toString(code), message);
+        chefServerResult(ctx, code, message);
     }
 
     /**
      * Trigger target vm run chef
      */
     @Override
-    public void trigger(Map<String, String> params, SvcLogicContext ctx) {
+    public void trigger(Map<String, String> params, SvcLogicContext svcLogicContext) {
         logger.info("Run trigger method");
         String tVmIp = params.get("ip");
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-
-        try (CloseableHttpClient httpClient = HttpClients.createDefault()) {
-            HttpGet httpGet = new HttpGet(tVmIp);
-            HttpResponse response = null;
-            response = httpClient.execute(httpGet);
-            int responseCode = response.getStatusLine().getStatusCode();
-            HttpEntity entity = response.getEntity();
-            String responseOutput = EntityUtils.toString(entity);
-            chefClientResult(rc, Integer.toString(responseCode), responseOutput);
-            doSuccess(rc);
-        } catch (Exception ex) {
-            doFailure(rc, 500, ex.toString());
+
+        try {
+            ChefResponse chefResponse = chefApiClientFactory.create(tVmIp).get("");
+            chefClientResult(svcLogicContext, chefResponse.getStatusCode(), chefResponse.getBody());
+            svcLogicContext.setAttribute("chefAgent.code", "200");
+        } catch (Exception e) {
+            logger.error("An error occurred when executing trigger method", e);
+            svcLogicContext.setAttribute("chefAgent.code", "500");
+            svcLogicContext.setAttribute("chefAgent.message", e.toString());
         }
     }
 
     @SuppressWarnings("nls")
     @Override
     public void checkPushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-         int code;
+        int code;
         try {
-        chefInfo(params,ctx);
-        String jobID = params.get("jobid");
-      String retry=  params.get("retryTimes");
-      String intrva=   params.get("retryInterval");
-      if (StringUtils.isNotBlank(retry) && StringUtils.isNotBlank(intrva))
-        {
-        
-        int retryTimes = Integer.parseInt(params.get("retryTimes"));
-        int retryInterval = Integer.parseInt(params.get("retryInterval"));
-        
-        String chefAction = "/pushy/jobs/" + jobID;
-
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        String message = "";
-        String status = "";
-        for (int i = 0; i < retryTimes; i++) {
-            try {
-                Thread.sleep(retryInterval); // 1000 milliseconds is one second.
-            } catch (InterruptedException ex) {
-                Thread.currentThread().interrupt();
-            }
-            ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-            ApiMethod am = cac.get(chefAction);
-            am.execute();
-             code = am.getReturnCode();
-            message = am.getResponseBodyAsString();
-            JSONObject obj = new JSONObject(message);
-            status = obj.getString("status");
-            if (!status.equals("running")) {
-                logger.info(i + " time " + code + "   " + status);
-                break;
-            }
-
-        }
-   if (status.equals("complete")) {
-            svcLogic.setAttribute("chefServerResult.code", "200");
-            svcLogic.setAttribute("chefServerResult.message", message);
-        } else {
-            if (status.equals("running"))  {
-                svcLogic.setAttribute("chefServerResult.code", "202");
-                svcLogic.setAttribute("chefServerResult.message", "chef client runtime out");
+            chefInfo(params, ctx);
+            String jobID = params.get("jobid");
+            String retry = params.get("retryTimes");
+            String intrva = params.get("retryInterval");
+            if (StringUtils.isNotBlank(jobID) && StringUtils.isNotBlank(retry) && StringUtils.isNotBlank(intrva)) {
+
+                int retryTimes = Integer.parseInt(params.get("retryTimes"));
+                int retryInterval = Integer.parseInt(params.get("retryInterval"));
+
+                String chefAction = "/pushy/jobs/" + jobID;
+
+                String message = StringUtils.EMPTY;
+                String status = StringUtils.EMPTY;
+                for (int i = 0; i < retryTimes; i++) {
+                    sleepFor(retryInterval);
+                    ChefResponse chefResponse = getApiMethod(chefAction);
+                    code = chefResponse.getStatusCode();
+                    message = chefResponse.getBody();
+                    JSONObject obj = new JSONObject(message);
+                    status = obj.getString("status");
+                    if (!"running".equals(status)) {
+                        logger.info(i + " time " + code + "   " + status);
+                        break;
+                    }
+                }
+                resolveSvcLogicAttributes(ctx, message, status);
             } else {
-                svcLogic.setAttribute("chefServerResult.code", "500");
-                svcLogic.setAttribute("chefServerResult.message", message);
-            }
-        }
-        }
-        
-        else
-        {    
                 throw new SvcLogicException("Missing Mandatory param(s) retryTimes , retryInterval ");
-            
+            }
+        } catch (Exception e) {
+            code = 401;
+            logger.error("An error occurred when executing checkPushJob method", e);
+            doFailure(ctx, code, e.getMessage());
         }
+    }
+
+    private void resolveSvcLogicAttributes(SvcLogicContext svcLogic, String message, String status) {
+        if ("complete".equals(status)) {
+            svcLogic.setAttribute(CHEF_SERVER_RESULT_CODE_STR, "200");
+            svcLogic.setAttribute(CHEF_SERVER_RESULT_MSG_STR, message);
+        } else if ("running".equals(status)) {
+            svcLogic.setAttribute(CHEF_SERVER_RESULT_CODE_STR, "202");
+            svcLogic.setAttribute(CHEF_SERVER_RESULT_MSG_STR, "chef client runtime out");
+        } else {
+            svcLogic.setAttribute(CHEF_SERVER_RESULT_CODE_STR, "500");
+            svcLogic.setAttribute(CHEF_SERVER_RESULT_MSG_STR, message);
         }
-        catch(Exception e)
-        {
-            code = 401;
-            doFailure(ctx,code,e.getMessage());
+    }
+
+    private void sleepFor(int retryInterval) {
+        try {
+            Thread.sleep(retryInterval); // 1000 milliseconds is one second.
+        } catch (InterruptedException ex) {
+            Thread.currentThread().interrupt();
         }
-   
     }
+
     @SuppressWarnings("nls")
     @Override
     public void pushJob(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
         int code;
-        try{
-        chefInfo(params,ctx);
-        String pushRequest = params.get("pushRequest");
-        String chefAction = "/pushy/jobs";
-        RequestContext rc = new RequestContext(ctx);
-        rc.isAlive();
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        ChefApiClient cac = new ChefApiClient(username, clientPrivatekey, chefserver, organizations);
-        ApiMethod am = cac.post(chefAction).body(pushRequest);
-
-        am.execute();
-         code = am.getReturnCode();
-        String message = am.getResponseBodyAsString();
-        if (code == 201) {
-            int startIndex = message.indexOf("jobs") + 6;
-            int endIndex = message.length() - 2;
-            String jobID = message.substring(startIndex, endIndex);
-            svcLogic.setAttribute("jobID", jobID);
-            logger.info(jobID);
-        }
-        chefServerResult(rc, Integer.toString(code), message);
-        }
-        catch(Exception e)
-        {
-            code = 401;
-            doFailure(ctx,code,e.getMessage());
-        }
-    }
-     
-     @SuppressWarnings("static-method")
-    private void doFailure(RequestContext rc, int code, String message) {
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        String msg = (message == null) ? Integer.toString(code) : message;
-        if (msg.contains("\n")) {
-            msg = msg.substring(msg.indexOf("\n"));
-        }
-
-        String status;
         try {
-            status = Integer.toString(code);
+            chefInfo(params, ctx);
+            String pushRequest = params.get("pushRequest");
+            String chefAction = "/pushy/jobs";
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+            ChefResponse chefResponse = chefApiClient.post(chefAction, pushRequest);
+
+            code = chefResponse.getStatusCode();
+            String message = chefResponse.getBody();
+            if (code == 201) {
+                int startIndex = message.indexOf("jobs") + 6;
+                int endIndex = message.length() - 2;
+                String jobID = message.substring(startIndex, endIndex);
+                ctx.setAttribute("jobID", jobID);
+                logger.info(jobID);
+            }
+            chefServerResult(ctx, code, message);
         } catch (Exception e) {
-           
-            status = "500";
+            code = 401;
+            logger.error("An error occurred when executing pushJob method", e);
+            doFailure(ctx, code, e.getMessage());
         }
-        svcLogic.setAttribute("chefAgent.code", status);
-        svcLogic.setAttribute("chefAgent.message", msg);
     }
 
-    /**
-     * @param rc
-     *            The request context that manages the state and recovery of the
-     *            request for the life of its processing.
-     */
-     @SuppressWarnings("static-method")
-    private void doSuccess(RequestContext rc) {
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setAttribute("chefAgent.code", "200");
-    }
     @SuppressWarnings("static-method")
-    private void chefServerResult(RequestContext rc, String code, String message) {
-        String msg = (message == null) ? " " : message;
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setStatus(OUTCOME_SUCCESS);
-        svcLogic.setAttribute("chefServerResult.code", code);
-        svcLogic.setAttribute("chefServerResult.message", message);
-        logger.info("chefServerResult.code"+svcLogic.getAttribute("chefServerResult.code"));
-            logger.info("chefServerResult.message"+svcLogic.getAttribute("chefServerResult.message"));
+    private void chefServerResult(SvcLogicContext svcLogicContext, int code, String message) {
+        initSvcLogic(svcLogicContext, code, message, "server");
     }
+
     @SuppressWarnings("static-method")
-    private void chefClientResult(RequestContext rc, String code, String message) {
-        String msg = (message == null) ? " " : message;
-        SvcLogicContext svcLogic = rc.getSvcLogicContext();
-        svcLogic.setStatus(OUTCOME_SUCCESS);
-        svcLogic.setAttribute("chefClientResult.code", code);
-        svcLogic.setAttribute("chefClientResult.message", message);
-        logger.info("chefClientResult.code"+svcLogic.getAttribute("chefClientResult.code"));
-            logger.info("chefClientResult.message"+svcLogic.getAttribute("chefClientResult.message"));
+    private void chefClientResult(SvcLogicContext svcLogicContext, int code, String message) {
+        initSvcLogic(svcLogicContext, code, message, "client");
     }
 
-    /**
-     * initialize the provider adapter by building the context cache
-     */
-    private void initialize() {
-        
-        logger.info("Initialize Chef Adapter");
+    private void initSvcLogic(SvcLogicContext svcLogicContext, int code, String message, String target) {
+
+        String codeStr = "server".equals(target) ? CHEF_SERVER_RESULT_CODE_STR : CHEF_CLIENT_RESULT_CODE_STR;
+        String messageStr = "client".equals(target) ? CHEF_CLIENT_RESULT_MSG_STR : CHEF_SERVER_RESULT_MSG_STR;
+
+        svcLogicContext.setStatus(OUTCOME_SUCCESS);
+        svcLogicContext.setAttribute(codeStr, Integer.toString(code));
+        svcLogicContext.setAttribute(messageStr, message);
+        logger.info(codeStr + ": " + svcLogicContext.getAttribute(codeStr));
+        logger.info(messageStr + ": " + svcLogicContext.getAttribute(messageStr));
     }
 
-   
-     @SuppressWarnings("static-method")
-    private void doFailure(SvcLogicContext svcLogic,  int code, String message)  throws SvcLogicException {
+    @SuppressWarnings("static-method")
+    private void doFailure(SvcLogicContext svcLogic, int code, String message) throws SvcLogicException {
 
-         if (message.contains("\n")) {
-             message = message.substring(message.indexOf("\n"));
-         }
-    svcLogic.setStatus(OUTCOME_FAILURE);
-    svcLogic.setAttribute("chefServerResult.code",Integer.toString(code));
-    svcLogic.setAttribute("chefServerResult.message",message);
-    
-    throw new SvcLogicException("Chef Adapater Error = " + message );
-    }                                                                                                       
+        String cutMessage = message.contains("\n") ? message.substring(message.indexOf('\n')) : message;
 
-    
+        svcLogic.setStatus(OUTCOME_FAILURE);
+        svcLogic.setAttribute(CHEF_SERVER_RESULT_CODE_STR, Integer.toString(code));
+        svcLogic.setAttribute(CHEF_SERVER_RESULT_MSG_STR, cutMessage);
 
-}
+        throw new SvcLogicException("Chef Adapter error:" + cutMessage);
+    }
+}
\ No newline at end of file