Base64 token = new Base64();
String authen = new String(token.encode(("AAI:AAI").getBytes()));
headerMap.put("Authorization", "Basic " + authen);
- LOGGER.info("getVimById headerMap: {}", headerMap.toString());
+ LOGGER.info("getVnfmById headerMap: {}", headerMap.toString());
RestfulResponse rsp = VnfmRestfulUtil.getRemoteResponse(String.format(ParamConstants.ESR_GET_VNFM_URL, vnfmId),
VnfmRestfulUtil.TYPE_GET, headerMap, null);
JSONObject esrVnfm = JSONObject.fromObject(rsp.getResponseContent());
LOGGER.info("esrVnfm: {}", esrVnfm);
JSONObject vnfmJson = parseEsrVnfm(vnfmId, esrVnfm);
- LOGGER.info("vnfmJson: {}", esrVnfm);
+ LOGGER.info("vnfmJson: {}", vnfmJson);
return vnfmJson;
}
String downloadUri = "";
if(Integer.valueOf(csarobj.get(Constant.RETCODE).toString()) == Constant.HTTP_OK) {
LOG.info("get CSAR info successful.", csarobj.get(Constant.RETCODE));
- downloadUri = csarobj.getString("downloadUri");
+ downloadUri = csarobj.getJSONObject("packageInfo").getString("downloadUrl");
} else {
LOG.error("get CSAR info fail.", csarobj.get(Constant.RETCODE));
resultObj.put(Constant.REASON, csarobj.get(Constant.REASON).toString());
// get VNFM connection info
// getVnfmConnInfo(vnfmMap)
JSONObject vnfmObject = VnfmUtil.getVnfmById(vnfmid);
- if(Integer.valueOf(vnfmObject.get(Constant.RETCODE).toString()) != Constant.HTTP_OK) {
- LOG.error("get Vnfm Connection Info fail.", vnfmObject.get(Constant.RETCODE));
- resultObj.put(Constant.REASON, vnfmObject.get(Constant.REASON).toString());
- resultObj.put(Constant.RETCODE, vnfmObject.get(Constant.RETCODE).toString());
- return resultObj;
- }
- LOG.info("get Vnfm Connection Info successful.", vnfmObject.get(Constant.RETCODE));
+ LOG.info("get Vnfm Connection Info successful.");
String vnfmUrl = vnfmObject.getString("url");
String userName = vnfmObject.getString(Constant.USERNAME);