summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
7014e3f)
Change-Id: I04586efa6f994e716b65c2dabbdfbf680c561baa
Issue-ID: VFC-587
Signed-off-by: yufei_zhou <yufei.zhou@nokia-sbell.com>
{
logger.info("Start to get vnfc resource");
{
logger.info("Start to get vnfc resource");
- List<VnfcResourceInfo> vnfcResources = cbamMgmr.queryVnfcResource(execId);
- logger.info("vnfc resource for execId " + execId + " is: " + gson.toJson(vnfcResources));
+ List<VnfcResourceInfo> vnfcResources = new ArrayList<>();
+
+ try {
+ vnfcResources = cbamMgmr.queryVnfcResource(vnfInstanceId);
+ } catch (Exception e) {
+ logger.error("Error to queryVnfcResource.", e);
+ }
+
+ logger.info("vnfc resource for vnfInstanceId " + vnfInstanceId + " is: " + gson.toJson(vnfcResources));
logger.info("End to get vnfc resource");
logger.info("End to get vnfc resource");
- if(vnfcResources != null && !vnfcResources.isEmpty())
+ if(vnfcResources == null)
- logger.info("Start to notify LCM the instantiation result");
- NslcmNotifyLCMEventsRequest nslcmNotifyReq = buildNslcmNotifyLCMEventsRequest(vnfcResources);
-
- OperateTaskProgress.setAffectedVnfc(nslcmNotifyReq.getAffectedVnfc());
-
- nslcmMgmr.notifyVnf(nslcmNotifyReq, vnfmId, vnfInstanceId);
- logger.info("End to notify LCM the instantiation result");
+ vnfcResources = new ArrayList<>();
+ logger.info("Start to notify LCM the instantiation result");
+ NslcmNotifyLCMEventsRequest nslcmNotifyReq = buildNslcmNotifyLCMEventsRequest(vnfcResources);
+
+ OperateTaskProgress.setAffectedVnfc(nslcmNotifyReq.getAffectedVnfc());
+
+ nslcmMgmr.notifyVnf(nslcmNotifyReq, vnfmId, vnfInstanceId);
+ logger.info("End to notify LCM the instantiation result");
jobInfo.setVnfmExecutionId(cbamInstantiateResponse.getId());
if(CommonEnum.OperationStatus.FAILED == cbamInstantiateResponse.getStatus()){
jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_ERROR);
jobInfo.setVnfmExecutionId(cbamInstantiateResponse.getId());
if(CommonEnum.OperationStatus.FAILED == cbamInstantiateResponse.getStatus()){
jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_ERROR);
+// jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_FINISH);
} else if(CommonEnum.OperationStatus.OTHER == cbamInstantiateResponse.getStatus()){
jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_PROCESSING);
} else if(CommonEnum.OperationStatus.FINISHED == cbamInstantiateResponse.getStatus()){
} else if(CommonEnum.OperationStatus.OTHER == cbamInstantiateResponse.getStatus()){
jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_PROCESSING);
} else if(CommonEnum.OperationStatus.FINISHED == cbamInstantiateResponse.getStatus()){
+ if(vnfcs == null) {
+ vnfcs = new ArrayList<>();
+ }
+
map.put(CommonConstants.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
String bodyPostStr = readVfcAdaptorInfoFromJsonFile();
map.put(CommonConstants.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE);
String bodyPostStr = readVfcAdaptorInfoFromJsonFile();
+
+ logger.info("MSB register content is: " + bodyPostStr);
HttpResult httpResult = httpClientProcessor.process(url, RequestMethod.POST, map, bodyPostStr);
String responseStr = httpResult.getContent();
HttpResult httpResult = httpClientProcessor.process(url, RequestMethod.POST, map, bodyPostStr);
String responseStr = httpResult.getContent();