chef adapter changes for pushjob status nodescheck

Issue-ID: APPC-1012
Change-Id: Iac03825b092f62a8d3747a62303f7869bc8280e8
Signed-off-by: Modaboina, Kusumakumari (km583p) <km583p@us.att.com>

2 files changed, 119 insertions, 78 deletions

diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
index bd367b035..8d754e791 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/main/java/org/onap/appc/adapter/chef/impl/ChefAdapterImpl.java
@@ -38,8 +38,8 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext;
 import org.onap.ccsdk.sli.core.sli.SvcLogicException;
 
 /**
- * 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 {
 
@@ -86,11 +86,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     @SuppressWarnings("nls")
     public static final String PROPERTY_PROVIDER_TYPE = "type";
 
-
     private static final EELFLogger logger = EELFManager.getInstance().getLogger(ChefAdapterImpl.class);
 
-    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 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: ";
@@ -100,6 +98,13 @@ public class ChefAdapterImpl implements ChefAdapter {
     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 static final Integer STATUS_OK = 200;
+    private static final Integer STATUS_PUSHJOBCHECK = 201;
+    private static final Integer PUSHJOBSTATUS= 202;
+    private static final Integer KEY_NOTFOUND = 500;
+    private static final Integer NO_ENVIRONMENT = 404;
+    private static final Integer APPC_ERRORCODE = 401;
+
     private final ChefApiClientFactory chefApiClientFactory;
     private final PrivateKeyChecker privateKeyChecker;
 
@@ -118,7 +123,7 @@ public class ChefAdapterImpl implements ChefAdapter {
         String env = params.get("Environment");
         logger.info("Environmnet" + env);
         if (env.equals(StringUtils.EMPTY)) {
-            chefServerResult(ctx, 200, "Skip Environment block ");
+            chefServerResult(ctx, STATUS_OK, "Skip Environment block ");
         } else {
             String message;
             if (privateKeyChecker.doesExist(clientPrivatekey)) {
@@ -126,11 +131,12 @@ public class ChefAdapterImpl implements ChefAdapter {
                     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);
+                    ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username,
+                            clientPrivatekey);
                     ChefResponse chefResponse = chefApiClient.put("/environments/" + envName, env);
                     code = chefResponse.getStatusCode();
                     message = chefResponse.getBody();
-                    if (code == 404) {
+                    if (code == NO_ENVIRONMENT) {
                         // need create a new environment
                         chefResponse = chefApiClient.post("/environments", env);
                         code = chefResponse.getStatusCode();
@@ -139,16 +145,16 @@ public class ChefAdapterImpl implements ChefAdapter {
                     }
                     chefServerResult(ctx, code, message);
                 } catch (JSONException e) {
-                    code = 401;
+                    code = APPC_ERRORCODE;
                     logger.error(POSTING_REQUEST_JSON_ERROR_STR, e);
                     doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + e.getMessage());
                 } catch (Exception e) {
-                    code = 401;
+                    code = APPC_ERRORCODE;
                     logger.error(POSTING_REQUEST_ERROR_STR + "vnfcEnvironment", e);
-                    doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "vnfcEnvironment"+ e.getMessage());
+                    doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "vnfcEnvironment" + e.getMessage());
                 }
             } else {
-                code = 500;
+                code = KEY_NOTFOUND;
                 message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
                 doFailure(ctx, code, message);
             }
@@ -170,12 +176,13 @@ public class ChefAdapterImpl implements ChefAdapter {
                 nodeListS = nodeListS.replace("\"", StringUtils.EMPTY);
                 nodeListS = nodeListS.replace(" ", StringUtils.EMPTY);
                 List<String> nodes = Arrays.asList(nodeListS.split("\\s*,\\s*"));
-                code = 200;
+                code = STATUS_OK;
                 String message = null;
                 if (privateKeyChecker.doesExist(clientPrivatekey)) {
-                    ChefApiClient cac = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+                    ChefApiClient cac = chefApiClientFactory.create(chefserver, organizations, username,
+                            clientPrivatekey);
 
-                    for (String nodeName: nodes) {
+                    for (String nodeName : nodes) {
                         JSONObject nodeJ = new JSONObject(nodeS);
                         nodeJ.remove("name");
                         nodeJ.put("name", nodeName);
@@ -184,12 +191,12 @@ public class ChefAdapterImpl implements ChefAdapter {
                         ChefResponse chefResponse = cac.put("/nodes/" + nodeName, nodeObject);
                         code = chefResponse.getStatusCode();
                         message = chefResponse.getBody();
-                        if (code != 200) {
+                        if (code != STATUS_OK) {
                             break;
                         }
                     }
                 } else {
-                    code = 500;
+                    code = KEY_NOTFOUND;
                     message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
                     doFailure(ctx, code, message);
                 }
@@ -198,13 +205,13 @@ public class ChefAdapterImpl implements ChefAdapter {
                 throw new SvcLogicException("Missing Mandatory param(s) Node , NodeList ");
             }
         } catch (JSONException e) {
-            code = 401;
-            logger.error(POSTING_REQUEST_JSON_ERROR_STR +"vnfcNodeobjects", e);
-            doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR +"vnfcNodeobjects" + e.getMessage());
+            code = APPC_ERRORCODE;
+            logger.error(POSTING_REQUEST_JSON_ERROR_STR + "vnfcNodeobjects", e);
+            doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + "vnfcNodeobjects" + e.getMessage());
         } catch (Exception e) {
-            code = 401;
-            logger.error(POSTING_REQUEST_ERROR_STR +"vnfcNodeobjects", e);
-            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR +"vnfcNodeobjects"+ e.getMessage());
+            code = APPC_ERRORCODE;
+            logger.error(POSTING_REQUEST_ERROR_STR + "vnfcNodeobjects", e);
+            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "vnfcNodeobjects" + e.getMessage());
         }
     }
 
@@ -223,11 +230,11 @@ public class ChefAdapterImpl implements ChefAdapter {
                     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" + "}";
+                            + nodeList + "," + "\"env\": {\"RequestId\": \"" + requestId + "\", \"CallbackUrl\": \""
+                            + callbackUrl + "\"}," + "\"capture_output\": true" + "}";
                 } else {
                     pushRequest = "{" + "\"command\": \"chef-client\"," + "\"run_timeout\": 300," + "\"nodes\":"
-                        + nodeList + "," + "\"env\": {}," + "\"capture_output\": true" + "}";
+                            + nodeList + "," + "\"env\": {}," + "\"capture_output\": true" + "}";
                 }
                 ChefApiClient cac = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
                 ChefResponse chefResponse = cac.post(chefAction, pushRequest);
@@ -235,7 +242,7 @@ public class ChefAdapterImpl implements ChefAdapter {
                 logger.info("pushRequest:" + pushRequest);
                 logger.info("requestbody: {}", chefResponse.getBody());
                 String message = chefResponse.getBody();
-                if (code == 201) {
+                if (code == STATUS_PUSHJOBCHECK) {
                     int startIndex = message.indexOf("jobs") + 5;
                     int endIndex = message.length() - 2;
                     String jobID = message.substring(startIndex, endIndex);
@@ -247,16 +254,16 @@ public class ChefAdapterImpl implements ChefAdapter {
                 throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
             }
         } catch (Exception e) {
-            code = 401;
+            code = APPC_ERRORCODE;
             logger.error(POSTING_REQUEST_ERROR_STR + "vnfcPushJob", e);
-            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "vnfcPushJob"+ e.getMessage());
+            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "vnfcPushJob" + e.getMessage());
         }
     }
 
     @SuppressWarnings("nls")
     @Override
     public void fetchResults(Map<String, String> params, SvcLogicContext ctx) throws SvcLogicException {
-        int code = 200;
+        int code = STATUS_OK;
         try {
             chefInfo(params, ctx);
             String nodeListS = params.get(NODE_LIST_STR);
@@ -277,11 +284,11 @@ public class ChefAdapterImpl implements ChefAdapter {
                         code = chefResponse.getStatusCode();
                         message = chefResponse.getBody();
                     } else {
-                        code = 500;
+                        code = KEY_NOTFOUND;
                         message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
                         doFailure(ctx, code, message);
                     }
-                    if (code == 200) {
+                    if (code == STATUS_OK) {
                         JSONObject nodeResult = new JSONObject();
                         JSONObject allNodeData = new JSONObject(message);
                         allNodeData = allNodeData.getJSONObject("normal");
@@ -290,13 +297,13 @@ public class ChefAdapterImpl implements ChefAdapter {
                         String resultData = allNodeData.optString(attribute, null);
                         if (resultData == null) {
                             resultData = Optional.ofNullable(allNodeData.optJSONObject(attribute))
-                                .map(p -> p.toString()).orElse(null);
+                                    .map(p -> p.toString()).orElse(null);
                             if (resultData == null) {
                                 resultData = Optional.ofNullable(allNodeData.optJSONArray(attribute))
-                                    .map(p -> p.toString()).orElse(null);
+                                        .map(p -> p.toString()).orElse(null);
 
                                 if (resultData == null) {
-                                    code = 500;
+                                    code = KEY_NOTFOUND;
                                     returnMessage = "Cannot find " + attribute;
                                     break;
                                 }
@@ -306,7 +313,7 @@ public class ChefAdapterImpl implements ChefAdapter {
                         result.put(node, nodeResult);
                         returnMessage = result.toString();
                     } else {
-                        code = 500;
+                        code = KEY_NOTFOUND;
                         returnMessage = message + " Cannot access: " + node;
                         doFailure(ctx, code, message);
                         break;
@@ -318,13 +325,13 @@ public class ChefAdapterImpl implements ChefAdapter {
                 throw new SvcLogicException("Missing Mandatory param(s)  NodeList ");
             }
         } catch (JSONException e) {
-            code = 401;
+            code = APPC_ERRORCODE;
             logger.error(POSTING_REQUEST_JSON_ERROR_STR + "fetchResults", e);
             doFailure(ctx, code, POSTING_REQUEST_JSON_ERROR_STR + "fetchResults" + e.getMessage());
         } catch (Exception e) {
-            code = 401;
-            logger.error(POSTING_REQUEST_ERROR_STR + "fetchResults" , e);
-            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "fetchResults"+ e.getMessage());
+            code = APPC_ERRORCODE;
+            logger.error(POSTING_REQUEST_ERROR_STR + "fetchResults", e);
+            doFailure(ctx, code, POSTING_REQUEST_ERROR_STR + "fetchResults" + e.getMessage());
         }
     }
 
@@ -347,9 +354,9 @@ 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);
         ctx.setAttribute("chef.nodeObject", nodeObject);
     }
@@ -363,12 +370,12 @@ public class ChefAdapterImpl implements ChefAdapter {
         serverAddress = params.get("serverAddress");
         organizations = params.get("organizations");
         if (StringUtils.isNotBlank(username) && StringUtils.isNotBlank(serverAddress)
-            && StringUtils.isNotBlank(organizations)) {
+                && StringUtils.isNotBlank(organizations)) {
             chefserver = "https://" + serverAddress + "/organizations/" + organizations;
             clientPrivatekey = "/opt/onap/appc/chef/" + serverAddress + "/" + organizations + "/" + username + ".pem";
             logger.info(" clientPrivatekey  " + clientPrivatekey);
         } else {
-            doFailure(ctx, 401, "Missing mandatory param(s) such as username, serverAddress, organizations");
+            doFailure(ctx, APPC_ERRORCODE, "Missing mandatory param(s) such as username, serverAddress, organizations");
         }
     }
 
@@ -387,7 +394,8 @@ public class ChefAdapterImpl implements ChefAdapter {
         try {
             return jsonConfig.getString(key);
         } catch (Exception e) {
-            logger.error("Failed getting string value corresponding to " + key + ". Trying to fetch nested json object", e);
+            logger.error("Failed getting string value corresponding to " + key + ". Trying to fetch nested json object",
+                    e);
             try {
                 return jsonConfig.getJSONObject(key).toString();
             } catch (Exception ex) {
@@ -419,13 +427,12 @@ public class ChefAdapterImpl implements ChefAdapter {
         String chefAction = params.get(CHEF_ACTION_STR);
         int code;
         String message;
-
         if (privateKeyChecker.doesExist(clientPrivatekey)) {
             ChefResponse chefResponse = getApiMethod(chefAction);
             code = chefResponse.getStatusCode();
             message = chefResponse.getBody();
         } else {
-            code = 500;
+            code = KEY_NOTFOUND;
             message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         chefServerResult(ctx, code, message);
@@ -444,13 +451,13 @@ public class ChefAdapterImpl implements ChefAdapter {
         int code;
         String message;
         if (privateKeyChecker.doesExist(clientPrivatekey)) {
-            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
-
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username,
+                    clientPrivatekey);
             ChefResponse chefResponse = chefApiClient.put(chefAction, chefNodeStr);
             code = chefResponse.getStatusCode();
             message = chefResponse.getBody();
         } else {
-            code = 500;
+            code = KEY_NOTFOUND;
             message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         logger.info(code + "   " + message);
@@ -467,20 +474,19 @@ public class ChefAdapterImpl implements ChefAdapter {
         logger.info(username + " " + clientPrivatekey + " " + chefserver + " " + organizations);
         String chefNodeStr = params.get("chefRequestBody");
         String chefAction = params.get(CHEF_ACTION_STR);
-
         int code;
         String message;
         // should load pem from somewhere else
         if (privateKeyChecker.doesExist(clientPrivatekey)) {
-            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
-
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username,
+                    clientPrivatekey);
             // need pass path into it
             // "/nodes/testnode"
             ChefResponse chefResponse = chefApiClient.post(chefAction, chefNodeStr);
             code = chefResponse.getStatusCode();
             message = chefResponse.getBody();
         } else {
-            code = 500;
+            code = KEY_NOTFOUND;
             message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         logger.info(code + "   " + message);
@@ -498,12 +504,13 @@ public class ChefAdapterImpl implements ChefAdapter {
         int code;
         String message;
         if (privateKeyChecker.doesExist(clientPrivatekey)) {
-            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username,
+                    clientPrivatekey);
             ChefResponse chefResponse = chefApiClient.delete(chefAction);
             code = chefResponse.getStatusCode();
             message = chefResponse.getBody();
         } else {
-            code = 500;
+            code = KEY_NOTFOUND;
             message = CANNOT_FIND_PRIVATE_KEY_STR + clientPrivatekey;
         }
         logger.info(code + "   " + message);
@@ -517,14 +524,13 @@ public class ChefAdapterImpl implements ChefAdapter {
     public void trigger(Map<String, String> params, SvcLogicContext svcLogicContext) {
         logger.info("Run trigger method");
         String tVmIp = params.get("ip");
-
         try {
             ChefResponse chefResponse = chefApiClientFactory.create(tVmIp, organizations).get("");
             chefClientResult(svcLogicContext, chefResponse.getStatusCode(), chefResponse.getBody());
-            svcLogicContext.setAttribute("chefAgent.code", "200");
+            svcLogicContext.setAttribute("chefAgent.code", STATUS_OK.toString());
         } catch (Exception e) {
             logger.error("An error occurred when executing trigger method", e);
-            svcLogicContext.setAttribute("chefAgent.code", "500");
+            svcLogicContext.setAttribute("chefAgent.code", KEY_NOTFOUND.toString());
             svcLogicContext.setAttribute("chefAgent.message", e.toString());
         }
     }
@@ -542,9 +548,7 @@ public class ChefAdapterImpl implements ChefAdapter {
 
                 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++) {
@@ -564,25 +568,52 @@ public class ChefAdapterImpl implements ChefAdapter {
                 throw new SvcLogicException("Missing Mandatory param(s) retryTimes , retryInterval ");
             }
         } catch (Exception e) {
-            code = 401;
+            code = APPC_ERRORCODE;
             logger.error("An error occurred when executing checkPushJob method", e);
             doFailure(ctx, code, e.getMessage());
         }
     }
 
-    private void resolveSvcLogicAttributes(SvcLogicContext svcLogic, String message, String status) {
+    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);
+            if (hasFailedNode(message)) {
+                String finalMessage = "PushJob Status Complete but check failed nodes in the message :" + message;
+                svcLogic.setAttribute("chefServerResult.code", APPC_ERRORCODE.toString());
+                svcLogic.setAttribute("chefServerResult.message", finalMessage);
+            } else {
+                svcLogic.setAttribute(CHEF_SERVER_RESULT_CODE_STR, STATUS_OK.toString());
+                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_CODE_STR, PUSHJOBSTATUS.toString());
             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_CODE_STR, KEY_NOTFOUND.toString());
             svcLogic.setAttribute(CHEF_SERVER_RESULT_MSG_STR, message);
         }
     }
 
+    private Boolean hasFailedNode(String message) throws JSONException {
+        try {   
+            JSONObject messageJson = new JSONObject(message);
+            JSONObject node = messageJson.getJSONObject("nodes");
+            if (node == null) {
+                logger.debug("Status Complete but node details in the message is null : " + message);
+                return Boolean.TRUE;
+            }
+            if (node.has("failed") && !(node.isNull("failed")) && (node.getJSONArray("failed").length() != 0)) {
+                logger.debug("Status Complete but one or more Failed nodes ....FAILURE " + message);
+                return Boolean.TRUE;
+            }
+            logger.debug("Status Complete and no failed nodes ....SUCCESS " + message);
+            return Boolean.FALSE;
+        } catch (JSONException e) {
+            logger.error("Exception occured in hasFailedNode", e);
+            throw new JSONException("Exception occured in hasFailedNode" + e.getMessage());
+        }
+
+    }
+
     private void sleepFor(int retryInterval) {
         try {
             Thread.sleep(retryInterval); // 1000 milliseconds is one second.
@@ -599,12 +630,12 @@ public class ChefAdapterImpl implements ChefAdapter {
             chefInfo(params, ctx);
             String pushRequest = params.get("pushRequest");
             String chefAction = "/pushy/jobs";
-            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username, clientPrivatekey);
+            ChefApiClient chefApiClient = chefApiClientFactory.create(chefserver, organizations, username,
+                    clientPrivatekey);
             ChefResponse chefResponse = chefApiClient.post(chefAction, pushRequest);
-
             code = chefResponse.getStatusCode();
             String message = chefResponse.getBody();
-            if (code == 201) {
+            if (code == STATUS_PUSHJOBCHECK) {
                 int startIndex = message.indexOf("jobs") + 6;
                 int endIndex = message.length() - 2;
                 String jobID = message.substring(startIndex, endIndex);
@@ -613,7 +644,7 @@ public class ChefAdapterImpl implements ChefAdapter {
             }
             chefServerResult(ctx, code, message);
         } catch (Exception e) {
-            code = 401;
+            code = APPC_ERRORCODE;
             logger.error("An error occurred when executing pushJob method", e);
             doFailure(ctx, code, e.getMessage());
         }
@@ -633,7 +664,6 @@ public class ChefAdapterImpl implements ChefAdapter {
 
         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);
@@ -645,11 +675,9 @@ public class ChefAdapterImpl implements ChefAdapter {
     private void doFailure(SvcLogicContext svcLogic, int code, String message) throws SvcLogicException {
 
         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);
     }
 }
diff --git a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplJobPusherTest.java b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplJobPusherTest.java
index 9e83dd63d..f489ad5a4 100644
--- a/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplJobPusherTest.java
+++ b/appc-adapters/appc-chef-adapter/appc-chef-adapter-bundle/src/test/java/org/onap/appc/adapter/chef/impl/ChefAdapterImplJobPusherTest.java
@@ -180,14 +180,27 @@ public class ChefAdapterImplJobPusherTest {
     public void checkPushJob_shouldCheckJobStatusOnlyOnce_withoutAdditionalRetries_whenFirstReturnedJobStatusIs_Complete()
         throws SvcLogicException {
         String expectedHttpStatus = Integer.toString(HttpStatus.SC_OK);
-        String expectedMessage = "{status:complete}";
-
+        //String expectedMessage = "{status:complete}";
+        String expectedMessage = "{\"nodes\":{\"succeeded\":[\"NODE1.atttest.com\"]},\"id\":\"26d\",\"command\":\"chef-client\",\"status\":\"complete\"} ";
         assertCheckJobStatusFor(
             expectedHttpStatus,
             expectedMessage,
-            ChefResponse.create(HttpStatus.SC_OK, "{status:complete}"),
+            ChefResponse.create(HttpStatus.SC_OK, expectedMessage),
             ChefResponse.create(HttpStatus.SC_OK, "{status:running}"));
     }
+    @Test
+    public void checkPushJob_withFailedNode_whenFirstReturnedJobStatusIs_Complete()
+        throws SvcLogicException {
+        String expectedHttpStatus = "401";
+        String message = "{\"nodes\":{\"failed\":[\"NODE1.atttest.com\"]},\"id\":\"26d\",\"command\":\"chef-client\",\"status\":\"complete\"} ";
+        String expectedMessage = "PushJob Status Complete but check failed nodes in the message :"+ message ;
+
+        assertCheckJobStatusFor(
+            expectedHttpStatus,
+            expectedMessage,
+            ChefResponse.create(HttpStatus.SC_OK, message));
+    }
+
 
     @Test
     public void checkPushJob_shouldCheckJobStatusExpectedNumberOf_ThreeRetryTimes_whenEachReturnedStatusIs_Running()