Modify POM parent oparent version as 0.1.1

[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..42c9105 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
@@ -26,10 +26,9 @@ 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.OpenstackV3Info;
 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.nslcm.bo.NslcmGrantVnfResponse;
@@ -58,21 +57,17 @@ public class Driver2CbamRequestConverter {
                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();
+               OpenstackV3Info openstackV3 = new OpenstackV3Info();
                
                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();