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 / Driver2CbamRequestConverter.java

diff --git a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
index 5b9f95f..aebf122 100644 (file)
--- a/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
+++ b/nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java
@@ -16,22 +16,20 @@
 
 package org.onap.vfc.nfvo.driver.vnfm.svnfm.adaptor;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.io.BufferedInputStream;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
 
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMCreateVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMHealVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMInstantiateVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMScaleVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.CBAMTerminateVnfRequest;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.EndpointInfo;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.ExtVirtualLinkData;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OPENSTACK_V3_INFO;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OpenStackAccessInfoV3;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfo;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfoType;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VnfExtCpData;
-import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.CommonEnum;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.common.util.CommonUtil;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.ScaleDirection;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.constant.ScaleType;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.NslcmGrantVnfResponse;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.GrantInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimComputeResourceFlavour;
@@ -41,55 +39,36 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.ScaleVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.TerminateVnfRequest;
 import org.springframework.stereotype.Component;
 
+import com.google.gson.Gson;
+
 @Component
 public class Driver2CbamRequestConverter {
-       
+
        public CBAMCreateVnfRequest createReqConvert(InstantiateVnfRequest driverRequest) {
                CBAMCreateVnfRequest request = new CBAMCreateVnfRequest();
 
-               request.setVnfdId("vnfd_001");
+               request.setVnfdId(driverRequest.getVnfdId());
                request.setName(driverRequest.getVnfInstanceName());
                request.setDescription(driverRequest.getVnfInstanceDescription());
                return request;
        }
 
-       public CBAMInstantiateVnfRequest InstantiateReqConvert(InstantiateVnfRequest driverRequest,
-                       NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) {
-               CBAMInstantiateVnfRequest request = new CBAMInstantiateVnfRequest();
-               List<VimInfo> vims = new ArrayList<VimInfo>();
-               VimInfo vim = new VimInfo();
-               VimInfoType type = new VimInfoType();
-               EndpointInfo inter = new EndpointInfo();
-               OPENSTACK_V3_INFO openstackV3 = new OPENSTACK_V3_INFO();
+       public CBAMInstantiateVnfRequest instantiateRequestConvert(InstantiateVnfRequest driverRequest,
+                       NslcmGrantVnfResponse nslc, GrantInfo grant, VimComputeResourceFlavour vimco) throws Exception {
+        Gson gson = new Gson();
+               String inputJson = readcbamInputInfoFromJsonFile();
+               CBAMInstantiateVnfRequest request = gson.fromJson(inputJson, CBAMInstantiateVnfRequest.class);
                
-               vim.setId(nslc.getVim().getVimId());
-               openstackV3.setId(nslc.getVim().getVimId());
-               inter.setEndpoint(nslc.getVim().getInterfaceEndpoint());
-               openstackV3.setInterfaceInfo(inter);
-               openstackV3.setVimInfoType(type);
-               OpenStackAccessInfoV3 v3 = new OpenStackAccessInfoV3();
-               v3.setUsername(nslc.getVim().getAccessInfo().getUsername());
-               v3.setPassword(nslc.getVim().getAccessInfo().getPassword());
-               openstackV3.setAccessInfo(v3);
-               type.setOPENSTACK_V3_INFO(openstackV3);
-               vim.setVimInfoType(type);
-               vims.add(vim);
-               List<ExtVirtualLinkData> list = new ArrayList<ExtVirtualLinkData>();
-               ExtVirtualLinkData ext = new ExtVirtualLinkData();
-
-               ext.setResourceId(grant.getResourceDefinitionId());
-               ext.setVimId(grant.getVimId());
-               List<VnfExtCpData> cps = new ArrayList<VnfExtCpData>();
-               VnfExtCpData cp = new VnfExtCpData();
-               cp.setCpdId(vimco.getVduId());
-               ext.setExtCps(cps);
-               request.setVims(vims);
-               request.setFlavourId(driverRequest.getFlavourId());
-               request.setExtVirtualLinks(list);
-               // resquest.setVnfInstanceId(driverRequest.getExtVirtualLink().get(0).getVlInstanceId());
                return request;
        }
 
+       private String readcbamInputInfoFromJsonFile() throws IOException {
+               String filePath = "/etc/vnfpkginfo/cbam_input.json";
+               String fileContent = CommonUtil.getJsonStrFromFile(filePath);
+
+               return fileContent;
+       }
+
        public CBAMTerminateVnfRequest terminateReqConvert(TerminateVnfRequest driverRequest) {
                CBAMTerminateVnfRequest request = new CBAMTerminateVnfRequest();
                request.setTerminationType(driverRequest.getTerminationType());
@@ -106,10 +85,10 @@ public class Driver2CbamRequestConverter {
 
        public CBAMScaleVnfRequest scaleReqconvert(ScaleVnfRequest driverRequest) {
                CBAMScaleVnfRequest request = new CBAMScaleVnfRequest();
-               if (driverRequest.getType().equals("SCALE_OUT")) {
-                       request.setType(CommonEnum.ScaleDirection.OUT);
+               if (driverRequest.getType().equals(ScaleType.SCALE_OUT)) {
+                       request.setType(ScaleDirection.OUT);
                } else {
-                       request.setType(CommonEnum.ScaleDirection.IN);
+                       request.setType(ScaleDirection.IN);
                }
                request.setAspectId(driverRequest.getAspectId());
                request.setNumberOfSteps(driverRequest.getNumberOfSteps());