AssignPnfBB connects PNF and service instance in AAI

Change-Id: I92ab4b45acb120d647ea3de7a455e2e873c12a72
Issue-ID: SO-2605
Signed-off-by: Joanna Jeremicz <joanna.jeremicz@nokia.com>

3 files changed, 0 insertions, 108 deletions

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/CheckAaiForPnfCorrelationId.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/CheckAaiForPnfCorrelationId.java
deleted file mode 100644
index 29914252d8..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/CheckAaiForPnfCorrelationId.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.onap.so.bpmn.infrastructure.pnf.tasks;
-
-import joptsimple.internal.Strings;
-import org.onap.so.bpmn.common.BuildingBlockExecution;
-import org.onap.so.client.exception.BBObjectNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import java.io.IOException;
-import static org.onap.so.bpmn.infrastructure.pnf.delegate.ExecutionVariableNames.AAI_CONTAINS_INFO_ABOUT_PNF;
-import static org.onap.so.bpmn.infrastructure.pnf.delegate.ExecutionVariableNames.PNF_CORRELATION_ID;
-
-@Component
-public class CheckAaiForPnfCorrelationId extends PnfBaseTasks {
-    private static final Logger logger = LoggerFactory.getLogger(CheckAaiForPnfCorrelationId.class);
-
-    @Override
-    public void execute(BuildingBlockExecution execution) {
-        try {
-            String pnfCorrelationId = extractPnf(execution).getPnfName();
-            checkIfPnfCorrelationIdPresent(execution, pnfCorrelationId);
-            checkIfPnfExistsInAai(execution, pnfCorrelationId);
-        } catch (BBObjectNotFoundException e) {
-            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, e);
-        }
-
-    }
-
-    private void checkIfPnfCorrelationIdPresent(BuildingBlockExecution execution, String pnfCorrelationId) {
-        if (Strings.isNullOrEmpty(pnfCorrelationId)) {
-            exceptionUtil.buildAndThrowWorkflowException(execution, 500, PNF_CORRELATION_ID + " is not set");
-        }
-    }
-
-    private void checkIfPnfExistsInAai(BuildingBlockExecution execution, String pnfCorrelationId) {
-        try {
-            boolean isEntry = pnfManagement.getEntryFor(pnfCorrelationId).isPresent();
-            logger.debug("AAI entry is found for pnf correlation id {}: {}", PNF_CORRELATION_ID, isEntry);
-            execution.setVariable(AAI_CONTAINS_INFO_ABOUT_PNF, isEntry);
-        } catch (IOException e) {
-            logger.error("Exception in check AAI for pnf_correlation_id execution", e);
-            exceptionUtil.buildAndThrowWorkflowException(execution, 9999, e);
-        }
-    }
-}
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/CreatePnfEntryInAai.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/CreatePnfEntryInAai.java
deleted file mode 100644
index 6e86ad619e..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/CreatePnfEntryInAai.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package org.onap.so.bpmn.infrastructure.pnf.tasks;
-
-import org.onap.aai.domain.yang.Pnf;
-import org.onap.so.bpmn.common.BuildingBlockExecution;
-import org.onap.so.client.exception.BBObjectNotFoundException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-
-@Component
-public class CreatePnfEntryInAai extends PnfBaseTasks {
-    private static final Logger logger = LoggerFactory.getLogger(CreatePnfEntryInAai.class);
-
-    @Override
-    public void execute(BuildingBlockExecution execution) throws Exception {
-        try {
-            org.onap.so.bpmn.servicedecomposition.bbobjects.Pnf pnf = extractPnf(execution);
-            String pnfCorrelationId = pnf.getPnfName();
-            pnfManagement.createEntry(pnfCorrelationId, preparePnfForAai(pnf));
-            logger.debug("AAI entry is created for pnf correlation id: {}, pnf uuid: {}", pnfCorrelationId,
-                    pnf.getPnfId());
-        } catch (BBObjectNotFoundException e) {
-            exceptionUtil.buildAndThrowWorkflowException(execution, 7000, e);
-        }
-    }
-
-    private Pnf preparePnfForAai(org.onap.so.bpmn.servicedecomposition.bbobjects.Pnf pnf) {
-        Pnf pnfAai = new Pnf();
-        pnfAai.setPnfId(pnf.getPnfId());
-        pnfAai.setPnfName(pnf.getPnfName());
-        return pnfAai;
-    }
-
-}
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/PnfBaseTasks.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/PnfBaseTasks.java
deleted file mode 100644
index d8e3379afb..0000000000
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/pnf/tasks/PnfBaseTasks.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.onap.so.bpmn.infrastructure.pnf.tasks;
-
-import org.onap.so.bpmn.common.BuildingBlockExecution;
-import org.onap.so.bpmn.infrastructure.pnf.management.PnfManagement;
-import org.onap.so.bpmn.servicedecomposition.bbobjects.Pnf;
-import org.onap.so.bpmn.servicedecomposition.entities.ResourceKey;
-import org.onap.so.bpmn.servicedecomposition.tasks.ExtractPojosForBB;
-import org.onap.so.client.exception.BBObjectNotFoundException;
-import org.onap.so.client.exception.ExceptionBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public abstract class PnfBaseTasks {
-    protected PnfManagement pnfManagement;
-    @Autowired
-    protected ExceptionBuilder exceptionUtil;
-    @Autowired
-    protected ExtractPojosForBB extractPojosForBB;
-
-    @Autowired
-    public void setPnfManagement(PnfManagement pnfManagement) {
-        this.pnfManagement = pnfManagement;
-    }
-
-    public abstract void execute(BuildingBlockExecution execution) throws Exception;
-
-    protected Pnf extractPnf(BuildingBlockExecution execution) throws BBObjectNotFoundException {
-        return extractPojosForBB.extractByKey(execution, ResourceKey.PNF);
-    }
-}