From: Victor Gao <victor.gao@huawei.com>
Date: Sat, 26 May 2018 07:19:25 +0000 (+0800)
Subject: Update heal job response
X-Git-Tag: v1.1.0~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F49223%2F1;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

Update heal job response

Change-Id: I76c3b0b483d37953c0460e4100cecedf0ee50b61
Issue-ID: VFC-923
Signed-off-by: Victor Gao <victor.gao@huawei.com>
---

diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
index fc374b66..e56eef1f 100644
--- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
+++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java
@@ -333,10 +333,26 @@ public class VnfRoa {
         }
 
         restJson.remove(Constant.RETCODE);
-        restJson.put("jobId", vnfInstanceId + "_post");
+        //restJson.put("jobId", vnfInstanceId + "_post");
+        restJson.put("jobId", vnfInstanceId + ":heal");
         return restJson.toString();
     }
 
+    private String getHealJobBody(String jobId) {
+    	LOG.warn("function=getHealJobBody");
+    	JSONObject responseJson = new JSONObject();
+    	JSONObject jobInfoJson = new JSONObject();
+        jobInfoJson.put("jobId", jobId);
+    	responseJson.put("progress", "100");
+        responseJson.put("status", "finished");
+        responseJson.put("errorCode", "null");
+        responseJson.put("responseId", "100");
+        jobInfoJson.put("responsedescriptor", responseJson);
+        
+        LOG.warn("function=getJobBody, jobInfoJson: {}", jobInfoJson);
+        return jobInfoJson.toString();
+    }
+    
     private String getJobBody(JSONObject restJson, String jobId) {
         LOG.warn("function=getJobBody, restJson: {}", restJson);
         JSONObject responseJson = new JSONObject();
@@ -419,6 +435,8 @@ public class VnfRoa {
 
         if(flag.equalsIgnoreCase("no")) {
             return getJobProcess(tmpJobId, vnfmId, resp, jobId);
+        } else if (flag.equalsIgnoreCase("heal")){
+            return getHealJobBody(jobId);
         } else {
             JSONObject restJson = vnfMgr.getJobFromVnfm(tmpJobId, vnfmId);