diff options
| author |   luxin <luxin7@huawei.com> | 2018-03-22 11:31:30 +0800 |
|---|---|---|
| committer | luxin <luxin7@huawei.com> | 2018-03-22 11:31:30 +0800 |
| commit | c62bc0d8fa5f102607017d8a71f470d25c9c4d56 (patch) | |
| tree | d60ac64f38209b98ae5eb31fe6b506a0376dba19 /huawei/vnfmadapter | |
| parent | b851b7ee3c927bdabe4853a93553ccbfe31dfee1 (diff) | |
Fix terminate VNF interface
Change-Id: Ia3f2a28243fac9d19177d976137691655b0c20e0
Issue-ID: VFC-725
Signed-off-by: luxin <luxin7@huawei.com>
Diffstat (limited to 'huawei/vnfmadapter')
2 files changed, 4 insertions, 4 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java index d249d73f..b712ff6b 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java @@ -169,9 +169,7 @@ public class VnfMgrVnfm implements InterfaceVnfMgr { if(statusCode == Constant.HTTP_NOCONTENT || statusCode == Constant.HTTP_OK) { restJson.put(Constant.RETCODE, Constant.REST_SUCCESS); - JSONObject resultObj = new JSONObject(); - resultObj.put(Constant.JOBID, vnfId + "_" + Constant.DELETE); - restJson.put("data", resultObj); + restJson.put("data", JSONObject.fromObject(queryResult.getString("data"))); } else { LOG.error("function=removeVnf, msg=send remove vnf msg to csm get wrong status: {}", statusCode); } 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 9f297451..66b7d61f 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 @@ -256,7 +256,7 @@ public class VnfRoa { * @since VFC 1.0 */ @GET - @Path("/{vnfmId}/jobs/{jobId}") + @Path("/{vnfmId}/jobs_old/{jobId}") 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); @@ -388,6 +388,8 @@ public class VnfRoa { * @return * @since VFC 1.0 */ + @GET + @Path("/{vnfmId}/jobs/{jobId}") public String getJobFromVnfm(@PathParam("jobId") String jobId, @PathParam("vnfmId") String vnfmId, @Context HttpServletResponse resp, @QueryParam("@responseId") String responseId) { LOG.warn("function=getJobFromVnfm, msg=enter to get a job: jobId: {}, responseId: {}", jobId, responseId); |