summaryrefslogtreecommitdiffstats
path: root/bpmn
diff options
context:
space:
mode:
authorlgrech <lukasz.grech@nokia.com>2020-04-02 14:17:15 +0200
committerLukasz Muszkieta <lukasz.muszkieta@nokia.com>2020-04-03 12:04:28 +0000
commit3232a6bbe58d903f25661da4922107a7ab3990a9 (patch)
treed80bd9544ac65ff858e157314e721368bb2fce64 /bpmn
parentb930fe9d7c75b763d93766eb0a506dcb5a4fcf50 (diff)
Removing model related parameters when creating PNF object in AAI
This will be re-implemented in G release when AAI-2845 is resolved Issue-ID: AAI-2845 Signed-off-by: lgrech <lukasz.grech@nokia.com> Change-Id: I8751095a00a4a28b9aae9ff312383afd50772ae2
Diffstat (limited to 'bpmn')
-rw-r--r--bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnf.java4
-rw-r--r--bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnfTest.java15
2 files changed, 0 insertions, 19 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnf.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnf.java
index 68161a8dd5..6fb571641d 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnf.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnf.java
@@ -37,10 +37,6 @@ final class BBInputSetupPnf {
Pnf pnf = new Pnf();
pnf.setPnfId(pnfId);
pnf.setPnfName(pnfs.getInstanceName());
- pnf.setModelInfoPnf(new ModelInfoPnf());
- pnf.getModelInfoPnf().setModelCustomizationUuid(pnfs.getModelInfo().getModelCustomizationId());
- pnf.getModelInfoPnf().setModelInvariantUuid(pnfs.getModelInfo().getModelInvariantId());
- pnf.getModelInfoPnf().setModelUuid(pnfs.getModelInfo().getModelVersionId());
pnf.setOrchestrationStatus(OrchestrationStatus.PRECREATED);
serviceInstance.getPnfs().add(pnf);
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnfTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnfTest.java
index aa9943b9b1..0eef9cccd8 100644
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnfTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupPnfTest.java
@@ -29,7 +29,6 @@ import org.mockito.junit.MockitoJUnitRunner;
import org.onap.so.bpmn.servicedecomposition.bbobjects.Pnf;
import org.onap.so.bpmn.servicedecomposition.bbobjects.ServiceInstance;
import org.onap.so.db.catalog.beans.OrchestrationStatus;
-import org.onap.so.serviceinstancebeans.ModelInfo;
import org.onap.so.serviceinstancebeans.Pnfs;
import static org.mockito.Mockito.doReturn;
@@ -39,22 +38,11 @@ public class BBInputSetupPnfTest {
@Mock
private Pnfs pnfs;
- @Mock
- private ModelInfo modelInfo;
-
@Test
public void populatePnfShouldSetRequiredFields() {
final String pnfId = "PNF_id1";
final String pnfName = "PNF_name1";
- final String modelCustomizationId = "8421fe03-fd1b-4bf7-845a-c3fe91edb031";
- final String modelInvariantId = "3360a2a5-22ff-44c7-8935-08c8e5ecbd06";
- final String modelVersionId = "b80c3a52-abd4-436c-a22e-9c5da768781a";
-
- doReturn(modelCustomizationId).when(modelInfo).getModelCustomizationId();
- doReturn(modelInvariantId).when(modelInfo).getModelInvariantId();
- doReturn(modelVersionId).when(modelInfo).getModelVersionId();
doReturn(pnfName).when(pnfs).getInstanceName();
- doReturn(modelInfo).when(pnfs).getModelInfo();
ServiceInstance serviceInstance = new ServiceInstance();
BBInputSetupPnf.populatePnfToServiceInstance(pnfs, pnfId, serviceInstance);
@@ -65,9 +53,6 @@ public class BBInputSetupPnfTest {
assertEquals(pnfId, pnf.getPnfId());
assertEquals(pnfName, pnf.getPnfName());
- assertEquals(modelCustomizationId, pnf.getModelInfoPnf().getModelCustomizationUuid());
- assertEquals(modelInvariantId, pnf.getModelInfoPnf().getModelInvariantUuid());
- assertEquals(modelVersionId, pnf.getModelInfoPnf().getModelUuid());
assertEquals(OrchestrationStatus.PRECREATED, pnf.getOrchestrationStatus());
}
}