Change-Id: I84ef1fbd989b1ba4cc01e0747df021c123d309ef
Issue-ID: AAI-282
Signed-off-by: lizi00164331 <li.zi30@zte.com.cn>
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.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;
import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
import org.onap.aai.esr.util.VnfmManagerUtil;
import org.slf4j.Logger;
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
result.setId(vnfmId);
return Response.ok(result).build();
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
result.setId(vnfmId);
return Response.ok(result).build();
- } catch (Exception e) {
- e.printStackTrace();
- 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());
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
result.setId(vnfmId);
return Response.ok(result).build();
ExternalSystemProxy.registerVnfm(vnfmId, esrVnfmDetail);
result.setId(vnfmId);
return Response.ok(result).build();
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error("Update VNFM failed !" + e.getMessage());
- return Response.serverError().build();
+ } catch (ExtsysException e) {
+ LOG.error("Update VNFM failed !", e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
LOG.info("Response from AAI by query VNFM list: " + esrVnfm);
vnfmList = getVnfmDetailList(esrVnfm);
return Response.ok(vnfmList).build();
LOG.info("Response from AAI by query VNFM list: " + esrVnfm);
vnfmList = getVnfmDetailList(esrVnfm);
return Response.ok(vnfmList).build();
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error("Query VNFM list failed !");
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM list failed !", e);
return Response.ok(vnfmList).build();
}
}
return Response.ok(vnfmList).build();
}
}
public Response delVnfm(String vnfmId) {
String resourceVersion = getResourceVersion(vnfmId);
public Response delVnfm(String vnfmId) {
String resourceVersion = getResourceVersion(vnfmId);
- if (resourceVersion != null) {
- try {
- ExternalSystemProxy.deleteVnfm(vnfmId, resourceVersion);
- return Response.noContent().build();
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error("Delete VNFM from A&AI failed! VNFM ID: " + vnfmId + "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();
+ 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());
LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
vnfm = vnfmManagerUtil.esrVnfm2VnfmRegisterInfo(esrVnfmDetail);
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) {
- e.printStackTrace();
- LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
- return null;
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
}
private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
}
private ArrayList<VnfmRegisterInfo> getVnfmDetailList(EsrVnfmList esrVnfm) {
String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
String esrVnfmstr = ExternalSystemProxy.queryVnfmDetail(vnfmId);
LOG.info("Response from AAI by query VNFM: " + esrVnfmstr);
esrVnfmDetail = new Gson().fromJson(esrVnfmstr, EsrVnfmDetail.class);
- } catch (Exception e) {
- e.printStackTrace();
- LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e.getMessage());
+ } catch (ExtsysException e) {
+ LOG.error("Query VNFM detail failed! VNFM ID: " + vnfmId, e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
}
return esrVnfmDetail;
}
}
return esrVnfmDetail;
}