Merge "Added quriedVolumeGroupId to createvfModule"

diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2.groovy b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2.groovy
index 93379c7..aa22cda 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2.groovy
@@ -298,6 +298,7 @@ class DoCreateVfModuleVolumeV2 extends VfModuleBase {
                        getAAIClient().create(volumeGroupUri, volumeGroup)
                        getAAIClient().connect(volumeGroupUri, vnfUri)
                        getAAIClient().connect(volumeGroupUri, tenantUri)
+                       execution.setVariable("queriedVolumeGroupId", volumeGroupId)
                        RollbackData rollbackData = execution.getVariable("rollbackData")
                        rollbackData.put("DCVFMODULEVOL", "isAAIRollbackNeeded", "true")
                } catch (NotFoundException ignored) {

diff --git a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2Test.groovy b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2Test.groovy
index 26d3ab8..6841cee 100644 (file)
--- a/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2Test.groovy
+++ b/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2Test.groovy
@@ -250,6 +250,7 @@ class DoCreateVfModuleVolumeV2Test extends MsoGroovyTest {
                when(mockExecution.getVariable(cloudOwner)).thenReturn(cloudOwner)
                when(mockExecution.getVariable("rollbackData")).thenReturn(new RollbackData())
                doCreateVfModuleVolumeV2.callRESTCreateAAIVolGrpName(mockExecution,null)
+               verify(mockExecution).setVariable("queriedVolumeGroupId", "volumeGroupId")
        }
 
        @Test