X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FVnfmManagerWrapper.java;h=a0ca60d4fbf1a45086eed3a42e3bf84d89fcd157;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=5f6c8dbd420db315fc21a329dde9e5245c0b428b;hpb=f860118c135ded9f97dbc9102c5d90f828fae34b;p=aai%2Fesr-server.git diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java index 5f6c8db..a0ca60d 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/VnfmManagerWrapper.java @@ -35,6 +35,8 @@ public class VnfmManagerWrapper { private static VnfmManagerWrapper vnfmManagerWrapper; private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class); + private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil(); + /** * get VnfmManagerWrapper instance. * @@ -50,7 +52,7 @@ public class VnfmManagerWrapper { public Response registerVnfm(VnfmRegisterInfo vnfm) { CommonRegisterResponse result = new CommonRegisterResponse(); EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail(); - esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm); + esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm); String vnfmId = esrVnfmDetail.getVnfmId(); try { ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail); @@ -69,7 +71,7 @@ public class VnfmManagerWrapper { EsrVnfmDetail originalEsrVnfmDetail = new EsrVnfmDetail(); EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo(); originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId); - esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm); + esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm); String resourceVersion = getResourceVersion(vnfmId); esrVnfmDetail.setResourceVersion(resourceVersion); esrVnfmDetail.setVnfmId(vnfmId); @@ -140,7 +142,7 @@ public class VnfmManagerWrapper { String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId); LOG.info("Response from AAI by query VNFM: " + esrVnfmstr); esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class); - vnfm = VnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail); + vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail); return vnfm; } catch (Exception e) { e.printStackTrace();