From: liuqian <liuqian13@huawei.com>
Date: Thu, 17 May 2018 02:07:45 +0000 (+0800)
Subject: fix scale jobid
X-Git-Tag: v1.1.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F51%2F47951%2F1;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

fix scale jobid

Change-Id: I751df1bf2eb8c5c99c48ba32264f67b200858886
Issue-ID: VFC-868
Signed-off-by: liuqian <liuqian13@huawei.com>
---

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 242ccbdf..185d31cb 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
@@ -97,9 +97,12 @@ public class VnfMgrVnfm implements InterfaceVnfMgr {
                 restJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
                 // restJson.put("data",
                 // queryResult.getJSONObject("data").getJSONObject("scale_info"));
-                // JSONObject appInfo =
-                // queryResult.getJSONObject("data").getJSONObject("scale_info");
                 JSONObject appInfo = new JSONObject();
+                try {
+                    appInfo = JSONObject.fromObject(queryResult.getString("data")).getJSONObject("scale_info");
+                } catch(JSONException e) {
+                    LOG.error("function=scaleVnf, msg=csm return obj is not a json, e={}.", e);
+                }
                 JSONObject resultObj = new JSONObject();
                 // resultObj.put(Constant.JOBID, vnfInstanceId + "_" + Constant.PUT);
                 handleResponse(resultObj, appInfo, vnfInstanceId, Constant.PUT);