X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Futil%2FVnfmManagerUtil.java;h=ca6babdedbdeeb0ba681003c1e411c3547b7046b;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=531e84e05bff4e9b78a239eb9e39472eb84e0ef5;hpb=bc65f229b176269aaf9fe0cee5cf5f9e42a5d455;p=aai%2Fesr-server.git

diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/util/VnfmManagerUtil.java b/esr-mgr/src/main/java/org/onap/aai/esr/util/VnfmManagerUtil.java
index 531e84e..ca6babd 100644
--- a/esr-mgr/src/main/java/org/onap/aai/esr/util/VnfmManagerUtil.java
+++ b/esr-mgr/src/main/java/org/onap/aai/esr/util/VnfmManagerUtil.java
@@ -16,19 +16,19 @@
 package org.onap.aai.esr.util;
 
 import org.onap.aai.esr.common.SystemType;
-import org.onap.aai.esr.entity.aai.AuthInfo;
+import org.onap.aai.esr.entity.aai.EsrSystemInfo;
 import org.onap.aai.esr.entity.aai.EsrSystemInfoList;
-import org.onap.aai.esr.entity.aai.EsrVnfm;
+import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
 
 public class VnfmManagerUtil {
   
-  public EsrVnfm vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) {
-    EsrVnfm esrVnfm = new EsrVnfm();
+  public EsrVnfmDetail vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) {
+    EsrVnfmDetail esrVnfm = new EsrVnfmDetail();
     EsrSystemInfoList esrSystemInfo = new EsrSystemInfoList();
-    AuthInfo authInfo = new AuthInfo();
+    EsrSystemInfo authInfo = new EsrSystemInfo();
     esrVnfm.setCertificateUrl(vnfmRegisterInfo.getCertificateUrl());
-    esrVnfm.setResouceVersion(vnfmRegisterInfo.getVersion());
+    esrVnfm.setResourceVersion(vnfmRegisterInfo.getVersion());
     esrVnfm.setVimId(vnfmRegisterInfo.getVimId());
     esrVnfm.setVnfmId(ExtsysUtil.generateId());
     authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo);
@@ -41,8 +41,8 @@ public class VnfmManagerUtil {
    * @param vnfmRegisterInfo vnfm register informantion from portal
    * @return
    */
-  private AuthInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
-    AuthInfo authInfo = new AuthInfo();
+  private EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
+    EsrSystemInfo authInfo = new EsrSystemInfo();
     authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
     authInfo.setSystemName(vnfmRegisterInfo.getName());
     authInfo.setType(vnfmRegisterInfo.getType());
@@ -55,13 +55,13 @@ public class VnfmManagerUtil {
     return authInfo;
   }
   
-  public VnfmRegisterInfo esrVnfm2VnfmRegisterInfo(EsrVnfm esrVnfm) {
+  public VnfmRegisterInfo esrVnfm2VnfmRegisterInfo(EsrVnfmDetail esrVnfm) {
     VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
-    AuthInfo authInfo = new AuthInfo();
+    EsrSystemInfo authInfo = new EsrSystemInfo();
     vnfmRegisterInfo.setVnfmId(esrVnfm.getVnfmId());
     vnfmRegisterInfo.setCertificateUrl(esrVnfm.getCertificateUrl());
     vnfmRegisterInfo.setVimId(esrVnfm.getVimId());
-    authInfo = esrVnfm.getEsrSystemInfoList().getEsrSystemInfo().getEsrSystemInfo().get(0);
+    authInfo = esrVnfm.getEsrSystemInfoList().getEsrSystemInfo().get(0);
     vnfmRegisterInfo.setName(authInfo.getSystemName());
     vnfmRegisterInfo.setPassword(authInfo.getPassword());
     vnfmRegisterInfo.setType(authInfo.getType());