X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FEmsManagerWrapper.java;h=e6e0f698c3b51a77fcfc0608516307d38c05e4c5;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=36f79638aff312f2b95784e232063482de8b3d8c;hpb=48df9cda482edd36130777549ac42ee88f048af3;p=aai%2Fesr-server.git diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java index 36f7963..e6e0f69 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/EmsManagerWrapper.java @@ -34,6 +34,7 @@ import com.google.gson.Gson; public class EmsManagerWrapper { private static EmsManagerWrapper emsManagerWrapper; private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class); + private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil(); /** * get VnfmManagerWrapper instance. @@ -49,7 +50,7 @@ public class EmsManagerWrapper { public Response registerEms(EmsRegisterInfo emsRegisterInfo) { CommonRegisterResponse result = new CommonRegisterResponse(); EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); - esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo); + esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo); String emsId = esrEmsDetail.getEmsId(); try { ExternalSystemProxy.registerEms(emsId, esrEmsDetail); @@ -130,7 +131,7 @@ public class EmsManagerWrapper { String esrEmsStr = ExternalSystemProxy.queryEmsDetail(emsId); LOG.info("Response from AAI by query EMS: " + esrEmsStr); esrEmsDetail = new Gson().fromJson(esrEmsStr, EsrEmsDetail.class); - emsRegisterInfo = EmsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail); + emsRegisterInfo = emsManagerUtil.EsrEms2EmsRegisterInfo(esrEmsDetail); return emsRegisterInfo; } catch (Exception e) { e.printStackTrace(); @@ -174,7 +175,7 @@ public class EmsManagerWrapper { EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo(); oriEsrEmsDetail = queryEsrEmsDetail(emsId); - esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo); + esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo); String emsResourceVersion = oriEsrEmsDetail.getResourceVersion(); esrEmsDetail.setResourceVersion(emsResourceVersion); esrEmsDetail.setEmsId(emsId);