modify msb register part

[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 a6dcc0a..28400ed 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,21 +26,21 @@ 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;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.AccessInfo;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.GrantInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.NslcmVimInfo;
+import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimAssets;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.nslcm.bo.entity.VimComputeResourceFlavour;
-
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
 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;
 
 @Component
@@ -60,21 +60,23 @@ 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();
-               
-               vim.setId(nslc.getVim().getVimId());
-               openstackV3.setId(nslc.getVim().getVimId());
-               inter.setEndpoint(nslc.getVim().getInterfaceEndpoint());
+               OpenstackV3Info openstackV3 = new OpenstackV3Info();
+               List<NslcmVimInfo>  nslcmVim=nslc.getVim();
+               for(int i=0;i<=nslcmVim.size();i++) {
+               vim.setId(nslcmVim.get(i).getVimInfoId());
+               openstackV3.setId(nslcmVim.get(i).getVimId());
+               inter.setEndpoint(nslcmVim.get(i).getInterfaceEndpoint());
                openstackV3.setInterfaceInfo(inter);
-               openstackV3.setVimInfoType(type);
                OpenStackAccessInfoV3 v3 = new OpenStackAccessInfoV3();
-               v3.setUsername(nslc.getVim().getAccessInfo().getUsername());
-               v3.setPassword(nslc.getVim().getAccessInfo().getPassword());
+               List<AccessInfo> accessInfo=nslcmVim.get(i).getAccessInfo();
+               for(int j=0;j<=accessInfo.size();j++) {
+               v3.setUsername(accessInfo.get(j).getUsername());
+               v3.setPassword(accessInfo.get(j).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();