diff options
| author |   Benjamin, Max (mb388a) <mb388a@us.att.com> | 2018-10-19 09:32:18 -0400 |
|---|---|---|
| committer |   Rob Daugherty <rd472p@att.com> | 2018-10-19 18:55:36 -0400 |
| commit | 93e96836387ee26cb5f2dbb70adef7db484c7d54 (patch) | |
| tree | 3ffbf2d9ffdfe4996c123ac5ac3fe3e20322e1a2 /bpmn/MSOCommonBPMN/src | |
| parent | 50fcd6f94104234212d907f8fb968d506d4d6e33 (diff) | |
bug fixes october 19th
Fixed issue with resource version being added twice.
added silent success to orch validation when unassign is not found
Removed SNAPSHOT from dependency
Fixed failing BBInputSetup tests
Updated apih tests to use networkInstanceGroup
Updated ModelType enum and fixed compilation issues
Change the place where the data for multistage gets set
Update treatment of PENDING_ACTIVATION VF_MODULE CREATE entries to
SILENT_SUCCESS to support first stage of multistage.
Implement second stage of multistage design VF Module Creation
Implementation of the first stage of multistage design for VF Module
creation.
Change-Id: I6d76282d1f37c081355cee72797d8e13da4e3cb0
Issue-ID: SO-1149
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
Signed-off-by: Rob Daugherty <rd472p@att.com>
Diffstat (limited to 'bpmn/MSOCommonBPMN/src')
4 files changed, 7 insertions, 2 deletions
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/BuildingBlockExecution.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/BuildingBlockExecution.java index a2f6637b5b..1ffd9dd167 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/BuildingBlockExecution.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/BuildingBlockExecution.java @@ -34,4 +34,5 @@ public interface BuildingBlockExecution { public <T> T getRequiredVariable(String key) throws RequiredExecutionVariableExeception; public void setVariable(String key, Serializable value); public Map<ResourceKey, String> getLookupMap(); + public String getFlowToBeCalled(); } diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java index ef564c6af4..1c1d6b73fd 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/DelegateExecutionImpl.java @@ -97,6 +97,10 @@ public class DelegateExecutionImpl implements BuildingBlockExecution, Serializab return this.get("lookupKeyMap"); } + @Override + public String getFlowToBeCalled() { + return this.get("flowToBeCalled"); + } public DelegateExecution getDelegateExecution() { return this.execution; } diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java index 769d3e4e89..8cc25a2c52 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetup.java @@ -571,7 +571,7 @@ public class BBInputSetup implements JavaDelegate { if (relatedInstanceList != null) { for (RelatedInstanceList relatedInstList : relatedInstanceList) { RelatedInstance relatedInstance = relatedInstList.getRelatedInstance(); - if (relatedInstance.getModelInfo().getModelType().equals(ModelType.networkCollection)) { + if (relatedInstance.getModelInfo().getModelType().equals(ModelType.networkInstanceGroup)) { instanceGroupModelInfo = relatedInstance.getModelInfo(); instanceGroupId = relatedInstance.getInstanceId(); } diff --git a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json index 8332ddc28f..a6072bbb57 100644 --- a/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json +++ b/bpmn/MSOCommonBPMN/src/test/resources/__files/ExecuteBuildingBlock/RequestDetails_CreateVnf.json @@ -45,7 +45,7 @@ "relatedInstance": { "instanceId": "{instanceGroupId}", "modelInfo": { - "modelType": "networkCollection", + "modelType": "networkInstanceGroup", "modelInvariantId": "9ea660dc-155f-44d3-b45c-cc7648b4f31c", "modelVersionId": "bb07aad1-ce2d-40c1-85cb-5392f76bb1ef", "modelName": "{network collection model name}", |