- return cloudRegionDetail;
- }
-
- public Response delVim(String cloudOwner, String cloudRegionId) {
- CloudRegionDetail cloudRegionDetail = new CloudRegionDetail();
- cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
- String resourceVersion = cloudRegionDetail.getResourceVersion();
- if (resourceVersion != null) {
- try {
- CloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
- return Response.noContent().build();
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error(
- "Delete cloud region from A&AI failed! cloud-owner = " + cloudOwner
- + ", cloud-region-id = " + cloudRegionId + "resouce-version:" + resourceVersion,
- e.getMessage());
- return Response.serverError().build();
- }
- } else {
- LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
- return Response.serverError().build();
+
+ private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) {
+ String cloudOwner = vimRegisterInfo.getCloudOwner();
+ String cloudRegionId = vimRegisterInfo.getCloudRegionId();
+ 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());
+ }
+ return cloudRegionDetail;
+ }
+
+ public Response delVim(String cloudOwner, String cloudRegionId) {
+ CloudRegionDetail cloudRegionDetail = queryCloudRegionDetail(cloudOwner, cloudRegionId);
+ String resourceVersion = cloudRegionDetail.getResourceVersion();
+ try {
+ cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion);
+ return Response.noContent().build();
+ } catch (ExtsysException e) {
+ LOG.error("Delete cloud region from A&AI failed! cloud-owner = " + cloudOwner + ", cloud-region-id = "
+ + cloudRegionId + "resouce-version:" + resourceVersion, e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+ }