diff options
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java')
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/rest/VnfRoa.java | 15 |
1 files changed, 9 insertions, 6 deletions
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 6dd4cdbf..15786b66 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 @@ -262,7 +262,7 @@ public class VnfRoa { public String getJob(@PathParam("jobId") String jobId, @PathParam("vnfmId") String vnfmId, @Context HttpServletResponse resp, @QueryParam("@responseId") String responseId) { LOG.warn("function=getJob, msg=enter to get a job: jobId: {}, responseId: {}", jobId, responseId); - return getJob(jobId, vnfmId, resp); + return getJobProcess(jobId, vnfmId, resp, jobId); } /** @@ -275,7 +275,7 @@ public class VnfRoa { * @return * @since VFC 1.0 */ - private String getJob(String jobId, String vnfmId, HttpServletResponse resp) { + private String getJobProcess(String jobId, String vnfmId, HttpServletResponse resp, String orgJobId) { JSONObject restJson = new JSONObject(); if(StringUtils.isEmpty(jobId) || StringUtils.isEmpty(vnfmId)) { @@ -285,12 +285,12 @@ public class VnfRoa { restJson = vnfMgr.getJob(jobId, vnfmId); if(restJson.getInt(Constant.RETCODE) == Constant.REST_FAIL) { - LOG.error("function=getJob, msg=getJob fail"); + LOG.error("function=getJobProcess, msg=getJob fail"); resp.setStatus(Constant.HTTP_INNERERROR); return restJson.toString(); } - return getJobBody(restJson, jobId); + return getJobBody(restJson, orgJobId); } /** @@ -411,11 +411,14 @@ public class VnfRoa { LOG.warn("function=getJobFromVnfm, msg=enter to get a job: jobId: {}, responseId: {}", jobId, responseId); String[] temps = jobId.split(":"); String tmpJobId = temps[0]; - String flag = temps[1]; + String flag = ""; + if(temps.length > 1) { + flag = temps[1]; + } LOG.warn("function=getJobFromVnfm, tmpJobId: {}, flag: {}", tmpJobId, flag); if(flag.equalsIgnoreCase("no")) { - return getJob(tmpJobId, vnfmId, resp); + return getJobProcess(tmpJobId, vnfmId, resp, jobId); } else { JSONObject restJson = vnfMgr.getJobFromVnfm(tmpJobId, vnfmId); |