X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fexternalservice%2Faai%2FCloudRegionProxy.java;h=aeda6cf8691ac740273705a586cb3d2652889cbc;hb=d7cc6171ecddd8450ed0466fe528518738f3dd08;hp=5c2bb33c907083dc3664a808a6d2d2626cb61bb0;hpb=9fccad8f53ef43026a8632bfb6eabc32849a8c46;p=aai%2Fesr-server.git

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 5c2bb33..aeda6cf 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
@@ -16,15 +16,13 @@
 package org.onap.aai.esr.externalservice.aai;
 
 import org.glassfish.jersey.client.ClientConfig;
-import org.onap.aai.esr.entity.aai.CloudRegion;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.onap.aai.esr.common.MsbConfig;
+import org.onap.aai.esr.entity.aai.CloudRegionDetail;
 
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 public class CloudRegionProxy {
 
-  private static final Logger logger = LoggerFactory.getLogger(CloudRegionProxy.class);
   private static ICloudRegion adapterServiceproxy;
 
   private static String transactionId = "9999";
@@ -32,16 +30,15 @@ public class CloudRegionProxy {
   private static String authorization = AaiCommon.getAuthenticationCredentials();
   static {
     ClientConfig config = new ClientConfig();
-    adapterServiceproxy = ConsumerFactory.createConsumer(AaiAdapterConfig.getCloudInfrastructureAddr(),
+    adapterServiceproxy = ConsumerFactory.createConsumer(MsbConfig.getCloudInfrastructureAddr(),
         config, ICloudRegion.class);
   }
 
-
-  public static void registerVim(String cloudOwner, String cloudRegionId, CloudRegion cloudRegion)
-      throws Exception {
-    ClientConfig config = new ClientConfig(new RegisterVimProvider());
+  public static void registerVim(String cloudOwner, String cloudRegionId,
+      CloudRegionDetail cloudRegion) throws Exception {
+    ClientConfig config = new ClientConfig(new VimRegisterProvider());
     ICloudRegion registerVimServiceproxy = ConsumerFactory
-        .createConsumer(AaiAdapterConfig.getCloudInfrastructureAddr(), config, ICloudRegion.class);
+        .createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, ICloudRegion.class);
     registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
         cloudRegionId, cloudRegion);
   }
@@ -50,4 +47,14 @@ public class CloudRegionProxy {
     return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner,
         cloud_region_id);
   }
+
+  public static String qureyVimList() throws Exception {
+    return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization);
+  }
+
+  public static void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion)
+      throws Exception {
+    adapterServiceproxy.deleteVim(transactionId, fromAppId, authorization, cloud_owner,
+        cloud_region_id, resourceVersion);
+  }
 }