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%2Futil%2FVnfmManagerUtil.java;h=32b6b62038fa6c9857ce75750541fa2e87e1d246;hp=f94b1181201b67fec062241beb5048e6d03963ec;hb=9c05d63a363a0b6a161f5f4d94d5cd893f582806;hpb=861c24d17f2c1d351f75ef4b4c280b6dcca762e5

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 f94b118..32b6b62 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
@@ -22,54 +22,51 @@ import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
 
 public class VnfmManagerUtil {
-  
-  public static EsrVnfmDetail vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) {
-    EsrVnfmDetail esrVnfm = new EsrVnfmDetail();
-    EsrSystemInfoList esrSystemInfo = new EsrSystemInfoList();
-    EsrSystemInfo authInfo = new EsrSystemInfo();
-    esrVnfm.setCertificateUrl(vnfmRegisterInfo.getCertificateUrl());
-    esrVnfm.setResouceVersion(vnfmRegisterInfo.getVersion());
-    esrVnfm.setVimId(vnfmRegisterInfo.getVimId());
-    esrVnfm.setVnfmId(ExtsysUtil.generateId());
-    authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo);
-    esrSystemInfo = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo);
-    esrVnfm.setEsrSystemInfoList(esrSystemInfo);
-    return esrVnfm;
-  }
+    private static ExtsysUtil extsysUtil = new ExtsysUtil();
 
-  /**
-   * @param vnfmRegisterInfo vnfm register informantion from portal
-   * @return
-   */
-  private static EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
-    EsrSystemInfo authInfo = new EsrSystemInfo();
-    authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
-    authInfo.setSystemName(vnfmRegisterInfo.getName());
-    authInfo.setType(vnfmRegisterInfo.getType());
-    authInfo.setVendor(vnfmRegisterInfo.getVendor());
-    authInfo.setVersion(vnfmRegisterInfo.getVersion());
-    authInfo.setServiceUrl(vnfmRegisterInfo.getUrl());
-    authInfo.setUserName(vnfmRegisterInfo.getUserName());
-    authInfo.setPassword(vnfmRegisterInfo.getPassword());
-    authInfo.setSystemType(SystemType.VNFM.toString());
-    return authInfo;
-  }
-  
-  public static VnfmRegisterInfo esrVnfm2VnfmRegisterInfo(EsrVnfmDetail esrVnfm) {
-    VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
-    EsrSystemInfo authInfo = new EsrSystemInfo();
-    vnfmRegisterInfo.setVnfmId(esrVnfm.getVnfmId());
-    vnfmRegisterInfo.setCertificateUrl(esrVnfm.getCertificateUrl());
-    vnfmRegisterInfo.setVimId(esrVnfm.getVimId());
-    authInfo = esrVnfm.getEsrSystemInfoList().getEsrSystemInfo().get(0);
-    vnfmRegisterInfo.setName(authInfo.getSystemName());
-    vnfmRegisterInfo.setPassword(authInfo.getPassword());
-    vnfmRegisterInfo.setType(authInfo.getType());
-    vnfmRegisterInfo.setUrl(authInfo.getServiceUrl());
-    vnfmRegisterInfo.setUserName(authInfo.getUserName());
-    vnfmRegisterInfo.setVendor(authInfo.getVendor());
-    vnfmRegisterInfo.setVersion(authInfo.getVersion());
-    return vnfmRegisterInfo;
-  }
+    public EsrVnfmDetail vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) {
+        EsrVnfmDetail esrVnfm = new EsrVnfmDetail();
+        esrVnfm.setCertificateUrl(vnfmRegisterInfo.getCertificateUrl());
+        esrVnfm.setVimId(vnfmRegisterInfo.getVimId());
+        esrVnfm.setVnfmId(extsysUtil.generateId());
+        EsrSystemInfo authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo);
+        EsrSystemInfoList esrSystemInfo = extsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo);
+        esrVnfm.setEsrSystemInfoList(esrSystemInfo);
+        return esrVnfm;
+    }
+
+    /**
+     * @param vnfmRegisterInfo vnfm register informantion from portal
+     * @return
+     */
+    private EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
+        EsrSystemInfo authInfo = new EsrSystemInfo();
+        authInfo.setEsrSystemInfoId(extsysUtil.generateId());
+        authInfo.setSystemName(vnfmRegisterInfo.getName());
+        authInfo.setType(vnfmRegisterInfo.getType());
+        authInfo.setVendor(vnfmRegisterInfo.getVendor());
+        authInfo.setVersion(vnfmRegisterInfo.getVersion());
+        authInfo.setServiceUrl(vnfmRegisterInfo.getUrl());
+        authInfo.setUserName(vnfmRegisterInfo.getUserName());
+        authInfo.setPassword(vnfmRegisterInfo.getPassword());
+        authInfo.setSystemType(SystemType.VNFM.toString());
+        return authInfo;
+    }
+
+    public VnfmRegisterInfo esrVnfm2VnfmRegisterInfo(EsrVnfmDetail esrVnfm) {
+        VnfmRegisterInfo vnfmRegisterInfo = new VnfmRegisterInfo();
+        vnfmRegisterInfo.setVnfmId(esrVnfm.getVnfmId());
+        vnfmRegisterInfo.setCertificateUrl(esrVnfm.getCertificateUrl());
+        vnfmRegisterInfo.setVimId(esrVnfm.getVimId());
+        EsrSystemInfo authInfo = esrVnfm.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+        vnfmRegisterInfo.setName(authInfo.getSystemName());
+        vnfmRegisterInfo.setPassword(authInfo.getPassword());
+        vnfmRegisterInfo.setType(authInfo.getType());
+        vnfmRegisterInfo.setUrl(authInfo.getServiceUrl());
+        vnfmRegisterInfo.setUserName(authInfo.getUserName());
+        vnfmRegisterInfo.setVendor(authInfo.getVendor());
+        vnfmRegisterInfo.setVersion(authInfo.getVersion());
+        return vnfmRegisterInfo;
+    }
 
 }