X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fexternalservice%2Faai%2FExternalSystemProxy.java;h=6fca0e63205881fb6986271f05c7f421270659f7;hb=83c6e0c5f6214af24efc124ed6cf840e6ad59cc4;hp=6472308697ed68c80b4b77350975734dcd6b8714;hpb=bbd77f32c29fa424a3786edbe434f132a5d9da2a;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
index 6472308..6fca0e6 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/externalservice/aai/ExternalSystemProxy.java
@@ -16,9 +16,11 @@
 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.EsrEmsDetail;
 import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail;
 import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
+import org.onap.aai.esr.exception.ExtsysException;
 
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
@@ -31,55 +33,115 @@ public class ExternalSystemProxy {
   private static String authorization = AaiCommon.getAuthenticationCredentials();
   static {
     ClientConfig config = new ClientConfig();
-    externalSystemproxy = ConsumerFactory.createConsumer(AaiAdapterConfig.getExternalSystemAddr(),
+    externalSystemproxy = ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(),
         config, IExternalSystem.class);
   }
 
-  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws Exception {
+  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
     ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
     IExternalSystem registerVnfmServiceproxy = ConsumerFactory
-        .createConsumer(AaiAdapterConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
-        esrVnfmDetail);
+        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+    try {
+      registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
+          esrVnfmDetail);
+    } catch (Exception e) {
+      throw new ExtsysException("PUT VNFM to A&AI failed.", e);
+    }
   }
   
-  public static String queryVnfmDetail(String vnfmId) throws Exception {
-    return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+  public static String queryVnfmDetail(String vnfmId) throws ExtsysException {
+    try {
+      return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+    } catch (Exception e) {
+      throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
+    }
   }
   
-  public static String queryVnfmList() throws Exception {
-    return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
+  public static String queryVnfmList() throws ExtsysException {
+    try {
+      return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
+    } catch (Exception e) {
+      throw new ExtsysException("Query VNFM list from A&AI failed.", e);
+    }
   }
   
-  public static void deleteVnfm(String vnfmId, String resourceVersion) throws Exception {
-    externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+  public static void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
+    try {
+      externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+    } catch (Exception e) {
+      throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+    }
   }
   
-  public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws Exception {
+  public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
     ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
     IExternalSystem registerSdncServiceproxy = ConsumerFactory
-        .createConsumer(AaiAdapterConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
-        esrSdncDetail);
+        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+    try {
+      registerSdncServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
+          esrSdncDetail);
+    } catch (Exception e) {
+      throw new ExtsysException("PUT thirdparty SDNC to A&AI failed.", e);
+    }
   }
   
-  public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws Exception{
-    return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId);
+  public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
+    try {
+      return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId);
+    } catch (Exception e) {
+      throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
+    }
   }
   
-  public static String querySdncList() throws Exception {
-    return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+  public static String querySdncList() throws ExtsysException {
+    try {
+      return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+    } catch (Exception e) {
+      throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
+    }
   }
   
-  public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws Exception {
-    externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+  public static void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+    try {
+      externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+    } catch (Exception e) {
+      throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
+    }
   }
   
-  public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws Exception {
+  public static void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
     ClientConfig config = new ClientConfig(new EmsRegisterProvider());
     IExternalSystem registerEmsServiceproxy = ConsumerFactory
-        .createConsumer(AaiAdapterConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId,
-        emsDetail);
+        .createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+    try {
+      registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId,
+          emsDetail);
+    } catch (Exception e) {
+      throw new ExtsysException("PUT EMS to A&AI failed.", e);
+    }
+  }
+  
+  public static String queryEmsDetail(String emsId) throws ExtsysException {
+    try {
+      return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+    } catch (Exception e) {
+      throw new ExtsysException("Query EMS detail from A&AI failed.", e);
+    }
+  }
+  
+  public static String queryEmsList() throws ExtsysException {
+    try {
+      return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
+    } catch (Exception e) {
+      throw new ExtsysException("Query EMS list from A&AI failed.", e);
+    }
+  }
+  
+  public static void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+    try {
+      externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+    } catch (Exception e) {
+      throw new ExtsysException("Delete EMS from A&AI failed.", e);
+    }
   }
 }