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=14da20e33af8bd667de9e6dfa32ac91dbefe7392;hb=9c05d63a363a0b6a161f5f4d94d5cd893f582806;hpb=8ed87e2493fc517daa9255f73b13b14faa48b20f 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 14da20e..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 @@ -26,13 +26,11 @@ public class VnfmManagerUtil { public EsrVnfmDetail vnfmRegisterInfo2EsrVnfm(VnfmRegisterInfo vnfmRegisterInfo) { EsrVnfmDetail esrVnfm = new EsrVnfmDetail(); - EsrSystemInfoList esrSystemInfo = new EsrSystemInfoList(); - EsrSystemInfo authInfo = new EsrSystemInfo(); esrVnfm.setCertificateUrl(vnfmRegisterInfo.getCertificateUrl()); esrVnfm.setVimId(vnfmRegisterInfo.getVimId()); esrVnfm.setVnfmId(extsysUtil.generateId()); - authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo); - esrSystemInfo = extsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo); + EsrSystemInfo authInfo = getAuthInfoFromVnfmRegisterInfo(vnfmRegisterInfo); + EsrSystemInfoList esrSystemInfo = extsysUtil.getEsrSystemInfoListFromAuthInfo(authInfo); esrVnfm.setEsrSystemInfoList(esrSystemInfo); return esrVnfm; } @@ -57,11 +55,10 @@ public class VnfmManagerUtil { public 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); + EsrSystemInfo authInfo = esrVnfm.getEsrSystemInfoList().getEsrSystemInfo().get(0); vnfmRegisterInfo.setName(authInfo.getSystemName()); vnfmRegisterInfo.setPassword(authInfo.getPassword()); vnfmRegisterInfo.setType(authInfo.getType());