X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fesr-server.git;a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVimManagerWrapper.java;h=e34217dc405be586ae5e47747d75f0dde099a5b5;hp=fa52166420ea0f1fc43206ca91405cf5eccf5c53;hb=ed26992f976741031237ead3a5dc0565d4318b05;hpb=f73ad41f58f1f60d00d42a8bc5fc2502a46d62dd diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java index fa52166..e34217d 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VimManagerWrapper.java @@ -17,9 +17,7 @@ package org.onap.aai.esr.wrapper; import java.util.ArrayList; import java.util.List; - import javax.ws.rs.core.Response; - import org.onap.aai.esr.entity.aai.CloudRegionDetail; import org.onap.aai.esr.entity.aai.CloudRegionList; import org.onap.aai.esr.entity.aai.EsrSystemInfo; @@ -34,190 +32,190 @@ import org.onap.aai.esr.util.ExtsysUtil; import org.onap.aai.esr.util.VimManagerUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - import com.google.gson.Gson; public class VimManagerWrapper { - private static VimManagerWrapper vimManagerWrapper; - private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class); - - private static VimManagerUtil vimManagerUtil = new VimManagerUtil(); - - private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy(); - - private static ExtsysUtil extsysUtil = new ExtsysUtil(); - - /** - * get VimManagerWrapper instance. - * - * @return vim manager wrapper instance - */ - public static VimManagerWrapper getInstance() { - if (vimManagerWrapper == null) { - vimManagerWrapper = new VimManagerWrapper(); + private static VimManagerWrapper vimManagerWrapper; + private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class); + + private static VimManagerUtil vimManagerUtil = new VimManagerUtil(); + + private static CloudRegionProxy cloudRegionProxy = new CloudRegionProxy(); + + private static ExtsysUtil extsysUtil = new ExtsysUtil(); + + /** + * get VimManagerWrapper instance. + * + * @return vim manager wrapper instance + */ + public static VimManagerWrapper getInstance() { + if (vimManagerWrapper == null) { + vimManagerWrapper = new VimManagerWrapper(); + } + return vimManagerWrapper; + } - return vimManagerWrapper; - - } - - public Response registerVim(VimRegisterInfo vimRegisterInfo) { - LOG.info( - "Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo)); - CloudRegionDetail cloudRegion = new CloudRegionDetail(); - VimRegisterResponse result = new VimRegisterResponse(); - cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); - String cloudOwner = vimRegisterInfo.getCloudOwner(); - String cloudRegionId = vimRegisterInfo.getCloudRegionId(); - try { - cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion); - result.setCloudOwner(cloudOwner); - result.setCloudRegionId(cloudRegionId); - Tenant tenant = new Tenant(); - tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant()); - try { - VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant); - } catch (ExtsysException e) { - LOG.error("Update VIM by Multi-cloud failed !", e); - } - return Response.ok(result).build(); - } catch (ExtsysException error) { - LOG.error("Register VIM failed !", error); - throw ExceptionUtil.buildExceptionResponse(error.getMessage()); + + public Response registerVim(VimRegisterInfo vimRegisterInfo) { + LOG.info("Start register VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo)); + CloudRegionDetail cloudRegion = new CloudRegionDetail(); + VimRegisterResponse result = new VimRegisterResponse(); + cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); + String cloudOwner = vimRegisterInfo.getCloudOwner(); + String cloudRegionId = vimRegisterInfo.getCloudRegionId(); + try { + cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion); + result.setCloudOwner(cloudOwner); + result.setCloudRegionId(cloudRegionId); + Tenant tenant = new Tenant(); + tenant.setDefaultTenant(cloudRegion.getEsrSystemInfoList().getEsrSystemInfo().get(0).getDefaultTenant()); + try { + VimManagerProxy.updateVim(cloudOwner, cloudRegionId, tenant); + } catch (ExtsysException e) { + LOG.error("Update VIM by Multi-cloud failed !", e); + } + return Response.ok(result).build(); + } catch (ExtsysException error) { + LOG.error("Register VIM failed !", error); + throw ExceptionUtil.buildExceptionResponse(error.getMessage()); + } } - } - - public Response updateVim(String cloudOwner, String cloudRegionId,VimRegisterInfo vimRegisterInfo) { - LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo)); - CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); - VimRegisterResponse result = new VimRegisterResponse(); - - cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo); - try { - cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail); - result.setCloudOwner(cloudOwner); - result.setCloudRegionId(cloudRegionId); - return Response.ok(result).build(); - } catch (ExtsysException e) { - LOG.error("Update VIM failed !", e); - throw ExceptionUtil.buildExceptionResponse(e.getMessage()); + + public Response updateVim(String cloudOwner, String cloudRegionId, VimRegisterInfo vimRegisterInfo) { + LOG.info("Start update VIM, input VIM info is: " + extsysUtil.objectToString(vimRegisterInfo)); + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); + VimRegisterResponse result = new VimRegisterResponse(); + + cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo); + try { + cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail); + result.setCloudOwner(cloudOwner); + result.setCloudRegionId(cloudRegionId); + return Response.ok(result).build(); + } catch (ExtsysException e) { + LOG.error("Update VIM failed !", e); + throw ExceptionUtil.buildExceptionResponse(e.getMessage()); + } } - } - - public Response queryVimListDetails() { - List vimRegisterInfos = new ArrayList<>(); - CloudRegionList cloudRegionList = new CloudRegionList(); - try { - String aaiVimList = cloudRegionProxy.qureyVimList(); - cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class); - vimRegisterInfos = getVimDetailList(cloudRegionList); - return Response.ok(vimRegisterInfos).build(); - } catch (ExtsysException error) { - LOG.error("Query vim list details failed !", error); - return Response.ok(vimRegisterInfos).build(); + + public Response queryVimListDetails() { + List vimRegisterInfos = new ArrayList<>(); + CloudRegionList cloudRegionList = new CloudRegionList(); + try { + String aaiVimList = cloudRegionProxy.qureyVimList(); + cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class); + vimRegisterInfos = getVimDetailList(cloudRegionList); + return Response.ok(vimRegisterInfos).build(); + } catch (ExtsysException error) { + LOG.error("Query vim list details failed !", error); + return Response.ok(vimRegisterInfos).build(); + } + } - } - - public Response queryVimById(String cloudOwner, String cloudRegionId) { - VimRegisterInfo vim = new VimRegisterInfo(); - CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); - try { - String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); - LOG.info("Response from AAI by query VIM: " + cloudRegionstr); - cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); - vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); - return Response.ok(vim).build(); - } catch (ExtsysException e) { - LOG.error("Query vim details by ID failed !", e); - return Response.ok(vim).build(); + public Response queryVimById(String cloudOwner, String cloudRegionId) { + VimRegisterInfo vim = new VimRegisterInfo(); + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); + try { + String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + LOG.info("Response from AAI by query VIM: " + cloudRegionstr); + cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); + vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); + return Response.ok(vim).build(); + } catch (ExtsysException e) { + LOG.error("Query vim details by ID failed !", e); + return Response.ok(vim).build(); + } + } - } - - private List getVimDetailList(CloudRegionList cloudRegionList) { - List vimRegisterInfos = new ArrayList<>(); - VimRegisterInfo vimRegisterInfo = new VimRegisterInfo(); - int cloudRegionNum = cloudRegionList.getCloudRegion().size(); - for (int i = 0; i < cloudRegionNum; i++) { - String cloudOwner = cloudRegionList.getCloudRegion().get(i).getCloudOwner(); - String cloudRegionId = cloudRegionList.getCloudRegion().get(i).getCloudRegionId(); - vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId); - vimRegisterInfos.add(vimRegisterInfo); + private List getVimDetailList(CloudRegionList cloudRegionList) { + List vimRegisterInfos = new ArrayList<>(); + VimRegisterInfo vimRegisterInfo = new VimRegisterInfo(); + int cloudRegionNum = cloudRegionList.getCloudRegion().size(); + for (int i = 0; i < cloudRegionNum; i++) { + String cloudOwner = cloudRegionList.getCloudRegion().get(i).getCloudOwner(); + String cloudRegionId = cloudRegionList.getCloudRegion().get(i).getCloudRegionId(); + vimRegisterInfo = getVimDetail(cloudOwner, cloudRegionId); + vimRegisterInfos.add(vimRegisterInfo); + } + return vimRegisterInfos; } - return vimRegisterInfos; - } - - private VimRegisterInfo getVimDetail(String cloudOwner, String cloudRegionId) { - CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); - VimRegisterInfo registeredVimInfo = new VimRegisterInfo(); - try { - String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); - cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); - registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); - } catch (ExtsysException error) { - LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " - + cloudRegionId, error); + + private VimRegisterInfo getVimDetail(String cloudOwner, String cloudRegionId) { + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); + VimRegisterInfo registeredVimInfo = new VimRegisterInfo(); + try { + String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); + registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); + } catch (ExtsysException error) { + LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " + cloudRegionId, + error); + } + return registeredVimInfo; } - return registeredVimInfo; - } - - private CloudRegionDetail getOriginalCloudRegion(String cloudOwner, String cloudRegionId) { - CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); - try { - String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); - cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); - return cloudRegionDetail; - } catch (ExtsysException error) { - LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " - + cloudRegionId, error); - return null; + + private CloudRegionDetail getOriginalCloudRegion(String cloudOwner, String cloudRegionId) { + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); + try { + String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); + return cloudRegionDetail; + } catch (ExtsysException error) { + LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " + cloudRegionId, + error); + return null; + } } - } - - private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) { - CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); - CloudRegionDetail originalCloudRegionDetail = new CloudRegionDetail(); - EsrSystemInfo originalSystemInfo = new EsrSystemInfo(); - String cloudOwner = vimRegisterInfo.getCloudOwner(); - String cloudRegionId = vimRegisterInfo.getCloudRegionId(); - originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId); - String resourceVersion = originalCloudRegionDetail.getResourceVersion(); - cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); - if(resourceVersion != null) { - cloudRegionDetail.setResourceVersion(resourceVersion); - originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0); - cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId()); - cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0).setResouceVersion(originalSystemInfo.getResouceVersion()); + + private CloudRegionDetail getVimUpdateInfo(VimRegisterInfo vimRegisterInfo) { + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); + CloudRegionDetail originalCloudRegionDetail = new CloudRegionDetail(); + EsrSystemInfo originalSystemInfo = new EsrSystemInfo(); + String cloudOwner = vimRegisterInfo.getCloudOwner(); + String cloudRegionId = vimRegisterInfo.getCloudRegionId(); + originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId); + String resourceVersion = originalCloudRegionDetail.getResourceVersion(); + cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); + if (resourceVersion != null) { + cloudRegionDetail.setResourceVersion(resourceVersion); + originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0); + cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) + .setEsrSystemInfoId(originalSystemInfo.getEsrSystemInfoId()); + cloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) + .setResouceVersion(originalSystemInfo.getResouceVersion()); + } + return cloudRegionDetail; } - return cloudRegionDetail; - } - - public Response delVim(String cloudOwner, String cloudRegionId) { - CloudRegionDetail cloudRegionDetail = new 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()); + + public Response delVim(String cloudOwner, String cloudRegionId) { + CloudRegionDetail cloudRegionDetail = new 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()); + } } - } - - private CloudRegionDetail queryCloudRegionDetail (String cloudOwner, String cloudRegionId) { - CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); - try { - String cloudRegionStr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); - LOG.info("Response from AAI by query cloud region: " + cloudRegionStr); - cloudRegionDetail = new Gson().fromJson(cloudRegionStr, CloudRegionDetail.class); - } catch (ExtsysException e) { - LOG.error("Query EMS detail failed! cloud-owner = " + cloudOwner - + ", cloud-region-id = " + cloudRegionId , e); - throw ExceptionUtil.buildExceptionResponse(e.getMessage()); + + private CloudRegionDetail queryCloudRegionDetail(String cloudOwner, String cloudRegionId) { + CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); + try { + String cloudRegionStr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + LOG.info("Response from AAI by query cloud region: " + cloudRegionStr); + cloudRegionDetail = new Gson().fromJson(cloudRegionStr, CloudRegionDetail.class); + } catch (ExtsysException e) { + LOG.error("Query EMS detail failed! cloud-owner = " + cloudOwner + ", cloud-region-id = " + cloudRegionId, + e); + throw ExceptionUtil.buildExceptionResponse(e.getMessage()); + } + return cloudRegionDetail; } - return cloudRegionDetail; - } }