From 2d499f6efeaf9f2ee227199fda5e350882861a7b Mon Sep 17 00:00:00 2001
From: "Merkel, Jeff" <jeff.merkel@att.com>
Date: Wed, 26 Jun 2019 11:23:02 -0400
Subject: handle multiple cvnfc configs

- Handle multiple cvnfc configs with the same model uuid.
- Update CvnfcConfigurationCustomization to a List from a Set

Change-Id: I8c026510d813ebb6294a9cedd39d4d4b8f4b9dcf
Issue-ID: SO-2056
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java     | 4 ++--
 .../so/bpmn/infrastructure/workflow/tasks/WorkflowActionUnitTest.java | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'bpmn/so-bpmn-tasks/src/test/java/org/onap')

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 09ba55aac0..afd735ce5d 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -1063,7 +1063,7 @@ public class WorkflowActionTest extends BaseTaskTest {
         vnfVfmoduleCvnfcConfigurationCustomization.setConfigurationResource(configurationResource);
         vnfVfmoduleCvnfcConfigurationCustomization.setModelInstanceName("modelInstanceName1");
         vnfVfmoduleCvnfcConfigurationCustomization.setCvnfcCustomization(cvnfcCustomization);
-        Set<CvnfcConfigurationCustomization> custSet = new HashSet<CvnfcConfigurationCustomization>();
+        List<CvnfcConfigurationCustomization> custSet = new ArrayList<CvnfcConfigurationCustomization>();
         custSet.add(vnfVfmoduleCvnfcConfigurationCustomization);
         cvnfcCustomization.setCvnfcConfigurationCustomization(custSet);
         cvnfcCustomization.setDescription("description");
@@ -1077,7 +1077,7 @@ public class WorkflowActionTest extends BaseTaskTest {
         vnfVfmoduleCvnfcConfigurationCustomization2.setConfigurationResource(configurationResource2);
         vnfVfmoduleCvnfcConfigurationCustomization2.setModelInstanceName("modelInstanceName2");
         vnfVfmoduleCvnfcConfigurationCustomization2.setCvnfcCustomization(cvnfcCustomization2);
-        Set<CvnfcConfigurationCustomization> custSet2 = new HashSet<CvnfcConfigurationCustomization>();
+        List<CvnfcConfigurationCustomization> custSet2 = new ArrayList<CvnfcConfigurationCustomization>();
         custSet2.add(vnfVfmoduleCvnfcConfigurationCustomization2);
         cvnfcCustomization2.setCvnfcConfigurationCustomization(custSet2);
         cvnfcCustomization2.setDescription("description2");
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionUnitTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionUnitTest.java
index 34ad1b0fd4..6b5395ae07 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionUnitTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionUnitTest.java
@@ -89,7 +89,7 @@ public class WorkflowActionUnitTest {
         configuration.setToscaNodeType("FabricConfiguration");
         configuration.setModelUUID("my-uuid");
         vfModuleCustomization.setConfigurationResource(configuration);
-        cvnfcCustomization.setCvnfcConfigurationCustomization(Collections.singleton(vfModuleCustomization));
+        cvnfcCustomization.setCvnfcConfigurationCustomization(Collections.singletonList(vfModuleCustomization));
         List<CvnfcCustomization> cvnfcCustomizations = Arrays.asList(cvnfcCustomization);
         // when(catalogDbClient.getCvnfcCustomizationByVnfCustomizationUUIDAndVfModuleCustomizationUUID(any(String.class),
         // any(String.class)))
-- 
cgit 1.2.3-korg