Update get operation status part

[vfc/nfvo/driver/vnfm/svnfm.git] / nokia / vnfmdriver / vfcadaptorservice / vfcadaptor / src / main / java / org / onap / vfc / nfvo / driver / vnfm / svnfm / adaptor / Cbam2DriverResponseConverter.java

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 33d34d0..7bb18ef 100644 (file)
--- 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,13 @@ 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.cbam.bo.entity.OperationExecution.OperationType;
 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 +37,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;
 
@@ -46,15 +46,7 @@ public class Cbam2DriverResponseConverter {
        @Autowired
        private VnfmJobExecutionRepository jobDbManager;
 
-       public InstantiateVnfResponse createRspConvert(CBAMCreateVnfResponse cbamResponse) {
-
-               VnfmJobExecutionInfo jobInfo = new VnfmJobExecutionInfo();
-               jobInfo.setVnfInstanceId(cbamResponse.getId());
-               jobInfo.setVnfmInterfceName(CommonConstants.NSLCM_OPERATION_INSTANTIATE);
-               jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_START);
-
-               VnfmJobExecutionInfo jobInfo1 = (VnfmJobExecutionInfo) jobDbManager.save(jobInfo);
-               Long jobId = jobInfo1.getJobId();
+       public InstantiateVnfResponse createRspConvert(CBAMCreateVnfResponse cbamResponse, Long jobId) {
 
                InstantiateVnfResponse response = new InstantiateVnfResponse();
                response.setJobId(jobId.longValue() + "");
@@ -63,17 +55,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());
@@ -88,8 +69,7 @@ public class Cbam2DriverResponseConverter {
        }
 
        public QueryVnfResponse queryRspConvert(CBAMQueryVnfResponse cbamResponse) {
-               QueryVnfResponse response = new QueryVnfResponse();
-               VnfInfo vnf = new VnfInfo();
+               QueryVnfResponse vnf = new QueryVnfResponse();
                vnf.setVnfdId(cbamResponse.getVnfdId());
                vnf.setVersion(cbamResponse.getVnfdVersion());
                vnf.setVnfInstanceId(cbamResponse.getId());
@@ -99,39 +79,56 @@ public class Cbam2DriverResponseConverter {
                vnf.setVnfProvider(cbamResponse.getVnfProvider());
                vnf.setVnfStatus(cbamResponse.getInstantiationState());
                vnf.setVnfType(cbamResponse.getVnfSoftwareVersion());
-               return response;
+               return vnf;
        }
 
        public OperStatusVnfResponse operRspConvert(OperationExecution oper) {
 
                OperStatusVnfResponse response = new OperStatusVnfResponse();
 
-               response.setJobId(oper.getId());
                ResponseDescriptor er = new ResponseDescriptor();
-               // TODO er.setProgress(i);
-               if (oper.getStatus().equals("STARTED")) {
+               if (oper.getStatus() == CommonEnum.OperationStatus.STARTED ) {
+                       er.setStatusDescription("Vim is processing");
                        er.setStatus("started");
-               } else if (oper.getStatus().equals("FINISHED")) {
+                       int progress;
+                       if(OperationType.INSTANTIATE == oper.getOperationType())
+                       {
+                               progress = OperateTaskProgress.getInstantiateProgress();
+                       } else {
+                               progress = OperateTaskProgress.getTerminateProgress();
+                       }
+                       
+                       er.setProgress("" + progress);
+                       er.setResponseId("" +  + progress);
+               } else if (oper.getStatus() == CommonEnum.OperationStatus.FINISHED) {
                        er.setStatus("finished");
-               } else if (oper.getStatus().equals("FAILED")) {
-                       er.setStatus("error");
-               } else if (oper.getStatus().equals("OTHER")) {
+                       er.setProgress("100");
+                       er.setResponseId("100");
+                       
+               }  else if (oper.getStatus() == CommonEnum.OperationStatus.OTHER) {
                        er.setStatus("processing");
+                       er.setStatusDescription("Vim is processing");
+                       
+                       int progress;
+                       if(OperationType.INSTANTIATE == oper.getOperationType())
+                       {
+                               progress = OperateTaskProgress.getInstantiateProgress();
+                       } else {
+                               progress = OperateTaskProgress.getTerminateProgress();
+                       }
+                       
+                       er.setProgress("" + progress);
+                       er.setResponseId("" +  + progress);
+                       
                } else {
-                       er.setStatus("error");
+                       er.setStatus("error"); 
+                       er.setStatus("finished");
+                       er.setProgress("100");
+                       er.setResponseId("100");
                }
-               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.setErrorCode("null");
+
                response.setResponseDescriptor(er);
                return response;
        }