From: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
Date: Mon, 10 Dec 2018 20:49:55 +0000 (-0500)
Subject: Added quriedVolumeGroupId to createvfModule
X-Git-Tag: 1.4.1~408^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=220aaa6d646acb82a04fab08765336b51b04a0c6;p=so.git

Added quriedVolumeGroupId to createvfModule

Added quriedVolumeGroupId to create

Change-Id: Ife1ad6b3f96918b9d96b52ea509a85ecada5c74d
Issue-ID: SO-1314
Signed-off-by: Kalkere Ramesh, Sharan (sk720x) <sk720x@att.com>
---

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 93379c72be..aa22cdaefd 100644
--- 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 26d3ab8d9d..6841ceee44 100644
--- 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