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%2Fwrapper%2FEmsManagerWrapper.java;h=588baad96c7942e83e0670784bbf423505c7b194;hp=63ffa871535e71ae79e06862944b6e99a1a9c334;hb=a9c5b27687df9f1d72c58fa64899b6783f6aef5a;hpb=0d6ba27cdb051f6883687ace5d4d5f4b77ff0a85

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
index 63ffa87..588baad 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java
@@ -35,7 +35,7 @@ public class EmsManagerWrapper {
     private static EmsManagerWrapper emsManagerWrapper;
     private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
     private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil();
-
+    private static ExternalSystemProxy externalSystemProxy = new ExternalSystemProxy();
     /**
      * get VnfmManagerWrapper instance.
      * 
@@ -43,17 +43,21 @@ public class EmsManagerWrapper {
      */
     public static EmsManagerWrapper getInstance() {
         if (emsManagerWrapper == null) {
-            emsManagerWrapper = new EmsManagerWrapper();
+            emsManagerWrapper = new EmsManagerWrapper(externalSystemProxy);
         }
         return emsManagerWrapper;
     }
+    
+    public EmsManagerWrapper(ExternalSystemProxy externalSystemProxy){
+        EmsManagerWrapper.externalSystemProxy = externalSystemProxy;
+    }
 
     public Response registerEms(EmsRegisterInfo emsRegisterInfo) {
         CommonRegisterResponse result = new CommonRegisterResponse();
         EsrEmsDetail esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo);
         String emsId = esrEmsDetail.getEmsId();
         try {
-            ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
+            externalSystemProxy.registerEms(emsId, esrEmsDetail);
             result.setId(emsId);
             return Response.ok(result).build();
         } catch (ExtsysException e) {
@@ -66,7 +70,7 @@ public class EmsManagerWrapper {
         CommonRegisterResponse result = new CommonRegisterResponse();
         EsrEmsDetail esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId);
         try {
-            ExternalSystemProxy.registerEms(emsId, esrEmsDetail);
+            externalSystemProxy.registerEms(emsId, esrEmsDetail);
             result.setId(emsId);
             return Response.ok(result).build();
         } catch (ExtsysException e) {
@@ -79,7 +83,7 @@ public class EmsManagerWrapper {
         List<EmsRegisterInfo> emsList = new ArrayList<>();
         EsrEmsList esrEms = new EsrEmsList();
         try {
-            String esrEmsStr = ExternalSystemProxy.queryEmsList();
+            String esrEmsStr = externalSystemProxy.queryEmsList();
             esrEms = new Gson().fromJson(esrEmsStr, EsrEmsList.class);
             LOG.info("Response from AAI by query EMS list: " + esrEms);
             emsList = getEmsDetailList(esrEms);
@@ -103,7 +107,7 @@ public class EmsManagerWrapper {
         EsrEmsDetail esrEmsDetail = queryEsrEmsDetail(emsId);
         String resourceVersion = esrEmsDetail.getResourceVersion();
         try {
-            ExternalSystemProxy.deleteEms(emsId, resourceVersion);
+            externalSystemProxy.deleteEms(emsId, resourceVersion);
             return Response.noContent().build();
         } catch (ExtsysException e) {
             LOG.error("Delete EMS from A&AI failed! EMS ID: " + emsId + "resouce-version:" + resourceVersion, e);
@@ -115,7 +119,7 @@ public class EmsManagerWrapper {
         EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
         EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
         try {
-            String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
+            String esrEmsStr = externalSystemProxy.queryEmsDetail(emsId);
             LOG.info("Response from AAI by query EMS: " + esrEmsStr);
             esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
             emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail);
@@ -140,7 +144,7 @@ public class EmsManagerWrapper {
     private EsrEmsDetail queryEsrEmsDetail(String emsId) {
         EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
         try {
-            String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId);
+            String esrEmsStr = externalSystemProxy.queryEmsDetail(emsId);
             LOG.info("Response from AAI by query EMS: " + esrEmsStr);
             esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class);
         } catch (ExtsysException e) {