- }
-
- public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
- //TODO
- return Response.ok().build();
- }
-
- public Response queryVnfmList() {
- ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
- //TODO
- return Response.ok(vnfmList).build();
- }
-
- public Response queryVnfmById(String vnfmId) {
- VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
- EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
- try {
- String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
- LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
- esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
- vnfm = VnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
- return Response.ok(vnfm).build();
- } catch (Exception e) {
- e.printStackTrace();
- return Response.serverError().build();
+
+ public Response delVnfm(String vnfmId) {
+ String resourceVersion = getResourceVersion(vnfmId);
+ try {
+ ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
+ return Response.noContent().build();
+ } catch (ExtsysException e) {
+ LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "resouce-version:" + resourceVersion, e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+ }
+ }
+
+ private VnfmRegisterInfo queryVnfmDetail(String vnfmId) {
+ VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
+ EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+ try {
+ String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
+ LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
+ esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
+ vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
+ }
+ return vnfm;
+ }
+
+ private List<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
+ List<VnfmRegisterInfo> vnfmInfoList = new ArrayList<>();
+ for (int i = 0; i < esrVnfm.getEsrVnfm().size(); i++) {
+ String vnfmId = esrVnfm.getEsrVnfm().get(i).getVnfmId();
+ VnfmRegisterInfo vnfmInfo = queryVnfmDetail(vnfmId);
+ if (vnfmInfo != null) {
+ vnfmInfoList.add(vnfmInfo);
+ }
+ }
+ return vnfmInfoList;
+ }
+
+ private String getResourceVersion(String vnfmId) {
+ String resourceVersion = null;
+ EsrVnfmDetail esrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+ if (esrVnfmDetail != null && esrVnfmDetail.getResourceVersion() != null) {
+ resourceVersion = esrVnfmDetail.getResourceVersion();
+ }
+ return resourceVersion;
+ }
+
+ private EsrVnfmDetail queryEsrVnfmDetail(String vnfmId) {
+ EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
+ try {
+ String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
+ LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
+ esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+ }
+ return esrVnfmDetail;