diff options
author | luxin <luxin7@huawei.com> | 2018-03-22 11:17:36 +0800 |
---|---|---|
committer | luxin <luxin7@huawei.com> | 2018-03-22 11:17:36 +0800 |
commit | b851b7ee3c927bdabe4853a93553ccbfe31dfee1 (patch) | |
tree | 91ac272753e2004dd79f00101c2c14bb25db5735 /huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java | |
parent | 37e6b6790110cf83c9a882cf637fe5fb97601e82 (diff) |
Fix query vnf interface
Change-Id: Ied8e60d1804bb69dad598b16e29afc63ba03c62f
Issue-ID: VFC-725
Signed-off-by: luxin <luxin7@huawei.com>
Diffstat (limited to 'huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java')
-rw-r--r-- | huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java index be8268a4..e4eb5efc 100644 --- a/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java +++ b/huawei/vnfmadapter/VnfmadapterService/service/src/main/java/org/onap/vfc/nfvo/vnfm/svnfm/vnfmadapter/service/process/VnfMgr.java @@ -198,16 +198,15 @@ public class VnfMgr { JSONObject retJson = restJson.getJSONArray("data").getJSONObject(0); - basicInfoJson.put("vnfInstanceId", retJson.getString("id")); - basicInfoJson.put("vnfInstanceName", retJson.getString("vapp_name")); - basicInfoJson.put("vnfInstanceDescription", "vFW"); - - Vnfm vnfm = vnfmDao.getVnfmById(retJson.getString("id")); - basicInfoJson.put(Constant.VNFDID, vnfm == null ? "" : vnfm.getVnfdId()); - basicInfoJson.put("vnfdPackageId", vnfm == null ? "" : vnfm.getVnfPackageId()); - basicInfoJson.put("version", vnfm == null ? "" : vnfm.getVersion()); + basicInfoJson.put("vnfInstanceId", retJson.getString("vnf_id")); + basicInfoJson.put("vnfInstanceName", retJson.getString("vnf_name")); + basicInfoJson.put("vnfInstanceDescription", ""); + + basicInfoJson.put(Constant.VNFDID, retJson.getString("vnfd_id")); + basicInfoJson.put("vnfdPackageId", retJson.getString("vnfd_id")); + basicInfoJson.put("version", "1.0"); basicInfoJson.put("vnfProvider", "hw"); - basicInfoJson.put("vnfType", retJson.get("vapp_type")); + basicInfoJson.put("vnfType", retJson.get("vnf_type")); basicInfoJson.put("vnfStatus", retJson.getString(Constant.STATUS)); vnfInfoJson.put("vnfInfo", basicInfoJson); |