*/
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.AuthInfo;
-import org.onap.aai.esr.entity.aai.CloudRegion;
import org.onap.aai.esr.entity.aai.EsrSystemInfo;
+import org.onap.aai.esr.entity.aai.CloudRegionDetail;
import org.onap.aai.esr.entity.aai.EsrSystemInfoList;
import org.onap.aai.esr.entity.rest.VimAuthInfo;
import org.onap.aai.esr.entity.rest.VimRegisterInfo;
-
public class VimManagerUtil {
+ private static ExtsysUtil extsysUtil = new ExtsysUtil();
- public static CloudRegion vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
- CloudRegion cloudRegion = new CloudRegion();
- EsrSystemInfoList esrSystemInfo = new EsrSystemInfoList();
- AuthInfo authInfo = new AuthInfo();
+ public CloudRegionDetail vimRegisterInfo2CloudRegion(VimRegisterInfo vimRegisterInfo) {
+ CloudRegionDetail cloudRegion = new CloudRegionDetail();
+ EsrSystemInfoList esrSystemInfoList = new EsrSystemInfoList();
+ EsrSystemInfo esrSystemInfoObj = new EsrSystemInfo();
cloudRegion.setCloudOwner(vimRegisterInfo.getCloudOwner());
cloudRegion.setCloudRegionId(vimRegisterInfo.getCloudRegionId());
cloudRegion.setOwnerDefinedType(vimRegisterInfo.getOwnerDefinedType());
cloudRegion.setCloudExtraInfo(vimRegisterInfo.getCloudExtraInfo());
- authInfo = vimAuthInfo2AuthInfo(vimRegisterInfo.getVimAuthInfo());
- esrSystemInfo = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo);
- cloudRegion.setEsrSystemInfoList(esrSystemInfo);
+ esrSystemInfoObj = vimAuthInfo2EsrSystemInfoObj(vimRegisterInfo.getVimAuthInfos());
+ esrSystemInfoObj.setSystemStatus(vimRegisterInfo.getStatus());
+ esrSystemInfoList = extsysUtil.getEsrSystemInfoListFromAuthInfo(esrSystemInfoObj);
+ cloudRegion.setEsrSystemInfoList(esrSystemInfoList);
return cloudRegion;
}
- private static AuthInfo vimAuthInfo2AuthInfo(VimAuthInfo vimAuthInfo) {
- AuthInfo authInfo = new AuthInfo();
- authInfo.setCloudDomain(vimAuthInfo.getCloudDomain());
- authInfo.setUserName(vimAuthInfo.getUserName());
- authInfo.setPassword(vimAuthInfo.getPassword());
- authInfo.setServiceUrl(vimAuthInfo.getAuthUrl());
- authInfo.setSslCassert(vimAuthInfo.getSslCacert());
- authInfo.setSslInsecure(vimAuthInfo.getSslInsecure());
- authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
- authInfo.setSystemType(SystemType.VIM.toString());
- authInfo.setSystemStatus(SystemStatus.normal.toString());
- return authInfo;
+ private EsrSystemInfo vimAuthInfo2EsrSystemInfoObj(ArrayList<VimAuthInfo> 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());
+ esrSystemInfoObj.setServiceUrl(vimAuthInfo.getAuthUrl());
+ esrSystemInfoObj.setSslCassert(vimAuthInfo.getSslCacert());
+ esrSystemInfoObj.setSslInsecure(vimAuthInfo.getSslInsecure());
+ esrSystemInfoObj.setEsrSystemInfoId(extsysUtil.generateId());
+ esrSystemInfoObj.setSystemType(SystemType.VIM.toString());
+// esrSystemInfoObj.setSystemStatus(SystemStatus.normal.toString());
+ return esrSystemInfoObj;
}
- private static VimAuthInfo authInfo2VimAuthInfo(AuthInfo authInfo) {
+ private VimAuthInfo authInfo2VimAuthInfo(EsrSystemInfo authInfo) {
VimAuthInfo vimAuthInfo = new VimAuthInfo();
vimAuthInfo.setAuthUrl(authInfo.getServiceUrl());
vimAuthInfo.setCloudDomain(authInfo.getCloudDomain());
return vimAuthInfo;
}
- public static VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegion cloudRegion) {
+ public VimRegisterInfo cloudRegion2VimRegisterInfo(CloudRegionDetail cloudRegion) {
VimRegisterInfo vimRegisterInfo = new VimRegisterInfo();
VimAuthInfo vimAuthInfo = new VimAuthInfo();
- vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().getEsrSystemInfo().get(0));
- vimRegisterInfo.setVimAuthInfo(vimAuthInfo);
+ ArrayList<VimAuthInfo> vimAuthInfos = new ArrayList<VimAuthInfo>();
+ if(cloudRegion.getEsrSystemInfoList()!=null){
+ vimAuthInfo = authInfo2VimAuthInfo(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0));
+ vimRegisterInfo.setStatus(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getSystemStatus());
+ }
+ vimAuthInfos.add(vimAuthInfo);
+ vimRegisterInfo.setVimAuthInfos(vimAuthInfos);
vimRegisterInfo.setCloudExtraInfo(cloudRegion.getCloudExtraInfo());
vimRegisterInfo.setCloudOwner(cloudRegion.getCloudOwner());
vimRegisterInfo.setCloudRegionId(cloudRegion.getCloudRegionId());
vimRegisterInfo.setCloudType(cloudRegion.getCloudType());
vimRegisterInfo.setCloudZone(cloudRegion.getCloudZone());
vimRegisterInfo.setComplexName(cloudRegion.getComplexName());
+ vimRegisterInfo.setCloudRegionVersion(cloudRegion.getCloudRegionVersion());
vimRegisterInfo.setOwnerDefinedType(cloudRegion.getOwnerDefinedType());
return vimRegisterInfo;
}