diff options
Diffstat (limited to 'nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java')
| -rw-r--r-- | nokia/vnfmdriver/vfcadaptorservice/vfcadaptor/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/adaptor/Driver2CbamRequestConverter.java | 159 |
1 files changed, 27 insertions, 132 deletions
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 55448096..aebf122e 100644 --- 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,27 +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.OpenStackAccessInfoV2; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OpenStackAccessInfoV3; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OpenstackV2Info; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OpenstackV3Info; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.OtherVimInfo; -import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VCloudAccessInfo; -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.VmwareVcloudInfo; -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; @@ -46,134 +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(driverRequest.getVnfDescriptorId()); + 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(); + 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); - List<VimInfo> vims = new ArrayList<VimInfo>(); - VimInfo vim = new VimInfo(); - EndpointInfo inter = new EndpointInfo(); - List<ExtVirtualLinkData> list = new ArrayList<ExtVirtualLinkData>(); - ExtVirtualLinkData ext = new ExtVirtualLinkData(); - List<VnfExtCpData> cps = new ArrayList<VnfExtCpData>(); - VnfExtCpData cp = new VnfExtCpData(); - OpenStackAccessInfoV3 v3 = new OpenStackAccessInfoV3(); - OpenStackAccessInfoV2 v2 = new OpenStackAccessInfoV2(); - VCloudAccessInfo vcloudInfo = new VCloudAccessInfo(); - if(vim.getVimInfoType().equals(VimInfoType.OPENSTACK_V2_INFO)) { - OpenstackV2Info openstackV2=new OpenstackV2Info(); - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.ExtVirtualLinkData> link=driverRequest.getExtVirtualLink(); - for(int i=0;i<link.size();i++) { - vim.setId(link.get(i).getVim().getVimId()); - inter.setEndpoint(link.get(i).getVim().getInterfaceEndpoint()); - openstackV2.setId(link.get(i).getVim().getVimId()); - openstackV2.setInterfaceInfo(inter); - - ext.setResourceId(link.get(i).getNetworkId());// todo resourceId - - cp.setCpdId(link.get(i).getCpdId()); - cps.add(cp); - ext.setExtCps(cps); - - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.AccessInfo> accessInfo=link.get(i).getVim().getAccessInfo(); - for(int j=0;j<=accessInfo.size();j++) { - v2.setUsername(accessInfo.get(j).getUsername()); - v2.setPassword(accessInfo.get(j).getPassword()); - v2.setTenant(accessInfo.get(j).getTenant()); - //todo region - } - openstackV2.setAccessInfo(v2); - vims.add(vim); - list.add(ext); - } - }else if(vim.getVimInfoType().equals(VimInfoType.OPENSTACK_V3_INFO)) { - OpenstackV3Info openstackV3=new OpenstackV3Info(); - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.ExtVirtualLinkData> link=driverRequest.getExtVirtualLink(); - for(int i=0;i<link.size();i++) { - vim.setId(link.get(i).getVim().getVimId()); - inter.setEndpoint(link.get(i).getVim().getInterfaceEndpoint()); - openstackV3.setId(link.get(i).getVim().getVimId()); - openstackV3.setInterfaceInfo(inter); - - ext.setResourceId(link.get(i).getNetworkId());// todo resourceId - - cp.setCpdId(link.get(i).getCpdId()); - cps.add(cp); - ext.setExtCps(cps); - - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.AccessInfo> accessInfo=link.get(i).getVim().getAccessInfo(); - for(int j=0;j<=accessInfo.size();j++) { - v3.setUsername(accessInfo.get(j).getUsername()); - v3.setPassword(accessInfo.get(j).getPassword()); - //todo region project domain - } - openstackV3.setAccessInfo(v3); - vims.add(vim); - list.add(ext); - } - - }else if(vim.getVimInfoType().equals(VimInfoType.OTHER_VIM_INFO)) { - OtherVimInfo other=new OtherVimInfo(); - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.ExtVirtualLinkData> link=driverRequest.getExtVirtualLink(); - for(int i=0;i<link.size();i++) { - vim.setId(link.get(i).getVim().getVimId()); - inter.setEndpoint(link.get(i).getVim().getInterfaceEndpoint()); - other.setId(link.get(i).getVim().getVimId()); - - ext.setResourceId(link.get(i).getNetworkId());// todo resourceId - - cp.setCpdId(link.get(i).getCpdId()); - cps.add(cp); - ext.setExtCps(cps); - vims.add(vim); - list.add(ext); - } - - }else if(vim.getVimInfoType().equals(VimInfoType.VMWARE_VCLOUD_INFO)) { - VmwareVcloudInfo vcloud=new VmwareVcloudInfo(); - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.ExtVirtualLinkData> link=driverRequest.getExtVirtualLink(); - for(int i=0;i<link.size();i++) { - vim.setId(link.get(i).getVim().getVimId()); - inter.setEndpoint(link.get(i).getVim().getInterfaceEndpoint()); - vcloud.setId(link.get(i).getVim().getVimId()); - vcloud.setInterfaceInfo(inter); - - ext.setResourceId(link.get(i).getNetworkId());// todo resourceId - - cp.setCpdId(link.get(i).getCpdId()); - cps.add(cp); - ext.setExtCps(cps); - - - List<org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.entity.AccessInfo> accessInfo=link.get(i).getVim().getAccessInfo(); - for(int j=0;j<=accessInfo.size();j++) { - vcloudInfo.setUsername(accessInfo.get(j).getUsername()); - vcloudInfo.setPassword(accessInfo.get(j).getPassword()); - } - vcloud.setAccessInfo(vcloudInfo); - vims.add(vim); - list.add(ext); - } - - } - request.setFlavourId(driverRequest.getFlavourId()); - request.setVims(vims); - request.setExtVirtualLinks(list); 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()); @@ -190,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()); |