Add jobId in response body
Change-Id: Ia62d986fa388fdf7166148f7585f4d5568eaa3e9
Issue-Id:VFC-327
Signed-off-by: luxin <luxin7@huawei.com>
String vnfPath = path.contains("%s") ? String.format(path, mgrVcmm.getRoaRand()) : path;
String oldUrl = vnfmObject.getString("url").trim();
String newUrl = oldUrl.replaceAll("30001", "30000");
String vnfPath = path.contains("%s") ? String.format(path, mgrVcmm.getRoaRand()) : path;
String oldUrl = vnfmObject.getString("url").trim();
String newUrl = oldUrl.replaceAll("30001", "30000");
- LOG.info("function=call, msg=url is {}, session is {}", newUrl + vnfPath, mgrVcmm.getAccessSession());
+ LOG.info("function=callSouth, msg=url is {}, session is {}", newUrl + vnfPath, mgrVcmm.getAccessSession());
+ LOG.info("function=callSouth, paramsJson is {}", paramsJson);
+
HttpRequests.Builder builder =
new HttpRequests.Builder(authModel).addHeader("X-Auth-Token", mgrVcmm.getAccessSession())
.setUrl(newUrl, vnfPath).setParams(paramsJson);
HttpRequests.Builder builder =
new HttpRequests.Builder(authModel).addHeader("X-Auth-Token", mgrVcmm.getAccessSession())
.setUrl(newUrl, vnfPath).setParams(paramsJson);
JSONObject subJsonObject = new JSONObject();
subJsonObject.put("type", "hard");
JSONObject subJsonObject = new JSONObject();
subJsonObject.put("type", "hard");
- subJsonObject.put("boot_mode", null);
+ subJsonObject.put("boot_mode", "");
if("vmReset".equals(action)) {
subJsonObject.put("action", "reset");
}
if("vmReset".equals(action)) {
subJsonObject.put("action", "reset");
}
+ LOG.info("healVnf subJsonObject :" + subJsonObject);
JSONObject healResult = ResultRequestUtil.callSouth(vnfmObjcet, path, Constant.PUT, subJsonObject.toString(),
Constant.CERTIFICATE);
JSONObject healResult = ResultRequestUtil.callSouth(vnfmObjcet, path, Constant.PUT, subJsonObject.toString(),
Constant.CERTIFICATE);
}
restJson.remove(Constant.RETCODE);
}
restJson.remove(Constant.RETCODE);
+ restJson.put("jobId", vnfInstanceId + "_put");
return restJson.toString();
}
return restJson.toString();
}