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%2FCbam2DriverResponseConverter.java;h=3358ce599e026d8de251219d7ae0df952b5d983a;hb=2298a4397584c2c3fff8a5efe34a1ecbd3c91c62;hp=e741b78ed36df30b97478af8f75d9d657055d461;hpb=428b9b17bfe8d7448b731da77e1963daec2ba472;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/Cbam2DriverResponseConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Cbam2DriverResponseConverter.java
index e741b78e..3358ce59 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
@@ -20,12 +20,12 @@ import java.util.List;
 
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMHealVnfResponse;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMInstantiateVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMQueryVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMScaleVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMTerminateVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OperationExecution;
 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.db.bean.VnfmJobExecutionInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.db.repository.VnfmJobExecutionRepository;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfResponse;
@@ -36,7 +36,6 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.ScaleVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.TerminateVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.ResponseDescriptor;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.ResponseHistoryList;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.VnfInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
@@ -55,17 +54,6 @@ public class Cbam2DriverResponseConverter {
 		return response;
 	}
 
-	public InstantiateVnfResponse instantiateRspConvert(CBAMInstantiateVnfResponse cbamResponse) {
-		InstantiateVnfResponse response = new InstantiateVnfResponse();
-
-		VnfmJobExecutionInfo jobInfo = jobDbManager.findOne(Long.getLong(cbamResponse.getId()));
-
-		response.setJobId("1");
-
-		response.setVnfInstanceId("");
-		return response;
-	}
-
 	public TerminateVnfResponse terminateRspConvert(CBAMTerminateVnfResponse cbamResponse) {
 		VnfmJobExecutionInfo jobInfo = new VnfmJobExecutionInfo();
 		jobInfo.setVnfInstanceId(cbamResponse.getId());
@@ -100,13 +88,13 @@ public class Cbam2DriverResponseConverter {
 		response.setJobId(oper.getId());
 		ResponseDescriptor er = new ResponseDescriptor();
 		// TODO er.setProgress(i);
-		if (oper.getStatus().equals("STARTED")) {
+		if (oper.getStatus() == CommonEnum.OperationStatus.STARTED ) {
 			er.setStatus("started");
-		} else if (oper.getStatus().equals("FINISHED")) {
+		} else if (oper.getStatus() == CommonEnum.OperationStatus.FINISHED) {
 			er.setStatus("finished");
-		} else if (oper.getStatus().equals("FAILED")) {
+		} else if (oper.getStatus() == CommonEnum.OperationStatus.FAILED) {
 			er.setStatus("error");
-		} else if (oper.getStatus().equals("OTHER")) {
+		} else if (oper.getStatus() == CommonEnum.OperationStatus.OTHER) {
 			er.setStatus("processing");
 		} else {
 			er.setStatus("error");