From f98c32ab879722dfce8c1c72b3dedc6291722a0e Mon Sep 17 00:00:00 2001 From: lizi00164331 Date: Fri, 22 Sep 2017 18:54:01 +0800 Subject: [PATCH] Change the static method in VIM. Change-Id: Ia6f88207fbdf13c11ed730faac1c76485e54d11c Issue-ID: AAI-370 Signed-off-by: lizi00164331 --- .../esr/externalservice/aai/CloudRegionProxy.java | 8 +++---- .../onap/aai/esr/wrapper/VimManagerWrapper.java | 28 ++++++++++++++-------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java index aeda6cf..8ff14d0 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/CloudRegionProxy.java @@ -34,7 +34,7 @@ public class CloudRegionProxy { config, ICloudRegion.class); } - public static void registerVim(String cloudOwner, String cloudRegionId, + public void registerVim(String cloudOwner, String cloudRegionId, CloudRegionDetail cloudRegion) throws Exception { ClientConfig config = new ClientConfig(new VimRegisterProvider()); ICloudRegion registerVimServiceproxy = ConsumerFactory @@ -43,16 +43,16 @@ public class CloudRegionProxy { cloudRegionId, cloudRegion); } - public static String queryVimDetail(String cloud_owner, String cloud_region_id) throws Exception { + public String queryVimDetail(String cloud_owner, String cloud_region_id) throws Exception { return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner, cloud_region_id); } - public static String qureyVimList() throws Exception { + public String qureyVimList() throws Exception { return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization); } - public static void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion) + public void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion) throws Exception { adapterServiceproxy.deleteVim(transactionId, fromAppId, authorization, cloud_owner, cloud_region_id, resourceVersion); 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 47fa95c..d7f4f77 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,6 +17,7 @@ package org.onap.aai.esr.wrapper; import java.util.ArrayList; +import javax.inject.Inject; import javax.ws.rs.core.Response; import org.onap.aai.esr.entity.aai.CloudRegionDetail; @@ -39,8 +40,15 @@ public class VimManagerWrapper { private static VimManagerWrapper vimManagerWrapper; private static final Logger LOG = LoggerFactory.getLogger(VimManagerWrapper.class); - private static VimManagerUtil vimManagerUtil = new VimManagerUtil(); - private static ExtsysUtil extsysUtil = new ExtsysUtil(); + + @Inject + private VimManagerUtil vimManagerUtil; + + @Inject + private CloudRegionProxy cloudRegionProxy; + + @Inject + private ExtsysUtil extsysUtil; /** * get VimManagerWrapper instance. @@ -64,7 +72,7 @@ public class VimManagerWrapper { String cloudOwner = vimRegisterInfo.getCloudOwner(); String cloudRegionId = vimRegisterInfo.getCloudRegionId(); try { - CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion); + cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegion); result.setCloudOwner(cloudOwner); result.setCloudRegionId(cloudRegionId); Tenant tenant = new Tenant(); @@ -90,7 +98,7 @@ public class VimManagerWrapper { cloudRegionDetail = getVimUpdateInfo(vimRegisterInfo); try { - CloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail); + cloudRegionProxy.registerVim(cloudOwner, cloudRegionId, cloudRegionDetail); result.setCloudOwner(cloudOwner); result.setCloudRegionId(cloudRegionId); return Response.ok(result).build(); @@ -105,7 +113,7 @@ public class VimManagerWrapper { ArrayList vimRegisterInfos = new ArrayList(); CloudRegionList cloudRegionList = new CloudRegionList(); try { - String aaiVimList = CloudRegionProxy.qureyVimList(); + String aaiVimList = cloudRegionProxy.qureyVimList(); cloudRegionList = new Gson().fromJson(aaiVimList, CloudRegionList.class); vimRegisterInfos = getVimDetailList(cloudRegionList); return Response.ok(vimRegisterInfos).build(); @@ -121,7 +129,7 @@ public class VimManagerWrapper { VimRegisterInfo vim = new VimRegisterInfo(); CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); try { - String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + 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); @@ -150,7 +158,7 @@ public class VimManagerWrapper { CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); VimRegisterInfo registeredVimInfo = new VimRegisterInfo(); try { - String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); registeredVimInfo = vimManagerUtil.cloudRegion2VimRegisterInfo(cloudRegionDetail); } catch (Exception error) { @@ -164,7 +172,7 @@ public class VimManagerWrapper { private CloudRegionDetail getOriginalCloudRegion(String cloudOwner, String cloudRegionId) { CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); try { - String cloudRegionstr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + String cloudRegionstr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); cloudRegionDetail = new Gson().fromJson(cloudRegionstr, CloudRegionDetail.class); return cloudRegionDetail; } catch (Exception error) { @@ -199,7 +207,7 @@ public class VimManagerWrapper { String resourceVersion = cloudRegionDetail.getResourceVersion(); if (resourceVersion != null) { try { - CloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion); + cloudRegionProxy.deleteVim(cloudOwner, cloudRegionId, resourceVersion); return Response.noContent().build(); } catch (Exception e) { e.printStackTrace(); @@ -218,7 +226,7 @@ public class VimManagerWrapper { private CloudRegionDetail queryCloudRegionDetail (String cloudOwner, String cloudRegionId) { CloudRegionDetail cloudRegionDetail = new CloudRegionDetail(); try { - String cloudRegionStr = CloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); + String cloudRegionStr = cloudRegionProxy.queryVimDetail(cloudOwner, cloudRegionId); LOG.info("Response from AAI by query cloud region: " + cloudRegionStr); cloudRegionDetail = new Gson().fromJson(cloudRegionStr, CloudRegionDetail.class); } catch (Exception e) { -- 2.16.6