Realize query EMS detail API.

Change-Id: I3bef748b8e89fba3807c0caeb14ac03c428c185c
Issue-ID: AAI-321
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>

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 6472308..bc7b58e 100644 (file)
--- 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
@@ -82,4 +82,8 @@ public class ExternalSystemProxy {
     registerEmsServiceproxy.registerEMS(transactionId, fromAppId, authorization, emsId,
         emsDetail);
   }
+  
+  public static String queryEmsDetail(String emsId) throws Exception {
+    return externalSystemproxy.queryEMSDetail(transactionId, fromAppId, authorization, emsId);
+  }
 }

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java
index bba610e..40ebd27 100644 (file)
--- a/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/EmsManagerUtil.java
@@ -104,7 +104,7 @@ public class EmsManagerUtil {
       } else if(authInfo.getSystemType().equals(SystemType.EMS_PERFORMANCE.toString())) {
         FtpAddr performanceAddr = new FtpAddr();
         performanceAddr = getFtpAddrFromAuthInfo(authInfo);
-        emsRegisterInfo.setResourceAddr(performanceAddr);
+        emsRegisterInfo.setPerformanceAddr(performanceAddr);
       } else if(authInfo.getSystemType().equals(SystemType.EMS_ALARM.toString())) {
         AlarmAddr alarmAddr = new AlarmAddr();
         alarmAddr = getAlarmAddrFromAuthInfo(authInfo);

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 (file)
--- 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;
+    }
+  }
 }