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=9d131651e9e798dd9c77e26efdc5daf56ac70548;hp=ac85b0a5c18abd1b90b067a295c8f09b32998cf5;hb=c62f4b64bdd6a26cd8d78406e4bcf8ab907384a1;hpb=191a050af372f6eebee33a16a1b501a66aab950f

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 ac85b0a..9d13165 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
@@ -23,6 +23,7 @@ import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
 import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
 import org.onap.aai.esr.util.EmsManagerUtil;
 import org.onap.aai.esr.entity.aai.EsrEmsDetail;
+import org.onap.aai.esr.entity.aai.EsrEmsList;
 import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -66,9 +67,19 @@ public class EmsManagerWrapper {
   }
   
   public Response queryEmsList() {
-    //TODO
     ArrayList<EmsRegisterInfo> emsList = new ArrayList<EmsRegisterInfo>();
-    return Response.ok(emsList).build();
+    EsrEmsList esrEms = new EsrEmsList();
+    try {
+      String esrEmsStr = ExternalSystemProxy.queryEmsList();
+      esrEms = new Gson().fromJson(esrEmsStr, EsrEmsList.class);
+      LOG.info("Response from AAI by query EMS list: " + esrEms);
+      emsList = getEmsDetailList(esrEms);
+      return Response.ok(emsList).build();
+    } catch (Exception e) {
+      e.printStackTrace();
+      LOG.error("Query EMS list failed !");
+      return Response.serverError().build();
+    }
   }
   
   public Response queryEmsById(String emsId) {
@@ -97,8 +108,21 @@ public class EmsManagerWrapper {
       return emsRegisterInfo;
     } catch (Exception e) {
       e.printStackTrace();
-      LOG.error("Query VNFM detail failed! EMS ID: " + emsId, e.getMessage());
+      LOG.error("Query EMS detail failed! EMS ID: " + emsId, e.getMessage());
       return null;
     }
   }
+  
+  private ArrayList<EmsRegisterInfo> getEmsDetailList(EsrEmsList esrEms) {
+    ArrayList<EmsRegisterInfo> emsInfoList = new ArrayList<EmsRegisterInfo>();
+    EmsRegisterInfo emsInfo = new EmsRegisterInfo();
+    for (int i = 0; i < esrEms.getEsrEms().size(); i++) {
+      String emsId = esrEms.getEsrEms().get(i).getEmsId();
+      emsInfo = queryEmsDetail(emsId);
+      if (emsInfo != null) {
+        emsInfoList.add(emsInfo);
+      }
+    }
+    return emsInfoList;
+  }
 }