From: Rob Daugherty <rd472p@att.com>
Date: Mon, 10 Dec 2018 16:20:41 +0000 (+0000)
Subject: Merge "add in volume group model info lookup"
X-Git-Tag: 1.4.1~420
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a578bc0b7df6ec2de62bc1fbd29dea387977b97a;p=so.git

Merge "add in volume group model info lookup"
---

a578bc0b7df6ec2de62bc1fbd29dea387977b97a
diff --cc bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
index 1654aa06de,593154804d..cb63f73c9a
--- a/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/onap/so/bpmn/servicedecomposition/tasks/BBInputSetupTest.java
@@@ -141,9 -138,32 +141,33 @@@ public class BBInputSetupTest 
  	public void setup(){
  		SPY_bbInputSetup.setBbInputSetupUtils(SPY_bbInputSetupUtils);
  		SPY_bbInputSetup.setMapperLayer(bbInputSetupMapperLayer);
 +		SPY_bbInputSetup.setCloudInfoFromAAI(SPY_cloudInfoFromAAI);
  	}
  	
+ 	@Test
+ 	public void testGetVolumeGroupIdRelatedToVfModule() {
+ 		String expected = "volumeGroupId";
+ 		String modelCustomizationId = "modelCustomizationId";
+ 		ModelInfo modelInfo = new ModelInfo();
+ 		modelInfo.setModelCustomizationId(modelCustomizationId);
+ 		String cloudOwner = "cloudOwner";
+ 		String cloudRegionId = "cloudRegionId";
+ 		String volumeGroupId = "volumeGroupId";
+ 		GenericVnf vnf = new GenericVnf();
+ 		VolumeGroup volumeGroup = new VolumeGroup();
+ 		volumeGroup.setVolumeGroupId(expected);
+ 		vnf.getVolumeGroups().add(volumeGroup);
+ 		Map<ResourceKey, String> lookupKeyMap = new HashMap<>();
+ 		lookupKeyMap.put(ResourceKey.VOLUME_GROUP_ID, null);
+ 		org.onap.aai.domain.yang.VolumeGroup aaiVolumeGroup = new org.onap.aai.domain.yang.VolumeGroup();
+ 		aaiVolumeGroup.setModelCustomizationId(modelCustomizationId);
+ 		doReturn(aaiVolumeGroup).when(SPY_bbInputSetupUtils).getAAIVolumeGroup(cloudOwner, cloudRegionId, volumeGroupId);
+ 		
+ 		Optional<String> actual = SPY_bbInputSetup.getVolumeGroupIdRelatedToVfModule(vnf, modelInfo, cloudOwner, cloudRegionId, lookupKeyMap);
+ 		
+ 		assertEquals(expected, actual.get());
+ 	}
+ 	
  	@Test
  	public void testGetAlaCarteServiceInstance() throws Exception {
  		ServiceInstance expected = mapper.readValue(