X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FEmsManagerUtil.java;h=40ebd27ca5578015215aa8fb600dda5dd6bedf30;hb=191a050af372f6eebee33a16a1b501a66aab950f;hp=b48f76c177525033e48905ab0ac42e298adf74d1;hpb=0fc3e68fe98646d2e814b0e7597ffae7f731b586;p=aai%2Fesr-server.git

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 b48f76c..40ebd27 100644
--- 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
@@ -19,15 +19,15 @@ import java.util.ArrayList;
 
 import org.onap.aai.esr.common.SystemType;
 import org.onap.aai.esr.entity.aai.EsrSystemInfo;
-import org.onap.aai.esr.entity.aai.EsrEms;
+import org.onap.aai.esr.entity.aai.EsrEmsDetail;
 import org.onap.aai.esr.entity.rest.AlarmAddr;
 import org.onap.aai.esr.entity.rest.EmsRegisterInfo;
 import org.onap.aai.esr.entity.rest.FtpAddr;
 
 public class EmsManagerUtil {
   
-  public static EsrEms emsRegisterInfo2EsrEms(EmsRegisterInfo emsRegisterInfo) {
-    EsrEms esrEms = new EsrEms();
+  public static EsrEmsDetail emsRegisterInfo2EsrEms(EmsRegisterInfo emsRegisterInfo) {
+    EsrEmsDetail esrEms = new EsrEmsDetail();
     esrEms.setEmsId(ExtsysUtil.generateId());
     ArrayList<EsrSystemInfo> authInfos = new ArrayList<EsrSystemInfo>();
     authInfos = getAuthInfosFromRegisterData(emsRegisterInfo);
@@ -76,6 +76,7 @@ public class EmsManagerUtil {
     EsrSystemInfo authInfo = new EsrSystemInfo();
     AlarmAddr alarmAddr = new AlarmAddr();
     alarmAddr = emsRegisterInfo.getAlarmAddr();
+    authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
     authInfo.setIpAddress(alarmAddr.getIp());
     authInfo.setPort(alarmAddr.getPort());
     authInfo.setUserName(alarmAddr.getUser());
@@ -87,7 +88,7 @@ public class EmsManagerUtil {
     return authInfo;
   }
   
-  public static EmsRegisterInfo EsrEms2EmsRegisterInfo(EsrEms esrEms) {
+  public static EmsRegisterInfo EsrEms2EmsRegisterInfo(EsrEmsDetail esrEms) {
     EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo();
     ArrayList<EsrSystemInfo> esrSystemInfo = new ArrayList<EsrSystemInfo>();
     EsrSystemInfo authInfo = new EsrSystemInfo();
@@ -103,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);