X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVimManagerWrapper.java;h=6d06a1cbd798fe2965d01149ef766d9eb125a72f;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=ec52317c5c69332bf7742d7f38aaed4b84ac65ad;hpb=f860118c135ded9f97dbc9102c5d90f828fae34b;p=aai%2Fesr-server.git 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 ec52317..6d06a1c 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 @@ -37,6 +37,7 @@ public class VimManagerWrapper { private static VimManagerWrapper vimManagerWrapper; private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class); + private static VimManagerUtil vimManagerUtil = new VimManagerUtil(); /** * get VimManagerWrapper instance. @@ -56,7 +57,7 @@ public class VimManagerWrapper { "Start register VIM, input VIM info is: " + ExtsysUtil.objectToString(vimRegisterInfo)); CloudRegionDetail cloudRegion = new CloudRegionDetail(); VimRegisterResponse result = new VimRegisterResponse(); - cloudRegion = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); + cloudRegion = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); String cloudOwner = vimRegisterInfo.getCloudOwner(); String cloudRegionId = vimRegisterInfo.getCloudRegionId(); try { @@ -112,7 +113,7 @@ public class VimManagerWrapper { 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); + vim = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); return Response.ok(vim).build(); } catch (Exception e) { e.printStackTrace(); @@ -140,7 +141,7 @@ public class VimManagerWrapper { try { String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); - registeredVimInfo = VimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); + registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); } catch (Exception error) { error.printStackTrace(); LOG.error("query VIM detail failed ! cloud-owner = " + cloudOwner + ", cloud-region-id = " @@ -171,7 +172,7 @@ public class VimManagerWrapper { String cloudRegionId = vimRegisterInfo.getCloudRegionId(); originalCloudRegionDetail = getOriginalCloudRegion(cloudOwner, cloudRegionId); String resourceVersion = originalCloudRegionDetail.getResourceVersion(); - cloudRegionDetail = VimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); + cloudRegionDetail = vimManagerUtil.vimRegisterInfo2CloudRegion(vimRegisterInfo); if(resourceVersion != null) { cloudRegionDetail.setResourceVersion(resourceVersion); originalSystemInfo = originalCloudRegionDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);