public static String queryEmsList() throws Exception {
return externalSystemproxy.queryEMSList(transactionId, fromAppId, authorization);
}
+
+ public static void deleteEms(String emsId, String resourceVersion) throws Exception {
+ externalSystemproxy.deleteEMS(transactionId, fromAppId, authorization, emsId, resourceVersion);
+ }
}
}
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) {
}
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;
+ }
}
e.printStackTrace();
LOG.error("Delete VNFM from A&AI failed! thirdparty SDNC ID: " + thirdpartySdncId + "resouce-version:"
+ resourceVersion, e.getMessage());
- return Response.serverError().build();
+ return Response.noContent().build();
}
} else {
LOG.error("resouce-version is null ! Can not delete resouce from A&AI. ");
if (resourceVersion != null) {
try {
ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
- return Response.ok().build();
+ return Response.noContent().build();
} catch (Exception e) {
e.printStackTrace();
LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:"