X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=nokia%2Fvnfmdriver%2Fvfcadaptorservice%2Fvfcadaptor%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fvfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm%2Fadaptor%2FDriver2CbamRequestConverter.java;h=2e05e1aa0b3eb54cd0b032c02afa3ba4fbf96eee;hb=19b7c9420f8e53c507516682959d9d0f92788a70;hp=42c91058535a0b50f8fd60440c21e3e983c578e9;hpb=2298a4397584c2c3fff8a5efe34a1ecbd3c91c62;p=vfc%2Fnfvo%2Fdriver%2Fvnfm%2Fsvnfm.git

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 42c91058..2e05e1aa 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
@@ -32,7 +32,9 @@ import org.onap.vfc.nfvo.driver.vnfm.svnfm.cbam.bo.entity.VimInfo;
 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.VimComputeResourceFlavour;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.HealVnfRequest;
 import org.onap.vfc.nfvo.driver.vnfm.svnfm.vnfmdriver.bo.InstantiateVnfRequest;
@@ -46,7 +48,7 @@ public class Driver2CbamRequestConverter {
 	public CBAMCreateVnfRequest createReqConvert(InstantiateVnfRequest driverRequest) {
 		CBAMCreateVnfRequest request = new CBAMCreateVnfRequest();
 
-		request.setVnfdId("vnfd_001");
+		request.setVnfdId(driverRequest.getVnfDescriptorId());
 		request.setName(driverRequest.getVnfInstanceName());
 		request.setDescription(driverRequest.getVnfInstanceDescription());
 		return request;
@@ -59,15 +61,21 @@ public class Driver2CbamRequestConverter {
 		VimInfo vim = new VimInfo();
 		EndpointInfo inter = new EndpointInfo();
 		OpenstackV3Info openstackV3 = new OpenstackV3Info();
-		
-		vim.setId(nslc.getVim().getVimId());
-		openstackV3.setId(nslc.getVim().getVimId());
-		inter.setEndpoint(nslc.getVim().getInterfaceEndpoint());
+		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);
 		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);
+		}
+		
 		vims.add(vim);
 		List<ExtVirtualLinkData> list = new ArrayList<ExtVirtualLinkData>();
 		ExtVirtualLinkData ext = new ExtVirtualLinkData();