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=f3ae511bd963a8690ffa83a031e323523975130b;hb=fbc14fb126199394da2ccc459460e69672772c1c;hp=9d131651e9e798dd9c77e26efdc5daf56ac70548;hpb=c62f4b64bdd6a26cd8d78406e4bcf8ab907384a1;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 9d13165..f3ae511 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 @@ -93,8 +93,23 @@ public class EmsManagerWrapper { } public Response delEms(String emsId) { - //TODO - return Response.noContent().build(); + EsrEmsDetail esrEmsDetail = new EsrEmsDetail(); + esrEmsDetail = queryEsrEmsDetail(emsId); + String resourceVersion = esrEmsDetail.getResourceVersion(); + if (resourceVersion != null) { + try { + ExternalSystemProxy.deleteEms(emsId, resourceVersion); + return Response.noContent().build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Delete EMS from A&AI failed! EMS ID: " + emsId + "resouce-version:" + + resourceVersion, e.getMessage()); + return Response.serverError().build(); + } + } else { + LOG.error("resouce-version is null ! Can not delete resouce from A&AI. "); + return Response.serverError().build(); + } } private EmsRegisterInfo queryEmsDetail(String emsId) { @@ -125,4 +140,17 @@ public class EmsManagerWrapper { } 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 (Exception e) { + e.printStackTrace(); + LOG.error("Query EMS detail failed! EMS ID: " + emsId, e.getMessage()); + } + return esrEmsDetail; + } }