Add modify vnf feature on driver

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

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java
index 29d2fc2..a6bbb19 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/VnfmDriverMgmrImpl.java
@@ -95,16 +95,24 @@ public class VnfmDriverMgmrImpl implements VnfmDriverMgmrInf{
        public InstantiateVnfResponse instantiateVnf(InstantiateVnfRequest driverRequest, String vnfmId) throws VnfmDriverException {
                InstantiateVnfResponse driverResponse;
                try {
+                       driverRequest.setVnfdId(adaptorEnv.getVnfdId());
                        buildVnfmHttpPathById(vnfmId);
                        
+//                     String dirPath = "/etc/vnfmpkg";
+//                     String cbamDirName = CommonUtil.getAppRoot() + dirPath;
+//                     File cbamDirFile = new File(cbamDirName);
+//                     String cbamPackageName = cbamDirFile.listFiles()[0].getAbsolutePath();
+//                     cbamMgmr.uploadVnfPackage(cbamPackageName);
+                       
                        //step 3: create vnf
                        CBAMCreateVnfRequest cbamRequest = requestConverter.createReqConvert(driverRequest);
                        CBAMCreateVnfResponse cbamResponse = cbamMgmr.createVnf(cbamRequest);
                        String vnfInstanceId = cbamResponse.getId();
+                       
                        Long jobId = saveCreateVnfJob(vnfInstanceId);
                        driverResponse = responseConverter.createRspConvert(cbamResponse, jobId);
                        
-                       vnfContinueProcessorInf.continueInstantiateVnf(driverRequest, vnfInstanceId, jobId.toString(), nslcmMgmr, catalogMgmr, cbamMgmr, requestConverter, jobDbManager);
+                       vnfContinueProcessorInf.continueInstantiateVnf(vnfmId, driverRequest, vnfInstanceId, jobId.toString(), nslcmMgmr, catalogMgmr, cbamMgmr, requestConverter, jobDbManager);
                        
                } catch (Exception e) {
                        logger.error("error VnfmDriverMgmrImpl --> instantiateVnf. ", e);
@@ -131,7 +139,7 @@ public class VnfmDriverMgmrImpl implements VnfmDriverMgmrInf{
                        buildVnfmHttpPathById(vnfmId);
                        driverResponse = generateTerminateVnfResponse(vnfInstanceId);
                        String jobId = driverResponse.getJobId();
-                       vnfContinueProcessorInf.continueTerminateVnf(driverRequest, vnfInstanceId, jobId, nslcmMgmr, cbamMgmr, requestConverter, jobDbManager);
+                       vnfContinueProcessorInf.continueTerminateVnf(vnfmId, driverRequest, vnfInstanceId, jobId, nslcmMgmr, cbamMgmr, requestConverter, jobDbManager);
                        
                } catch (Exception e) {
                        logger.error("error VnfmDriverMgmrImpl --> terminateVnf. ", e);
@@ -176,8 +184,9 @@ public class VnfmDriverMgmrImpl implements VnfmDriverMgmrInf{
                try {
                        buildVnfmHttpPathById(vnfmId);
                        
-                       VnfmJobExecutionInfo jobInfo = jobDbManager.findOne(Long.getLong(jobId));
+                       VnfmJobExecutionInfo jobInfo = jobDbManager.findOne(Long.parseLong(jobId));
                        String execId = jobInfo.getVnfmExecutionId();
+                       logger.info(" VnfmDriverMgmrImpl --> getOperStatus execId is " + execId);
                        cbamResponse = cbamMgmr.queryOperExecution(execId);
                } catch (Exception e) {
                        logger.error("error VnfmDriverMgmrImpl --> getOperStatus. ", e);
@@ -220,6 +229,11 @@ public class VnfmDriverMgmrImpl implements VnfmDriverMgmrInf{
        }
 
        public String buildVnfmHttpPathById(String vnfmId) throws ClientProtocolException, IOException, VnfmDriverException {
+               
+               return buildVnfmHttpPathByRealId(vnfmId);
+       }
+       
+       public String buildVnfmHttpPathByRealId(String vnfmId) throws ClientProtocolException, IOException, VnfmDriverException {
                AaiVnfmInfo vnfmInfo = aaiMgmr.queryVnfm(vnfmId);
                logger.info("vnfmInfo in AAI is {}", gson.toJson(vnfmInfo));
                if(isVnfmInfoValid(vnfmId, vnfmInfo))
@@ -229,13 +243,16 @@ public class VnfmDriverMgmrImpl implements VnfmDriverMgmrInf{
                
                EsrSystemInfo systemInfo = vnfmInfo.getEsrSystemInfoList().get(0);
                
-               String urlHead = systemInfo.getProtocal() + "://" + systemInfo.getIp() + ":" + systemInfo.getPort();
-               adaptorEnv.setCbamApiUriFront(urlHead);
+               String urlHead = systemInfo.getServiceUrl();
+//             adaptorEnv.setCbamApiUriFront(urlHead);
+//             adaptorEnv.setCbamUserName(systemInfo.getUserName());
+//             adaptorEnv.setCbamPassword(systemInfo.getPassword());
+               
                return urlHead;
        }
 
        private boolean isVnfmInfoValid(String vnfmId, AaiVnfmInfo vnfmInfo) {
-               return vnfmInfo == null || !vnfmId.equalsIgnoreCase(vnfmInfo.getVnfmId()) || vnfmInfo.getEsrSystemInfoList() == null || vnfmInfo.getEsrSystemInfoList().isEmpty();
+               return vnfmInfo == null || vnfmInfo.getEsrSystemInfoList() == null || vnfmInfo.getEsrSystemInfoList().isEmpty();
        }
 
        public void setRequestConverter(Driver2CbamRequestConverter requestConverter) {