Change the exception throw way for VIM register.

[aai/esr-server.git] / esr-mgr / src / main / java / org / onap / aai / esr / util / VnfmManagerUtil.java

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 2079cb2..f1f33a7 100644 (file)
--- 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,17 +22,17 @@ import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
 import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
 
 public class VnfmManagerUtil {
+  private static ExtsysUtil extsysUtil = new ExtsysUtil();
   
   public 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());
+    esrVnfm.setVnfmId(extsysUtil.generateId());
     authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo);
-    esrSystemInfo = ExtsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo);
+    esrSystemInfo = extsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo);
     esrVnfm.setEsrSystemInfoList(esrSystemInfo);
     return esrVnfm;
   }
@@ -43,7 +43,7 @@ public class VnfmManagerUtil {
    */
   private EsrSystemInfo getAuthInfoFromVnfmRegisterInfo(VnfmRegisterInfo vnfmRegisterInfo) {
     EsrSystemInfo authInfo = new EsrSystemInfo();
-    authInfo.setEsrSystemInfoId(ExtsysUtil.generateId());
+    authInfo.setEsrSystemInfoId(extsysUtil.generateId());
     authInfo.setSystemName(vnfmRegisterInfo.getName());
     authInfo.setType(vnfmRegisterInfo.getType());
     authInfo.setVendor(vnfmRegisterInfo.getVendor());