1 files changed, 6 insertions, 2 deletions
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 37348420..2995c140 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
@@ -73,11 +73,12 @@ public class TerminateVnfContinueRunnable implements Runnable {
 			
 			CBAMTerminateVnfRequest cbamRequest = requestConverter.terminateReqConvert(driverRequest);
 			CBAMTerminateVnfResponse cbamResponse = cbamMgmr.terminateVnf(cbamRequest, vnfInstanceId);
-			handleCbamInstantiateResponse(cbamResponse, jobId);
+			handleCbamTerminateResponse(cbamResponse, jobId);
 			
 			cbamMgmr.deleteVnf(vnfInstanceId);
 			
 			NslcmNotifyLCMEventsRequest nslcmNotifyReq = buildNslcmNotifyLCMEventsRequest(cbamResponse);
+			
 			nslcmMgmr.notifyVnf(nslcmNotifyReq, vnfInstanceId);
 			
 		} catch (ClientProtocolException e) {
@@ -88,10 +89,13 @@ public class TerminateVnfContinueRunnable implements Runnable {
 		
 	}
 	
-	private void handleCbamInstantiateResponse(CBAMTerminateVnfResponse cbamResponse, String jobId) {
+	private void handleCbamTerminateResponse(CBAMTerminateVnfResponse cbamResponse, String jobId) {
 		VnfmJobExecutionInfo jobInfo = jobDbMgmr.findOne(Long.getLong(jobId));
 		
 		jobInfo.setVnfmExecutionId(cbamResponse.getId());
+		if(CommonEnum.OperationStatus.FAILED ==cbamResponse.getStatus()) {
+			jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_ERROR);
+		}
 		jobDbMgmr.save(jobInfo);
 	}