From 9f4ae52e090175c91e26d40cc1c0c74c439c0a86 Mon Sep 17 00:00:00 2001 From: yufei_zhou Date: Mon, 13 Nov 2017 09:46:57 +0800 Subject: Update LCM notify part Change-Id: I04586efa6f994e716b65c2dabbdfbf680c561baa Issue-ID: VFC-587 Signed-off-by: yufei_zhou --- .../adaptor/InstantiateVnfContinueRunnable.java | 29 ++++++++++++++-------- .../adaptor/TerminateVnfContinueRunnable.java | 4 +++ .../driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java | 2 ++ 3 files changed, 25 insertions(+), 10 deletions(-) (limited to 'nokia') diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java index 5ff7f19a..b3c8bfe1 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/InstantiateVnfContinueRunnable.java @@ -114,20 +114,28 @@ public class InstantiateVnfContinueRunnable implements Runnable { { logger.info("Start to get vnfc resource"); - List vnfcResources = cbamMgmr.queryVnfcResource(execId); - logger.info("vnfc resource for execId " + execId + " is: " + gson.toJson(vnfcResources)); + List 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"); - 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"); } } else { @@ -268,6 +276,7 @@ public class InstantiateVnfContinueRunnable implements Runnable { 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()){ diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/TerminateVnfContinueRunnable.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/TerminateVnfContinueRunnable.java index 0e6493c1..13e4e3c6 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/TerminateVnfContinueRunnable.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/TerminateVnfContinueRunnable.java @@ -195,6 +195,10 @@ public class TerminateVnfContinueRunnable implements Runnable { } } + if(vnfcs == null) { + vnfcs = new ArrayList<>(); + } + return vnfcs; } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java index 78dcf413..e89eabe1 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/msb/impl/MsbMgmrImpl.java @@ -57,6 +57,8 @@ public class MsbMgmrImpl implements IMsbMgmr { 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(); -- cgit 1.2.3-korg