Use the configurationId associated to vnfc if

Use the configurationId associated to vnfc if present.
removing the  autowiring of the Configuration bean class

Issue-ID: SO-2343
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I29f8f9e50ed04014f74b7f6dfaa2cdedb2f334d0

1 files changed, 18 insertions, 0 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
index aac09b4475..1df4ad797f 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionBBTasksTest.java
@@ -417,4 +417,22 @@ public class WorkflowActionBBTasksTest extends BaseTaskTest {
         workflowActionBBTasks.updateInstanceId(execution);
         Mockito.verify(reqMock, Mockito.times(1)).setServiceInstanceId(instanceId);
     }
+
+    @Test
+    public void getConfigurationId() {
+        org.onap.aai.domain.yang.Vnfc vnfc = new org.onap.aai.domain.yang.Vnfc();
+        vnfc.setModelInvariantId("modelInvariantId");
+        vnfc.setVnfcName("testVnfcName");
+        List<org.onap.aai.domain.yang.Configuration> configurations =
+                new ArrayList<org.onap.aai.domain.yang.Configuration>();
+        org.onap.aai.domain.yang.Configuration configuration = new org.onap.aai.domain.yang.Configuration();
+        configuration.setConfigurationId("configurationId");
+        configuration.setModelCustomizationId("modelCustimizationId");
+        configuration.setConfigurationName("testConfigurationName");
+        configurations.add(configuration);
+        doReturn(configurations.get(0).getConfigurationId()).when(workflowActionBBTasks).getConfigurationId(vnfc);
+        assertEquals(workflowActionBBTasks.getConfigurationId(vnfc), "configurationId");
+    }
+
+
 }