X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FVimManagerUtil.java;fp=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FVimManagerUtil.java;h=de10ac1765d47653d9ee58ea8d84d1bcb9e75cb6;hb=f30cb941059edc86f8b8effaa261774e87395e44;hp=9952fadcc2beccc8d9917f19ec4880d580dadcc1;hpb=48df9cda482edd36130777549ac42ee88f048af3;p=aai%2Fesr-server.git diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java index 9952fad..de10ac1 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/VimManagerUtil.java @@ -16,6 +16,8 @@ package org.onap.aai.esr.util; +import java.util.ArrayList; + import org.onap.aai.esr.common.SystemStatus; import org.onap.aai.esr.common.SystemType; import org.onap.aai.esr.entity.aai.EsrSystemInfo; @@ -41,14 +43,16 @@ public class VimManagerUtil { cloudRegion.setOwnerDefinedType(vimRegisterInfo.getOwnerDefinedType()); cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo()); - esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfo()); + esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos()); esrSystemInfoList = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj); cloudRegion.setEsrSystemInfoList(esrSystemInfoList); return cloudRegion; } - private static EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(VimAuthInfo vimAuthInfo) { + private static EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList vimAuthInfos) { EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo(); + VimAuthInfo vimAuthInfo = new VimAuthInfo(); + vimAuthInfo = vimAuthInfos.get(0); esrSystemInfoObj.setCloudDomain(vimAuthInfo.getCloudDomain()); esrSystemInfoObj.setUserName(vimAuthInfo.getUserName()); esrSystemInfoObj.setPassword(vimAuthInfo.getPassword()); @@ -75,8 +79,10 @@ public class VimManagerUtil { public static VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) { VimRegisterInfo vimRegisterInfo = new VimRegisterInfo(); VimAuthInfo vimAuthInfo = new VimAuthInfo(); + ArrayList vimAuthInfos = new ArrayList(); vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0)); - vimRegisterInfo.setVimAuthInfo(vimAuthInfo); + vimAuthInfos.add(vimAuthInfo); + vimRegisterInfo.setVimAuthInfos(vimAuthInfos); vimRegisterInfo.setCloudExtraInfo(cloudRegion.getCloudExtraInfo()); vimRegisterInfo.setCloudOwner(cloudRegion.getCloudOwner()); vimRegisterInfo.setCloudRegionId(cloudRegion.getCloudRegionId());