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%2Fexternalservice%2Faai%2FCloudRegionProxy.java;h=a162cd0a1e73da9c5e836d79c7cee9e0f28c0873;hp=89b8ab2794c82136d3a116099774676c874ba5e7;hb=06fe3f5d62f9b986ebb8babf6fb140baed44769f;hpb=07c89153d16b14bda54f16ef9f37e54bfc0a68f8

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 89b8ab2..a162cd0 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
@@ -1,5 +1,5 @@
 /**
- * Copyright 2017 ZTE Corporation.
+ * Copyright 2017-2018 ZTE Corporation.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,44 +16,81 @@
 package org.onap.aai.esr.externalservice.aai;
 
 import org.glassfish.jersey.client.ClientConfig;
+import org.onap.aai.esr.common.MsbConfig;
 import org.onap.aai.esr.entity.aai.CloudRegionDetail;
-
+import org.onap.aai.esr.entity.aai.Relationship;
+import org.onap.aai.esr.exception.ExtsysException;
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 public class CloudRegionProxy {
 
-  private static ICloudRegion adapterServiceproxy;
-
-  private static String transactionId = "9999";
-  private static String fromAppId = "esr-server";
-  private static String authorization = AaiCommon.getAuthenticationCredentials();
-  static {
-    ClientConfig config = new ClientConfig();
-    adapterServiceproxy = ConsumerFactory.createConsumer(AaiAdapterConfig.getCloudInfrastructureAddr(),
-        config, ICloudRegion.class);
-  }
-
-  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);
-    registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
-        cloudRegionId, cloudRegion);
-  }
-
-  public static 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 {
-    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);
-  }
+    private static ICloudRegion adapterServiceproxy;
+
+    private static String transactionId = "9999";
+    private static String fromAppId = "esr-server";
+    private static String authorization = AaiCommon.getAuthenticationCredentials();
+    static {
+        ClientConfig config = new ClientConfig();
+        adapterServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, ICloudRegion.class);
+    }
+
+    public void registerVim(String cloudOwner, String cloudRegionId, CloudRegionDetail cloudRegion)
+            throws ExtsysException {
+        ClientConfig config = new ClientConfig(new VimRegisterProvider());
+        ICloudRegion registerVimServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, ICloudRegion.class);
+        try {
+            registerVimServiceproxy.registerVIMService(transactionId, fromAppId, authorization, cloudOwner,
+                    cloudRegionId, cloudRegion);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT cloud region to A&AI failed.", e);
+        }
+    }
+
+    public String queryVimDetail(String cloud_owner, String cloud_region_id) throws ExtsysException {
+        try {
+            return adapterServiceproxy.queryVIMDetail(transactionId, fromAppId, authorization, cloud_owner,
+                    cloud_region_id);
+        } catch (Exception e) {
+            throw new ExtsysException("Query cloud region detail from A&AI failed.", e);
+        }
+    }
+
+    public String qureyVimList() throws ExtsysException {
+        try {
+            return adapterServiceproxy.queryVIMList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query cloud region list from A&AI failed.", e);
+        }
+    }
+
+    public void deleteVim(String cloud_owner, String cloud_region_id, String resourceVersion) throws ExtsysException {
+        try {
+            adapterServiceproxy.deleteVim(transactionId, fromAppId, authorization, cloud_owner, cloud_region_id,
+                    resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete cloud region from A&AI failed.", e);
+        }
+    }
+    
+    public String qureyComplexes() throws ExtsysException {
+        try {
+            return adapterServiceproxy.queryComplexList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query complexes from A&AI failed.", e);
+        }
+    }
+    
+    public void createCloudRegionRelationShip(String cloudOwner, String cloudRegionId, Relationship relationship) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new RelationshipProvider());
+        ICloudRegion createRelationshipProxy =
+                ConsumerFactory.createConsumer(MsbConfig.getCloudInfrastructureAddr(), config, ICloudRegion.class);
+        try {
+            createRelationshipProxy.createCloudRegionRelationship(transactionId, fromAppId, authorization, cloudOwner,
+                    cloudRegionId, relationship);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT cloud region to A&AI failed.", e);
+        }
+    }
 }