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%2FExternalSystemProxy.java;h=e5b49d650cc909c24b4fd5f50208bc8d590d562f;hp=eda2eb2e899c1a339a291d5c3e8976a219ca15d7;hb=refs%2Ftags%2F4.0.0-ONAP;hpb=cab18110a636691b277ab94a5d6e202c275a8dfc

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 eda2eb2..e5b49d6 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,53 +16,171 @@
 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.entity.aai.EsrNfvoDetail;
+import org.onap.aai.esr.exception.ExtsysException;
 import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
 
 public class ExternalSystemProxy {
 
-  private static IExternalSystem externalSystemproxy;
-
-  private static String transactionId = "9999";
-  private static String fromAppId = "esr-server";
-  private static String authorization = AaiCommon.getAuthenticationCredentials();
-  static {
-    ClientConfig config = new ClientConfig();
-    externalSystemproxy = ConsumerFactory.createConsumer(AaiAdapterConfig.getExternalSystemAddr(),
-        config, IExternalSystem.class);
-  }
-
-  public static void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws Exception {
-    ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
-    IExternalSystem registerVnfmServiceproxy = ConsumerFactory
-        .createConsumer(AaiAdapterConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerVnfmServiceproxy.registerVNFM(transactionId, fromAppId, authorization, vnfmId,
-        esrVnfmDetail);
-  }
-  
-  public static String queryVnfmDetail(String vnfmId) throws Exception {
-    return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
-  }
-  
-  public static String queryVnfmList() throws Exception {
-    return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
-  }
-  
-  public static void deleteVnfm(String vnfmId, String resourceVersion) throws Exception {
-    externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
-  }
-  
-  public static void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws Exception {
-    ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
-    IExternalSystem registerVnfmServiceproxy = ConsumerFactory
-        .createConsumer(AaiAdapterConfig.getExternalSystemAddr(), config, IExternalSystem.class);
-    registerVnfmServiceproxy.registerThirdpartySdnc(transactionId, fromAppId, authorization, thirdpartySdncId,
-        esrSdncDetail);
-  }
-  
-  public static String queryThirdpartySdncDetail(String thirdpartySdncId) throws Exception{
-    return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization, thirdpartySdncId);
-  }
+    private static IExternalSystem externalSystem, externalSystemV16;
+    private static String transactionId = "9999";
+    private static String fromAppId = "esr-server";
+    private static String authorization = AaiCommon.getAuthenticationCredentials();
+    static {
+        ClientConfig config = new ClientConfig();
+        externalSystem =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddr(), config, IExternalSystem.class);
+        externalSystemV16 =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddrV16(), config, IExternalSystem.class);
+    }
+    
+    public void registerVnfm(String vnfmId, EsrVnfmDetail esrVnfmDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new VnfmRegisterProvider());
+        IExternalSystem registerVnfmServiceproxy =
+                ConsumerFactory.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 String queryVnfmDetail(String vnfmId) throws ExtsysException {
+        try {
+            return externalSystem.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
+        }
+    }
+
+    public String queryVnfmList() throws ExtsysException {
+        try {
+            return externalSystem.queryVNFMList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query VNFM list from A&AI failed.", e);
+        }
+    }
+
+    public void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystem.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete VNFM from A&AI failed.", e);
+        }
+    }
+
+    public void registerNfvo(String nfvoId, EsrNfvoDetail esrNfvoDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new NfvoRegisterProvider());
+        IExternalSystem registerNfvoServiceproxy =
+                ConsumerFactory.createConsumer(MsbConfig.getExternalSystemAddrV16(), config, IExternalSystem.class);
+        try {
+            registerNfvoServiceproxy.registerNFVO(transactionId, fromAppId, authorization, nfvoId, esrNfvoDetail);
+        } catch (Exception e) {
+            throw new ExtsysException("PUT NFVO to A&AI failed.", e);
+        }
+    }
+
+    public String queryNfvoDetail(String nfvoId) throws ExtsysException {
+        try {
+            return externalSystemV16.queryNFVODetail(transactionId, fromAppId, authorization, nfvoId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query NFVO detail from A&AI failed.", e);
+        }
+    }
+
+    public String queryNfvoList() throws ExtsysException {
+        try {
+            return externalSystemV16.queryNFVOList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query NFVO list from A&AI failed.", e);
+        }
+    }
+
+    public void deleteNfvo(String nfvoId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystemV16.deleteNFVO(transactionId, fromAppId, authorization, nfvoId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete NFVO from A&AI failed.", e);
+        }
+    }
+
+
+
+
+
+    public void registerSdnc(String thirdpartySdncId, EsrThirdpartySdncDetail esrSdncDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new ThirdpartySdncRegisterProvider());
+        IExternalSystem registerSdncServiceproxy =
+                ConsumerFactory.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 String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
+        try {
+            return externalSystem.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
+                    thirdpartySdncId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
+        }
+    }
+
+    public String querySdncList() throws ExtsysException {
+        try {
+            return externalSystem.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
+        }
+    }
+
+    public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystem.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
+        }
+    }
+
+    public void registerEms(String emsId, EsrEmsDetail emsDetail) throws ExtsysException {
+        ClientConfig config = new ClientConfig(new EmsRegisterProvider());
+        IExternalSystem registerEmsServiceproxy =
+                ConsumerFactory.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 String queryEmsDetail(String emsId) throws ExtsysException {
+        try {
+            return externalSystem.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+        } catch (Exception e) {
+            throw new ExtsysException("Query EMS detail from A&AI failed.", e);
+        }
+    }
+
+    public String queryEmsList() throws ExtsysException {
+        try {
+            return externalSystem.queryEMSList(transactionId, fromAppId, authorization);
+        } catch (Exception e) {
+            throw new ExtsysException("Query EMS list from A&AI failed.", e);
+        }
+    }
+
+    public void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
+        try {
+            externalSystem.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+        } catch (Exception e) {
+            throw new ExtsysException("Delete EMS from A&AI failed.", e);
+        }
+    }
 }