X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Fadaptor%2FTerminateVnfContinueRunnable.java;h=4485ad18e5ae63bac8962bc31a56c9d95e1103e0;hb=358611bc1303a4e114ea862a3437947fc2f5caf6;hp=ba7663d9cf60eac59ee289c9bfdde530e2169a97;hpb=47fd33356d8ae5d709fdb1759a3fcfdb3a8c06a2;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

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 ba7663d9..4485ad18 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
@@ -21,14 +21,15 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.http.client.ClientProtocolException;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMTerminateVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMTerminateVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.inf.CbamMgmrInf;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonConstants;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum.LifecycleOperation;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.bean.VnfmJobExecutionInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.repository.VnfmJobExecutionRepository;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfResponse;
@@ -40,7 +41,7 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.TerminateVnfRequest;
 
 
 public class TerminateVnfContinueRunnable implements Runnable {
-	private static final Logger logger = LogManager.getLogger("TerminateVnfContinueRunnable");
+	private static final Logger logger = LoggerFactory.getLogger(TerminateVnfContinueRunnable.class);
 
 	private CbamMgmrInf cbamMgmr;
 	private NslcmMgmrInf nslcmMgmr;
@@ -48,7 +49,7 @@ public class TerminateVnfContinueRunnable implements Runnable {
 	private TerminateVnfRequest driverRequest;
 	private String vnfInstanceId;
 	private String jobId;
-	private VnfmJobExecutionRepository jobDbManager;
+	private VnfmJobExecutionRepository jobDbMgmr;
 	
 	private Driver2CbamRequestConverter requestConverter;
 	
@@ -61,7 +62,7 @@ public class TerminateVnfContinueRunnable implements Runnable {
 		this.cbamMgmr = cbamMgmr;
 		this.requestConverter = requestConverter;
 		this.jobId = jobId;
-		this.jobDbManager = dbManager;
+		this.jobDbMgmr = dbManager;
 	}
 	
 	public void run() {
@@ -72,6 +73,7 @@ public class TerminateVnfContinueRunnable implements Runnable {
 			
 			CBAMTerminateVnfRequest cbamRequest = requestConverter.terminateReqConvert(driverRequest);
 			CBAMTerminateVnfResponse cbamResponse = cbamMgmr.terminateVnf(cbamRequest, vnfInstanceId);
+			handleCbamInstantiateResponse(cbamResponse, jobId);
 			
 			cbamMgmr.deleteVnf(vnfInstanceId);
 			
@@ -86,6 +88,13 @@ public class TerminateVnfContinueRunnable implements Runnable {
 		
 	}
 	
+	private void handleCbamInstantiateResponse(CBAMTerminateVnfResponse cbamResponse, String jobId) {
+		VnfmJobExecutionInfo jobInfo = jobDbMgmr.findOne(Long.getLong(jobId));
+		
+		jobInfo.setVnfmExecutionId(cbamResponse.getId());
+		jobDbMgmr.save(jobInfo);
+	}
+	
 	private NslcmGrantVnfRequest buildNslcmGrantVnfRequest() {
 		NslcmGrantVnfRequest request = new NslcmGrantVnfRequest();