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=ce0b51b965392bd3d2aa56c84482f6ab57008da0;hb=refs%2Ftags%2F4.0.0-ONAP;hpb=6bc8b3c6f31ba7f3a7fe199ee5116832c0fc1daf

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 ce0b51b..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
@@ -20,19 +20,22 @@ 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 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();
-        externalSystemproxy =
+        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 {
@@ -48,7 +51,7 @@ public class ExternalSystemProxy {
 
     public String queryVnfmDetail(String vnfmId) throws ExtsysException {
         try {
-            return externalSystemproxy.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
+            return externalSystem.queryVNFMDetail(transactionId, fromAppId, authorization, vnfmId);
         } catch (Exception e) {
             throw new ExtsysException("Query VNFM detail from A&AI failed.", e);
         }
@@ -56,7 +59,7 @@ public class ExternalSystemProxy {
 
     public String queryVnfmList() throws ExtsysException {
         try {
-            return externalSystemproxy.queryVNFMList(transactionId, fromAppId, authorization);
+            return externalSystem.queryVNFMList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
             throw new ExtsysException("Query VNFM list from A&AI failed.", e);
         }
@@ -64,12 +67,51 @@ public class ExternalSystemProxy {
 
     public void deleteVnfm(String vnfmId, String resourceVersion) throws ExtsysException {
         try {
-            externalSystemproxy.deleteVNFM(transactionId, fromAppId, authorization, vnfmId, resourceVersion);
+            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 =
@@ -84,7 +126,7 @@ public class ExternalSystemProxy {
 
     public String queryThirdpartySdncDetail(String thirdpartySdncId) throws ExtsysException {
         try {
-            return externalSystemproxy.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
+            return externalSystem.queryThirdpartySdncDetail(transactionId, fromAppId, authorization,
                     thirdpartySdncId);
         } catch (Exception e) {
             throw new ExtsysException("Query thirdparty SDNC detail from A&AI failed.", e);
@@ -93,7 +135,7 @@ public class ExternalSystemProxy {
 
     public String querySdncList() throws ExtsysException {
         try {
-            return externalSystemproxy.queryThirdpartySdncList(transactionId, fromAppId, authorization);
+            return externalSystem.queryThirdpartySdncList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
             throw new ExtsysException("Query thirdparty SDNC list from A&AI failed.", e);
         }
@@ -101,7 +143,7 @@ public class ExternalSystemProxy {
 
     public void deleteThirdpartySdnc(String sdncId, String resourceVersion) throws ExtsysException {
         try {
-            externalSystemproxy.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
+            externalSystem.deleteThirdpartySdnc(transactionId, fromAppId, authorization, sdncId, resourceVersion);
         } catch (Exception e) {
             throw new ExtsysException("Delete thirdparty SDNC from A&AI failed.", e);
         }
@@ -120,7 +162,7 @@ public class ExternalSystemProxy {
 
     public String queryEmsDetail(String emsId) throws ExtsysException {
         try {
-            return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+            return externalSystem.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
         } catch (Exception e) {
             throw new ExtsysException("Query EMS detail from A&AI failed.", e);
         }
@@ -128,7 +170,7 @@ public class ExternalSystemProxy {
 
     public String queryEmsList() throws ExtsysException {
         try {
-            return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
+            return externalSystem.queryEMSList(transactionId, fromAppId, authorization);
         } catch (Exception e) {
             throw new ExtsysException("Query EMS list from A&AI failed.", e);
         }
@@ -136,7 +178,7 @@ public class ExternalSystemProxy {
 
     public void deleteEms(String emsId, String resourceVersion) throws ExtsysException {
         try {
-            externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+            externalSystem.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
         } catch (Exception e) {
             throw new ExtsysException("Delete EMS from A&AI failed.", e);
         }