X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FEmsManagerWrapper.java;fp=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FEmsManagerWrapper.java;h=ac85b0a5c18abd1b90b067a295c8f09b32998cf5;hb=191a050af372f6eebee33a16a1b501a66aab950f;hp=b1373ca343a04d327aa1510bfb117cc85cc19a0e;hpb=bbd77f32c29fa424a3786edbe434f132a5d9da2a;p=aai%2Fesr-server.git

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 b1373ca..ac85b0a 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
@@ -27,6 +27,8 @@ import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.gson.Gson;
+
 public class EmsManagerWrapper {
   private static EmsManagerWrapper emsManagerWrapper;
   private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class);
@@ -71,12 +73,32 @@ public class EmsManagerWrapper {
   
   public Response queryEmsById(String emsId) {
     EmsRegisterInfo ems = new EmsRegisterInfo();
-    //TODO
-    return Response.ok(ems).build();
+    ems = queryEmsDetail(emsId);
+    if (ems != null) {
+      return Response.ok(ems).build();
+    } else {
+      return Response.ok().build();
+    }
   }
   
   public Response delEms(String emsId) {
     //TODO
     return Response.noContent().build();
   }
+  
+  private EmsRegisterInfo queryEmsDetail(String emsId) {
+    EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
+    EsrEmsDetail esrEmsDetail = new EsrEmsDetail();
+    try {
+      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);
+      return emsRegisterInfo;
+    } catch (Exception e) {
+      e.printStackTrace();
+      LOG.error("Query VNFM detail failed! EMS ID: " + emsId, e.getMessage());
+      return null;
+    }
+  }
 }