Make code compliant with ONAP requirement

[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..e741b78 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
@@ -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() + "");
@@ -88,8 +80,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,7 +90,7 @@ public class Cbam2DriverResponseConverter {
                vnf.setVnfProvider(cbamResponse.getVnfProvider());
                vnf.setVnfStatus(cbamResponse.getInstantiationState());
                vnf.setVnfType(cbamResponse.getVnfSoftwareVersion());
-               return response;
+               return vnf;
        }
 
        public OperStatusVnfResponse operRspConvert(OperationExecution oper) {