import javax.ws.rs.core.Response;
+import org.onap.aai.esr.entity.aai.EsrSystemInfo;
import org.onap.aai.esr.entity.aai.EsrVnfmDetail;
import org.onap.aai.esr.entity.aai.EsrVnfmList;
import org.onap.aai.esr.entity.rest.CommonRegisterResponse;
import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
+import org.onap.aai.esr.exception.ExceptionUtil;
+import org.onap.aai.esr.exception.ExtsysException;
import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
import org.onap.aai.esr.util.VnfmManagerUtil;
import org.slf4j.Logger;
private static VnfmManagerWrapper vnfmManagerWrapper;
private static final Logger LOG = LoggerFactory.getLogger(VnfmManagerWrapper.class);
+ private static VnfmManagerUtil vnfmManagerUtil = new VnfmManagerUtil();
+
/**
* get VnfmManagerWrapper instance.
+ *
* @return vnfm manager wrapper instance
*/
public static VnfmManagerWrapper getInstance() {
public Response registerVnfm(VnfmRegisterInfo vnfm) {
CommonRegisterResponse result = new CommonRegisterResponse();
- EsrVnfmDetail esrVnfmDetail = new EsrVnfmDetail();
- esrVnfmDetail = VnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
String vnfmId = esrVnfmDetail.getVnfmId();
try {
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
result.setId(vnfmId);
return Response.ok(result).build();
- } catch (Exception e) {
- LOG.error("Register VNFM failed !" + e.getMessage());
- return Response.serverError().build();
+ } catch (ExtsysException e) {
+ LOG.error("Register VNFM failed !" , e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
}
}
-
+
public Response updateVnfm(VnfmRegisterInfo vnfm, String vnfmId) {
- //TODO
- return Response.ok().build();
+ CommonRegisterResponse result = new CommonRegisterResponse();
+ EsrVnfmDetail originalEsrVnfmDetail = queryEsrVnfmDetail(vnfmId);
+ EsrVnfmDetail esrVnfmDetail = vnfmManagerUtil.vnfmRegisterInfo2EsrVnfm(vnfm);
+ String resourceVersion = getResourceVersion(vnfmId);
+ esrVnfmDetail.setResourceVersion(resourceVersion);
+ esrVnfmDetail.setVnfmId(vnfmId);
+ EsrSystemInfo originalEsrSystemInfo = originalEsrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0);
+ esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+ .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId());
+ esrVnfmDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0)
+ .setResouceVersion(originalEsrSystemInfo.getResouceVersion());
+ try {
+ ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
+ result.setId(vnfmId);
+ return Response.ok(result).build();
+ } catch (ExtsysException e) {
+ LOG.error("Update VNFM failed !", e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+ }
}
-
+
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);
+ LOG.info("Response from AAI by query VNFM list: " + esrVnfm);
vnfmList = getVnfmDetailList(esrVnfm);
return Response.ok(vnfmList).build();
- } catch (Exception e) {
- LOG.error("Query VNFM list failed !");
- return Response.serverError().build();
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM list failed !", e);
+ return Response.ok(vnfmList).build();
}
-
}
-
+
public Response queryVnfmById(String vnfmId) {
- VnfmRegisterInfo vnfm = new VnfmRegisterInfo();
- vnfm = queryVnfmDetail(vnfmId);
+ VnfmRegisterInfo vnfm = queryVnfmDetail(vnfmId);
if (vnfm != null) {
return Response.ok(vnfm).build();
} else {
- return Response.serverError().build();
+ return Response.ok(vnfm).build();
}
}
-
+
public Response delVnfm(String vnfmId) {
- //TODO
- return Response.noContent().build();
+ 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();
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 vnfm;
- } catch (Exception e) {
- LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
- return null;
+ vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
}
+ return vnfm;
}
-
+
private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
ArrayList<VnfmRegisterInfo> vnfmInfoList = new ArrayList<VnfmRegisterInfo>();
- VnfmRegisterInfo vnfmInfo = new VnfmRegisterInfo();
- for (int i=0; i<esrVnfm.getEsrVnfm().size(); i++) {
+ for (int i = 0; i < esrVnfm.getEsrVnfm().size(); i++) {
String vnfmId = esrVnfm.getEsrVnfm().get(i).getVnfmId();
- vnfmInfo = queryVnfmDetail(vnfmId);
- if(vnfmInfo != null) {
+ 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;
+ }
}