diff options
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); |