restJson.put(Constant.RETCODE, Constant.REST_FAIL);
JSONObject queryResult = ResultRequestUtil.call(vnfmObject,
- String.format(ParamConstants.VNF_INSTANCE_GET, vnfId) + Constant.ROARAND + "&type=status", Constant.GET,
- null, Constant.CERTIFICATE);
+ String.format(ParamConstants.VNF_INSTANCE_GET, vnfId), Constant.GET, null, Constant.CERTIFICATE);
int statusCode = queryResult.getInt(Constant.RETCODE);
return restJson;
}
restJson.put(Constant.RETCODE, Constant.REST_SUCCESS);
- restJson.put("data", JSONObject.fromObject(queryResult.getString("data")).getJSONArray("basic"));
+ restJson.put("data", JSONObject.fromObject(queryResult.getString("data")).getJSONArray("vnf_list"));
} else {
LOG.error("function=getVnf, msg=send get vnf msg to csm get wrong status: {}", statusCode);
}
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);