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%2Fwrapper%2FEmsManagerWrapper.java;h=9d131651e9e798dd9c77e26efdc5daf56ac70548;hp=842feb26f555a9d786914b99f36262601fa6e40a;hb=c62f4b64bdd6a26cd8d78406e4bcf8ab907384a1;hpb=fa6dd60a45a093205ae55065f6de044c91493e60 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 842feb2..9d13165 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 @@ -19,12 +19,17 @@ import java.util.ArrayList; import javax.ws.rs.core.Response; -import org.onap.aai.esr.entity.rest.EmsRestData; -import org.onap.aai.esr.entity.rest.RegisterResponse; -import org.onap.aai.esr.entity.rest.VnfmRestData; +import org.onap.aai.esr.entity.rest.EmsRegisterInfo; +import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy; +import org.onap.aai.esr.util.EmsManagerUtil; +import org.onap.aai.esr.entity.aai.EsrEmsDetail; +import org.onap.aai.esr.entity.aai.EsrEmsList; +import org.onap.aai.esr.entity.rest.CommonRegisterResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import com.google.gson.Gson; + public class EmsManagerWrapper { private static EmsManagerWrapper emsManagerWrapper; private static final Logger LOG = LoggerFactory.getLogger(EmsManagerWrapper.class); @@ -40,31 +45,84 @@ public class EmsManagerWrapper { return emsManagerWrapper; } - public Response registerEms(EmsRestData ems) { - //TODO - RegisterResponse result = null; - return Response.ok(result).build(); + public Response registerEms(EmsRegisterInfo emsRegisterInfo) { + CommonRegisterResponse result = new CommonRegisterResponse(); + EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); + esrEmsDetail = EmsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo); + String emsId = esrEmsDetail.getEmsId(); + try { + ExternalSystemProxy.registerEms(emsId, esrEmsDetail); + result.setId(emsId); + return Response.ok(result).build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Register EMS failed !" + e.getMessage()); + return Response.serverError().build(); + } } - public Response updateEms(EmsRestData ems) { + public Response updateEms(EmsRegisterInfo ems) { //TODO return Response.ok().build(); } public Response queryEmsList() { - //TODO - ArrayList emsList = new ArrayList(); - return Response.ok(emsList).build(); + ArrayList emsList = new ArrayList(); + EsrEmsList esrEms = new EsrEmsList(); + try { + String esrEmsStr = ExternalSystemProxy.queryEmsList(); + esrEms = new Gson().fromJson(esrEmsStr, EsrEmsList.class); + LOG.info("Response from AAI by query EMS list: " + esrEms); + emsList = getEmsDetailList(esrEms); + return Response.ok(emsList).build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Query EMS list failed !"); + return Response.serverError().build(); + } } public Response queryEmsById(String emsId) { - EmsRestData ems = new EmsRestData(); - //TODO - return Response.ok(ems).build(); + EmsRegisterInfo ems = new EmsRegisterInfo(); + ems = queryEmsDetail(emsId); + if (ems != null) { + return Response.ok(ems).build(); + } else { + return Response.ok().build(); + } } public Response delEms(String emsId) { //TODO return Response.noContent().build(); } + + private EmsRegisterInfo queryEmsDetail(String emsId) { + EmsRegisterInfo emsRegisterInfo = new EmsRegisterInfo(); + EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); + try { + 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); + return emsRegisterInfo; + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Query EMS detail failed! EMS ID: " + emsId, e.getMessage()); + return null; + } + } + + private ArrayList getEmsDetailList(EsrEmsList esrEms) { + ArrayList emsInfoList = new ArrayList(); + EmsRegisterInfo emsInfo = new EmsRegisterInfo(); + for (int i = 0; i < esrEms.getEsrEms().size(); i++) { + String emsId = esrEms.getEsrEms().get(i).getEmsId(); + emsInfo = queryEmsDetail(emsId); + if (emsInfo != null) { + emsInfoList.add(emsInfo); + } + } + return emsInfoList; + } }