throw new ExtsysException("Query PNF List from A&AI failed.", e);
}
}
+
+ public void deletePnf(String pnfId, String resourceVersion) throws ExtsysException {
+ try {
+ network.deletePNF(transactionId, fromAppId, authorization, pnfId, resourceVersion);
+ } catch (Exception e) {
+ throw new ExtsysException("Delete PNF from A&AI failed.", e);
+ }
+ }
}
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;
* @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;
}
/**
import org.onap.aai.esr.common.MsbConfig;
import org.onap.aai.esr.entity.aai.Pnf;
import org.onap.aai.esr.entity.rest.PnfRegisterInfo;
-import org.onap.aai.esr.entity.rest.VnfmRegisterInfo;
import org.onap.aai.esr.exception.ExtsysException;
-import org.onap.aai.esr.externalservice.aai.ExternalSystemProxy;
import org.onap.aai.esr.externalservice.aai.NetworkProxy;
import org.onap.aai.esr.util.ExtsysUtil;
assertEquals(extsysUtil.objectToString(esrPnfList), extsysUtil.objectToString(response.getEntity()));
}
}
+
+ @Test
+ public void test_delPnf() throws ExtsysException {
+ NetworkProxy mockNetworkProxy = Mockito.mock(NetworkProxy.class);
+ Mockito.doNothing().when(mockNetworkProxy).deletePnf(Mockito.anyString(), Mockito.anyString());
+ PnfManagerWrapper pnfManagerWrapper = new PnfManagerWrapper(mockNetworkProxy);
+ Response response = pnfManagerWrapper.delPnf("pnf1");
+ if (response != null) {
+ Assert.assertTrue(response.getStatus() == 204);
+ }
+ }
}