From c62bc0d8fa5f102607017d8a71f470d25c9c4d56 Mon Sep 17 00:00:00 2001 From: luxin Date: Thu, 22 Mar 2018 11:31:30 +0800 Subject: Fix terminate VNF interface Change-Id: Ia3f2a28243fac9d19177d976137691655b0c20e0 Issue-ID: VFC-725 Signed-off-by: luxin --- .../vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/csm/vnf/VnfMgrVnfm.java') 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); } -- cgit 1.2.3-korg