X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=esr-mgr%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Faai%2Fesr%2Fwrapper%2FThirdpatySdncWrapper.java;h=0dfd45a7fc42a3f15650b0939ffdf6fe4f972cfa;hb=22a43294c389a413b7d8d372a6d267ea054b4e22;hp=b06b1f7023bfae616ea74e601de8ff8b187b6682;hpb=9fccad8f53ef43026a8632bfb6eabc32849a8c46;p=aai%2Fesr-server.git diff --git a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java index b06b1f7..0dfd45a 100644 --- a/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java +++ b/esr-mgr/src/main/java/org/onap/aai/esr/wrapper/ThirdpatySdncWrapper.java @@ -19,15 +19,25 @@ import java.util.ArrayList; import javax.ws.rs.core.Response; +import org.onap.aai.esr.entity.aai.EsrSystemInfo; +import org.onap.aai.esr.entity.aai.EsrThirdpartySdncDetail; +import org.onap.aai.esr.entity.aai.EsrThirdpartySdncList; +import org.onap.aai.esr.entity.aai.EsrVnfmDetail; import org.onap.aai.esr.entity.rest.CommonRegisterResponse; import org.onap.aai.esr.entity.rest.ThirdpartySdncRegisterInfo; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; +import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy; +import org.onap.aai.esr.util.ThirdpartySdncManagerUtil; +import org.onap.aai.esr.util.VnfmManagerUtil; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.google.gson.Gson; public class ThirdpatySdncWrapper { private static ThirdpatySdncWrapper thirdpatySdncWrapper; -// private static final Logger LOG = LoggerFactory.getLogger(ThirdpatySdncWrapper.class); + private static final Logger LOG = LoggerFactory.getLogger(ThirdpatySdncWrapper.class); + private static ThirdpartySdncManagerUtil thirdpartySdncManagerUtil = new ThirdpartySdncManagerUtil(); /** * get ThirdpatySdncWrapper instance. @@ -41,30 +51,134 @@ public class ThirdpatySdncWrapper { } public Response registerThirdpartySdnc(ThirdpartySdncRegisterInfo thirdpartySdnc) { - //TODO - CommonRegisterResponse result = null; - return Response.ok(result).build(); + CommonRegisterResponse result = new CommonRegisterResponse(); + EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail(); + esrSdncDetail = thirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(thirdpartySdnc); + String sdncId = esrSdncDetail.getThirdpartySdncId(); + try { + ExternalSystemProxy.registerSdnc(sdncId, esrSdncDetail); + result.setId(sdncId); + return Response.ok(result).build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Register thirdParty SDNC failed !" + e.getMessage()); + return Response.serverError().build(); + } + } - public Response updateThirdpartySdnc(ThirdpartySdncRegisterInfo thirdpartySdnc) { - //TODO - return Response.ok().build(); + public Response updateThirdpartySdnc(ThirdpartySdncRegisterInfo thirdpartySdnc, String sdncId) { + CommonRegisterResponse result = new CommonRegisterResponse(); + EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail(); + EsrThirdpartySdncDetail originalEsrSdncDetail = new EsrThirdpartySdncDetail(); + EsrSystemInfo originalEsrSystemInfo = new EsrSystemInfo(); + originalEsrSdncDetail = queryEsrThirdpartySdncDetail(sdncId); + esrSdncDetail = thirdpartySdncManagerUtil.sdncRegisterInfo2EsrSdnc(thirdpartySdnc); + String resourceVersion = originalEsrSdncDetail.getResourceVersion(); + esrSdncDetail.setResourceVersion(resourceVersion); + esrSdncDetail.setThirdpartySdncId(sdncId); + originalEsrSystemInfo = originalEsrSdncDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0); + esrSdncDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) + .setEsrSystemInfoId(originalEsrSystemInfo.getEsrSystemInfoId()); + esrSdncDetail.getEsrSystemInfoList().getEsrSystemInfo().get(0) + .setResouceVersion(originalEsrSystemInfo.getResouceVersion()); + try { + ExternalSystemProxy.registerSdnc(sdncId, esrSdncDetail); + result.setId(sdncId); + return Response.ok(result).build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Update VNFM failed !" + e.getMessage()); + return Response.serverError().build(); + } } public Response queryThirdpartySdncList() { - //TODO - ArrayList thirdpartySdncList = new ArrayList(); - return Response.ok(thirdpartySdncList).build(); + ArrayList sdncList = new ArrayList(); + EsrThirdpartySdncList esrSdnc = new EsrThirdpartySdncList(); + try { + String esrSdncStr = ExternalSystemProxy.querySdncList(); + esrSdnc = new Gson().fromJson(esrSdncStr, EsrThirdpartySdncList.class); + LOG.info("Response from AAI by query thirdparty SDNC list: " + esrSdnc); + sdncList = getSdncDetailList(esrSdnc); + return Response.ok(sdncList).build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Query thirdparty SDNC list failed !"); + return Response.serverError().build(); + } } public Response queryThirdpartySdncById(String thirdpartySdncId) { ThirdpartySdncRegisterInfo thirdpartySdnc = new ThirdpartySdncRegisterInfo(); - //TODO - return Response.ok(thirdpartySdnc).build(); + thirdpartySdnc = querySdncDetail(thirdpartySdncId); + if(thirdpartySdnc != null) { + return Response.ok(thirdpartySdnc).build(); + } else { + return Response.ok().build(); + } } public Response delThirdpartySdnc(String thirdpartySdncId) { - //TODO - return Response.noContent().build(); + EsrThirdpartySdncDetail thirdpartySdncDetail = new EsrThirdpartySdncDetail(); + thirdpartySdncDetail = queryEsrThirdpartySdncDetail(thirdpartySdncId); + String resourceVersion = thirdpartySdncDetail.getResourceVersion(); + if (resourceVersion != null) { + try { + ExternalSystemProxy.deleteThirdpartySdnc(thirdpartySdncId, resourceVersion); + return Response.ok().build(); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Delete VNFM from A&AI failed! thirdparty SDNC ID: " + thirdpartySdncId + "resouce-version:" + + resourceVersion, e.getMessage()); + return Response.noContent().build(); + } + } else { + LOG.error("resouce-version is null ! Can not delete resouce from A&AI. "); + return Response.serverError().build(); + } + } + + private ThirdpartySdncRegisterInfo querySdncDetail(String sdncId) { + ThirdpartySdncRegisterInfo sdncRegisterInfo = new ThirdpartySdncRegisterInfo(); + EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail(); + try { + String esrSdncStr = ExternalSystemProxy.queryThirdpartySdncDetail(sdncId); + LOG.info("Response from AAI by query thirdparty SDNC: " + esrSdncStr); + esrSdncDetail = new Gson().fromJson(esrSdncStr, EsrThirdpartySdncDetail.class); + sdncRegisterInfo = thirdpartySdncManagerUtil.esrSdnc2SdncRegisterInfo(esrSdncDetail); + return sdncRegisterInfo; + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Query VNFM detail failed! thirdpaty SDNC ID: " + sdncId, e.getMessage()); + return null; + } + } + + private ArrayList getSdncDetailList(EsrThirdpartySdncList esrThirdPartySdnc) { + ArrayList sdncInfoList = new ArrayList(); + ThirdpartySdncRegisterInfo sdncInfo = new ThirdpartySdncRegisterInfo(); + for (int i = 0; i < esrThirdPartySdnc.getEsrThirdpartySdnc().size(); i++) { + String sdncId = esrThirdPartySdnc.getEsrThirdpartySdnc().get(i).getThirdpartySdncId(); + sdncInfo = querySdncDetail(sdncId); + if (sdncInfo != null) { + sdncInfoList.add(sdncInfo); + } + } + return sdncInfoList; } + + private EsrThirdpartySdncDetail queryEsrThirdpartySdncDetail (String sdncId) { + EsrThirdpartySdncDetail esrSdncDetail = new EsrThirdpartySdncDetail(); + try { + String esrThirdpartySdncStr = ExternalSystemProxy.queryThirdpartySdncDetail(sdncId); + LOG.info("Response from AAI by query thirdparty SDNC: " + esrThirdpartySdncStr); + esrSdncDetail = new Gson().fromJson(esrThirdpartySdncStr, EsrThirdpartySdncDetail.class); + } catch (Exception e) { + e.printStackTrace(); + LOG.error("Query VNFM detail failed! VNFM ID: " + sdncId, e.getMessage()); + } + return esrSdncDetail; + } + }