private static VnfmManagerWrapper vnfmManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
+ private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+
/**
* get VnfmManagerWrapper instance.
*
public Response registerVnfm(VnfmRegisterInfo vnfm) {
CommonRegisterResponse result = new CommonRegisterResponse();
EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
- esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
String vnfmId = esrVnfmDetail.getVnfmId();
try {
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
EsrVnfmDetail originalEsrVnfmDetail = new EsrVnfmDetail();
EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo();
originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
- esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
String resourceVersion = getResourceVersion(vnfmId);
esrVnfmDetail.setResourceVersion(resourceVersion);
esrVnfmDetail.setVnfmId(vnfmId);
LOG.error("Query VNFM list failed !");
return Response.serverError().build();
}
-
}
public Response queryVnfmById(String vnfmId) {
if (vnfm != null) {
return Response.ok(vnfm).build();
} else {
- return Response.serverError().build();
+ return Response.ok().build();
}
}
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:"
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);
+ vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
return vnfm;
} catch (Exception e) {
e.printStackTrace();