Merge "response from aai is now volumeGroups"

diff --combined bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2.groovy
index aa22cda,ee634c8..b42962a
--- 1/bpmn/so-bpmn-infrastructure-common/src/main/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2.groovy
--- 2/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
@@@ -24,6 -24,7 +24,7 @@@ import org.camunda.bpm.engine.delegate.
  import org.camunda.bpm.engine.delegate.DelegateExecution
  import org.onap.aai.domain.yang.GenericVnf
  import org.onap.aai.domain.yang.VolumeGroup
+ import org.onap.aai.domain.yang.VolumeGroups
  import org.onap.so.bpmn.common.scripts.AaiUtil
  import org.onap.so.bpmn.common.scripts.ExceptionUtil
  import org.onap.so.bpmn.common.scripts.MsoUtils
@@@ -216,10 -217,11 +217,11 @@@ class DoCreateVfModuleVolumeV2 extends 
  
                try {
                        AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.VOLUME_GROUP, Defaults.CLOUD_OWNER.toString(), cloudRegion).queryParam("volume-group-name", volumeGroupName)
-                       Optional<VolumeGroup> volumeGroup = getAAIClient().get(VolumeGroup.class,uri)
-                       if(volumeGroup.isPresent()){
+                       Optional<VolumeGroups> volumeGroups = getAAIClient().get(VolumeGroups.class,uri)
+                       if(volumeGroups.isPresent()){
+                               VolumeGroup volumeGroup = volumeGroups.get().getVolumeGroup().get(0);
                                execution.setVariable(prefix+'AaiReturnCode', 200)
-                               execution.setVariable("queriedVolumeGroupId",volumeGroup.get().getVolumeGroupId())
+                               execution.setVariable("queriedVolumeGroupId",volumeGroup.getVolumeGroupId())
                                msoLogger.debug("Volume Group Name $volumeGroupName exists in AAI.")
                        }else{
                                execution.setVariable(prefix+'AaiReturnCode', 404)
@@@ -298,7 -300,6 +300,7 @@@
                        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 --combined bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2Test.groovy
index 6841cee,2832377..53c164a
--- 1/bpmn/so-bpmn-infrastructure-common/src/test/groovy/org/onap/so/bpmn/infrastructure/scripts/DoCreateVfModuleVolumeV2Test.groovy
--- 2/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
@@@ -35,6 -35,7 +35,7 @@@ import org.mockito.runners.MockitoJUnit
  import org.onap.aai.domain.yang.GenericVnf
  import org.onap.aai.domain.yang.Volume
  import org.onap.aai.domain.yang.VolumeGroup
+ import org.onap.aai.domain.yang.VolumeGroups
  import org.onap.so.bpmn.common.scripts.MsoGroovyTest
  import org.onap.so.bpmn.core.RollbackData
  import org.onap.so.client.aai.AAIObjectPlurals
@@@ -160,9 -161,11 +161,11 @@@ class DoCreateVfModuleVolumeV2Test exte
                when(mockExecution.getVariable(volumeGroupName)).thenReturn(volumeGroupName)
                when(mockExecution.getVariable(lcpCloudRegionId)).thenReturn(lcpCloudRegionId)
                AAIResourceUri uri = AAIUriFactory.createResourceUri(AAIObjectPlurals.VOLUME_GROUP, Defaults.CLOUD_OWNER.toString(), lcpCloudRegionId).queryParam("volume-group-name", volumeGroupName)
+               VolumeGroups volumeGroups = new VolumeGroups();
                VolumeGroup volumeGroup = new  VolumeGroup()
                volumeGroup.setVolumeGroupId("volumeGroupId")
-               when(client.get(VolumeGroup.class,uri)).thenReturn(Optional.of(volumeGroup))
+               volumeGroups.getVolumeGroup().add(volumeGroup);
+               when(client.get(VolumeGroups.class,uri)).thenReturn(Optional.of(volumeGroups))
                doCreateVfModuleVolumeV2.callRESTQueryAAIVolGrpName(mockExecution,null)
                verify(mockExecution).setVariable("DCVFMODVOLV2_AaiReturnCode",200)
        }
@@@ -250,7 -253,6 +253,7 @@@
                when(mockExecution.getVariable(cloudOwner)).thenReturn(cloudOwner)
                when(mockExecution.getVariable("rollbackData")).thenReturn(new RollbackData())
                doCreateVfModuleVolumeV2.callRESTCreateAAIVolGrpName(mockExecution,null)
 +              verify(mockExecution).setVariable("queriedVolumeGroupId", "volumeGroupId")
        }
  
        @Test