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=8acc8257d265c518814e56ff6b21638f04397d1a;hp=b1373ca343a04d327aa1510bfb117cc85cc19a0e;hb=769718b3e8b4e659299602701b575cf1b4b182c5;hpb=bbd77f32c29fa424a3786edbe434f132a5d9da2a 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 b1373ca..8acc825 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 @@ -16,20 +16,28 @@ package org.onap.aai.esr.wrapper; import java.util.ArrayList; +import java.util.List; import javax.ws.rs.core.Response; import org.onap.aai.esr.entity.rest.EmsRegisterInfo; +import org.onap.aai.esr.exception.ExceptionUtil; +import org.onap.aai.esr.exception.ExtsysException; 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.aai.EsrSystemInfo; 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); + private static EmsManagerUtil emsManagerUtil = new EmsManagerUtil(); /** * get VnfmManagerWrapper instance. @@ -45,38 +53,139 @@ 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); result.setId(emsId); return Response.ok(result).build(); - } catch (Exception e) { - e.printStackTrace(); - LOG.error("Register EMS failed !" + e.getMessage()); - return Response.serverError().build(); + } catch (ExtsysException e) { + LOG.error("Register EMS failed !", e); + throw ExceptionUtil.buildExceptionResponse(e.getMessage()); } } - public Response updateEms(EmsRegisterInfo ems) { - //TODO - return Response.ok().build(); + public Response updateEms(EmsRegisterInfo emsRegisterInfo, String emsId) { + CommonRegisterResponse result = new CommonRegisterResponse(); + EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); + esrEmsDetail = getNewEsrEmsDetail(emsRegisterInfo, emsId); + try { + ExternalSystemProxy.registerEms(emsId, esrEmsDetail); + result.setId(emsId); + return Response.ok(result).build(); + } catch (ExtsysException e) { + LOG.error("Update VNFM failed !", e); + throw ExceptionUtil.buildExceptionResponse(e.getMessage()); + } } public Response queryEmsList() { - //TODO - ArrayList emsList = new ArrayList(); - return Response.ok(emsList).build(); + List 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 (ExtsysException e) { + LOG.error("Query EMS list failed !", e); + return Response.ok(emsList).build(); + } } public Response queryEmsById(String emsId) { - EmsRegisterInfo ems = new EmsRegisterInfo(); - //TODO - return Response.ok(ems).build(); + EmsRegisterInfo ems; + ems = queryEmsDetail(emsId); + if (ems != null) { + return Response.ok(ems).build(); + } else { + return Response.ok(ems).build(); + } } public Response delEms(String emsId) { - //TODO - return Response.noContent().build(); + EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); + esrEmsDetail = queryEsrEmsDetail(emsId); + String resourceVersion = esrEmsDetail.getResourceVersion(); + try { + ExternalSystemProxy.deleteEms(emsId, resourceVersion); + return Response.noContent().build(); + } catch (ExtsysException e) { + LOG.error( + "Delete EMS from A&AI failed! EMS ID: " + emsId + "resouce-version:" + resourceVersion, + e); + throw ExceptionUtil.buildExceptionResponse(e.getMessage()); + } + } + + 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); + } catch (ExtsysException e) { + LOG.error("Query EMS detail failed! EMS ID: " + emsId, e); + } + return emsRegisterInfo; + } + + private List getEmsDetailList(EsrEmsList esrEms) { + List 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; + } + + private EsrEmsDetail queryEsrEmsDetail (String emsId) { + 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); + } catch (ExtsysException e) { + LOG.error("Query EMS detail failed! EMS ID: " + emsId, e); + } + return esrEmsDetail; + } + + private EsrEmsDetail getNewEsrEmsDetail(EmsRegisterInfo emsRegisterInfo, String emsId) { + EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); + List newEsrSysInfoList = new ArrayList<>(); + EsrSystemInfo newEsrSystemInfo = new EsrSystemInfo(); + EsrEmsDetail oriEsrEmsDetail = new EsrEmsDetail(); + List oriEsrSysInfoList = new ArrayList<>(); + EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo(); + + oriEsrEmsDetail = queryEsrEmsDetail(emsId); + esrEmsDetail = emsManagerUtil.emsRegisterInfo2EsrEms(emsRegisterInfo); + String emsResourceVersion = oriEsrEmsDetail.getResourceVersion(); + esrEmsDetail.setResourceVersion(emsResourceVersion); + esrEmsDetail.setEmsId(emsId); + newEsrSysInfoList = esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo(); + oriEsrSysInfoList = oriEsrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo(); + for (int i = 0; i < oriEsrSysInfoList.size(); i++) { + originalEsrSystemInfo = oriEsrSysInfoList.get(i); + for (int j = 0; j < newEsrSysInfoList.size(); j++) { + newEsrSystemInfo = newEsrSysInfoList.get(j); + if (originalEsrSystemInfo.getSystemType().equals(newEsrSystemInfo.getSystemType())) { + esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j) + .setResouceVersion(originalEsrSystemInfo.getResouceVersion()); + esrEmsDetail.getEsrSystemInfoList().getEsrSystemInfo().get(j) + .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId()); + break; + } + } + } + return esrEmsDetail; } }