Add unit test cases

[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 50339e4..889ea0a 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
@@ -67,7 +67,7 @@ public class Cbam2DriverResponseConverter {
                jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_START);
 
                jobDbManager.insert(jobInfo);
-               VnfmJobExecutionInfo jobInfo1 = (VnfmJobExecutionInfo) jobDbManager.findNewestJobInfo();
+               VnfmJobExecutionInfo jobInfo1 = jobDbManager.findNewestJobInfo();
                Long jobId = jobInfo1.getJobId();
                TerminateVnfResponse response = new TerminateVnfResponse();
                response.setJobId(jobId.longValue() + "");
@@ -126,8 +126,17 @@ public class Cbam2DriverResponseConverter {
        }
 
        public HealVnfResponse healRspConvert(CBAMHealVnfResponse cbamResponse) {
+               VnfmJobExecutionInfo jobInfo = new VnfmJobExecutionInfo();
+               jobInfo.setVnfInstanceId(cbamResponse.getId());
+               jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_START);
+               jobInfo.setVnfmInterfceName(CommonConstants.NSLCM_OPERATION_HEAL);
+               
+               jobDbManager.insert(jobInfo);
+               VnfmJobExecutionInfo jobInfo1 = jobDbManager.findNewestJobInfo();
+               Long jobId = jobInfo1.getJobId();
+               
                HealVnfResponse response = new HealVnfResponse();
-               response.setJobId("1");
+               response.setJobId(jobId.longValue() + "");
                return response;
        }
 
@@ -142,7 +151,7 @@ public class Cbam2DriverResponseConverter {
                jobInfo.setStatus(CommonConstants.CBAM_OPERATION_STATUS_START);
 
                jobDbManager.insert(jobInfo);
-               VnfmJobExecutionInfo jobInfo1 = (VnfmJobExecutionInfo) jobDbManager.findNewestJobInfo();
+               VnfmJobExecutionInfo jobInfo1 = jobDbManager.findNewestJobInfo();
                Long jobId = jobInfo1.getJobId();
                ScaleVnfResponse response = new ScaleVnfResponse();
 
@@ -180,7 +189,6 @@ public class Cbam2DriverResponseConverter {
                response.set_links(cbamResponse.get_links());
                response.setId(cbamResponse.getId());
                response.setCallbackUri(cbamResponse.getCallbackUrl());
-               response.setCallbackUrl(cbamResponse.getCallbackUrl());
                response.setFilter(cbamResponse.getFilter());
                
                return response;