import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.core.Response;
-import org.onap.aai.esr.entity.aai.EsrVnfmList;
import org.onap.aai.esr.entity.aai.Pnf;
import org.onap.aai.esr.entity.aai.PnfList;
import org.onap.aai.esr.entity.rest.PnfRegisterInfo;
-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.NetworkProxy;
+import org.onap.aai.esr.util.ExtsysUtil;
import org.onap.aai.esr.util.PnfManagerUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
private static PnfManagerUtil pnfManagerUtil = new PnfManagerUtil();
private static NetworkProxy networkProxy = new NetworkProxy();
+ ExtsysUtil extsysUtil = new ExtsysUtil();
/**
* get PnfManagerWrapper instance.
*
* @return
*/
public Response delPnf(String pnfId) {
- // TODO Auto-generated method stub
- return null;
+ String resourceVersion = getResourceVersion(pnfId);
+ try {
+ networkProxy.deletePnf(pnfId, resourceVersion);
+ return Response.noContent().build();
+ } catch (ExtsysException e) {
+ LOG.error("Delete PNF from A&AI failed! PNF ID: " + pnfId + "resouce-version:" + resourceVersion, e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+ }
+ }
+
+ /**
+ * @param pnfId
+ * @return
+ */
+ private String getResourceVersion(String pnfId) {
+ String resourceVersion = null;
+ try {
+ String pnfStr = networkProxy.queryPNF(pnfId);
+ Pnf pnf = new Gson().fromJson(pnfStr, Pnf.class);
+ if (pnf != null && pnf.getResourceVersion() != null) {
+ resourceVersion = pnf.getResourceVersion();
+ }
+ } catch (ExtsysException e) {
+ LOG.error("Query PNF detail failed! PNF ID: " + pnfId, e);
+ }
+ return resourceVersion;
}
/**
* @param pnfId
* @return
*/
- public Response updatePnf(PnfRegisterInfo pnf, String pnfId) {
- // TODO Auto-generated method stub
- return null;
+ public Response updatePnf(PnfRegisterInfo pnfRegisterInfo, String pnfId) {
+ String resourceVersion = getResourceVersion(pnfId);
+ Pnf pnf = pnfManagerUtil.pnfRegisterInfo2pnf(pnfRegisterInfo);
+ pnf.setResourceVersion(resourceVersion);
+ try {
+ networkProxy.registerPnf(pnfId, pnf);
+ return Response.ok().build();
+ } catch (ExtsysException e) {
+ LOG.error("Update PNF failed !", e);
+ throw ExceptionUtil.buildExceptionResponse(e.getMessage());
+ }
}
/**
* @return
*/
public Response registerPnf(PnfRegisterInfo pnfRegisterInfo) {
+ LOG.info("Register PNF with ESR, register info: " + extsysUtil.objectToString(pnfRegisterInfo));
Pnf pnf = pnfManagerUtil.pnfRegisterInfo2pnf(pnfRegisterInfo);
+ LOG.info("Register PNF with AAI, register info: " + extsysUtil.objectToString(pnf));
String pnfName = pnf.getPnfName();
try {
networkProxy.registerPnf(pnfName, pnf);