- }
-
- public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
- //TODO
- return Response.ok().build();
- }
-
- public Response queryVnfmList() {
- ArrayList<VnfmRegisterInfo> vnfmList = new ArrayList<VnfmRegisterInfo>();
- EsrVnfmList esrVnfm = new EsrVnfmList();
- try {
- String esrVnfmStr = ExternalSystemProxy.queryVnfmList();
- esrVnfm = new Gson().fromJson(esrVnfmStr, EsrVnfmList.class);
- vnfmList = getVnfmDetailList(esrVnfm);
- return Response.ok(vnfmList).build();
- } catch (Exception e) {
- LOG.error("Query VNFM list failed !");
- return Response.serverError().build();
+
+ public Response queryVnfmById(String vnfmId) {
+ VnfmRegisterInfo vnfm = queryVnfmDetail(vnfmId);
+ if (vnfm != null) {
+ return Response.ok(vnfm).build();
+ } else {
+ return Response.ok(vnfm).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;