diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor')
4 files changed, 38 insertions, 18 deletions
diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java index 3358ce59..60671ad4 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java @@ -87,30 +87,42 @@ public class Cbam2DriverResponseConverter { response.setJobId(oper.getId()); ResponseDescriptor er = new ResponseDescriptor(); - // TODO er.setProgress(i); + er.setProgress("1"); + response.setProgress("1"); + if (oper.getStatus() == CommonEnum.OperationStatus.STARTED ) { er.setStatus("started"); + response.setStatus("started"); } else if (oper.getStatus() == CommonEnum.OperationStatus.FINISHED) { er.setStatus("finished"); + response.setStatus("finished"); } else if (oper.getStatus() == CommonEnum.OperationStatus.FAILED) { er.setStatus("error"); + response.setStatus("error"); } else if (oper.getStatus() == CommonEnum.OperationStatus.OTHER) { er.setStatus("processing"); + response.setStatus("processing"); } else { er.setStatus("error"); + response.setStatus("error"); } - er.setStatusDescription(""); - er.setErrorCode(null); - er.setResponseId(oper.getGrantId().hashCode()); - List<ResponseHistoryList> list = new ArrayList<ResponseHistoryList>(); - ResponseHistoryList relist = new ResponseHistoryList(); - // TODO relist.setProgress(i); - relist.setStatus(er.getStatus()); - relist.setStatusDescription(""); - relist.setErrorCode(null); - relist.setResponseId(er.getResponseId()); - list.add(relist); - er.setResponseHistoryList(list); + er.setStatusDescription(er.getStatus()); + er.setErrorCode("1"); + er.setResponseId("1"); + + response.setStatusDescription(er.getStatus()); + response.setErrorCode("1"); + response.setResponseId("1"); + +// List<ResponseHistoryList> list = new ArrayList<ResponseHistoryList>(); +// ResponseHistoryList relist = new ResponseHistoryList(); +// // TODO relist.setProgress(i); +// relist.setStatus(er.getStatus()); +// relist.setStatusDescription(""); +// relist.setErrorCode(null); +// relist.setResponseId(er.getResponseId()); +// list.add(relist); +// er.setResponseHistoryList(list); response.setResponseDescriptor(er); return response; } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java index aebf122e..0035baff 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java @@ -71,7 +71,8 @@ public class Driver2CbamRequestConverter { public CBAMTerminateVnfRequest terminateReqConvert(TerminateVnfRequest driverRequest) { CBAMTerminateVnfRequest request = new CBAMTerminateVnfRequest(); - request.setTerminationType(driverRequest.getTerminationType()); +// request.setTerminationType(driverRequest.getTerminationType().toUpperCase()); + request.setTerminationType("GRACEFUL"); request.setGracefulTerminationTimeout(driverRequest.getGracefulTerminationTimeout()); return request; } 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 20c8bf50..3f7671f4 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 @@ -96,8 +96,10 @@ public class InstantiateVnfContinueRunnable implements Runnable { private void handleNotify(CBAMInstantiateVnfResponse cbamInstantiateResponse) { try { + logger.info("Start to notify LCM the instantiation result"); NslcmNotifyLCMEventsRequest nslcmNotifyReq = buildNslcmNotifyLCMEventsRequest(cbamInstantiateResponse); nslcmMgmr.notifyVnf(nslcmNotifyReq, vnfmId, vnfInstanceId); + logger.info("End to notify LCM the instantiation result"); } catch (Exception e) { logger.error("InstantiateVnfContinueRunnable --> handleNotify error.", e); } diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java index a6bbb19b..eacfaeeb 100644 --- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java +++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java @@ -228,14 +228,19 @@ public class VnfmDriverMgmrImpl implements VnfmDriverMgmrInf{ return driverResponse; } - public String buildVnfmHttpPathById(String vnfmId) throws ClientProtocolException, IOException, VnfmDriverException { - - return buildVnfmHttpPathByRealId(vnfmId); + public String buildVnfmHttpPathById(String vnfmId) { + String result = ""; + try { + result = buildVnfmHttpPathByRealId(vnfmId); + } catch (Exception e) { + logger.error("buildVnfmHttpPathById Error.", e); + } + return result; } public String buildVnfmHttpPathByRealId(String vnfmId) throws ClientProtocolException, IOException, VnfmDriverException { AaiVnfmInfo vnfmInfo = aaiMgmr.queryVnfm(vnfmId); - logger.info("vnfmInfo in AAI is {}", gson.toJson(vnfmInfo)); + logger.info("vnfmInfo in AAI is " + gson.toJson(vnfmInfo)); if(isVnfmInfoValid(vnfmId, vnfmInfo)) { throw new VnfmDriverException(HttpStatus.SC_INTERNAL_SERVER_ERROR, CommonConstants.HTTP_ERROR_DESC_500); |