private static VimManagerUtil vimManagerUtil = new VimManagerUtil();
private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy();
+
+ private static VimManagerProxy vimManagerProxy = new VimManagerProxy();
private static ExtsysUtil extsysUtil = new ExtsysUtil();
*/
public static VimManagerWrapper getInstance() {
if (vimManagerWrapper == null) {
- vimManagerWrapper = new VimManagerWrapper(cloudRegionProxy);
+ vimManagerWrapper = new VimManagerWrapper(cloudRegionProxy, vimManagerProxy);
}
return vimManagerWrapper;
}
- public VimManagerWrapper(CloudRegionProxy cloudRegionProxy) {
+ public VimManagerWrapper(CloudRegionProxy cloudRegionProxy, VimManagerProxy vimManagerProxy) {
VimManagerWrapper.cloudRegionProxy = cloudRegionProxy;
+ VimManagerWrapper.vimManagerProxy = vimManagerProxy;
}
public Response registerVim(VimRegisterInfo vimRegisterInfo) {
Tenant tenant = new Tenant();
tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant());
try {
- VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
+ vimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant);
} catch (ExtsysException e) {
LOG.error("Update VIM by Multi-cloud failed !", e);
}
private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) {
String cloudOwner = vimRegisterInfo.getCloudOwner();
String cloudRegionId = vimRegisterInfo.getCloudRegionId();
+ String resourceVersion = null;
+ CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
CloudRegionDetail originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId);
- String resourceVersion = originalCloudRegionDetail.getResourceVersion();
- CloudRegionDetail cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
- if (resourceVersion != null) {
- cloudRegionDetail.setResourceVersion(resourceVersion);
- EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
- cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
- .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());
- cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
- .setResouceVersion(originalSystemInfo.getResouceVersion());
+ if (originalCloudRegionDetail != null) {
+ resourceVersion = originalCloudRegionDetail.getResourceVersion();
+ cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo);
+ if (resourceVersion != null) {
+ cloudRegionDetail.setResourceVersion(resourceVersion);
+ EsrSystemInfo originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+ cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+ .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId());
+ cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+ .setResouceVersion(originalSystemInfo.getResouceVersion());
+ }
}
return cloudRegionDetail;
}