From 69a61e338d5e528870085f6d365ae41bfd2cd9a4 Mon Sep 17 00:00:00 2001 From: "Aria, Lalena (la505a)" Date: Fri, 14 Jun 2019 14:58:13 +0000 Subject: Use getEntity to populate VFC and AR tables Changes made: Update SdncARModel to use IEntityDetails instead of NodeTemplate. Update SdncVFCModel to use IEntityDetails instead of Group. Small fixes in SdncVFModuleModel. Corresponding junit changes for getEntity migration. Issue-ID: CCSDK-1367 Change-Id: Ifaf57e9fb22ef87be80bad39948f07bb0a78a6bc Signed-off-by: lalena.aria --- .../sli/northbound/uebclient/SdncARModelTest.java | 12 ++++++++---- .../sli/northbound/uebclient/SdncVFCModelTest.java | 20 +++++++++++++++----- 2 files changed, 23 insertions(+), 9 deletions(-) (limited to 'ueb-listener/src/test') diff --git a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModelTest.java b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModelTest.java index ea6499cd..734dee22 100644 --- a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModelTest.java +++ b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncARModelTest.java @@ -7,9 +7,10 @@ import java.io.IOException; import org.junit.Before; import org.junit.Test; - import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; - import org.onap.sdc.toscaparser.api.NodeTemplate; - import org.onap.ccsdk.sli.core.dblib.DBResourceManager; +import org.onap.sdc.tosca.parser.api.IEntityDetails; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.toscaparser.api.NodeTemplate; +import org.onap.ccsdk.sli.core.dblib.DBResourceManager; public class SdncARModelTest { @@ -19,8 +20,11 @@ import org.junit.Test; public void setUp() throws Exception { ISdcCsarHelper mockCsarHelper = mock(ISdcCsarHelper.class); NodeTemplate nodeTemplate = mock(NodeTemplate.class); + IEntityDetails mockEntityDetails = mock(IEntityDetails.class); DBResourceManager mockDBResourceManager = mock(DBResourceManager.class); - testSdncARModel = new SdncARModel(mockCsarHelper,nodeTemplate,mockDBResourceManager); + SdncUebConfiguration mockSdncUebConfiguration = mock(SdncUebConfiguration.class); + + testSdncARModel = new SdncARModel(mockCsarHelper,mockEntityDetails,mockDBResourceManager,mockSdncUebConfiguration); assertNotNull(testSdncARModel); } diff --git a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModelTest.java b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModelTest.java index 46931235..768eed86 100644 --- a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModelTest.java +++ b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncVFCModelTest.java @@ -10,7 +10,8 @@ import java.util.HashMap; import java.util.ArrayList; import org.junit.Before; -import org.junit.Test; +import org.junit.Test; +import org.onap.sdc.tosca.parser.api.IEntityDetails; import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; import org.onap.sdc.toscaparser.api.NodeTemplate; import org.onap.sdc.toscaparser.api.elements.Metadata; @@ -20,16 +21,20 @@ public class SdncVFCModelTest { SdncVFCModel testSdncVFCModel; NodeTemplate mockVFCNodeTemplate = null; + IEntityDetails mockEntityDetails = null; @Before public void setup() { ISdcCsarHelper mockCsarHelper = mock(ISdcCsarHelper.class); NodeTemplate mockNodeTemplate = mock(NodeTemplate.class); + mockEntityDetails = mock(IEntityDetails.class); mockVFCNodeTemplate = mock(NodeTemplate.class); Metadata mockMetadata = mock(Metadata.class); DBResourceManager mockDBResourceManager = mock(DBResourceManager.class); + SdncUebConfiguration mockSdncUebConfiguration = mock(SdncUebConfiguration.class); when(mockNodeTemplate.getMetaData()).thenReturn(mockMetadata); + when(mockEntityDetails.getMetadata()).thenReturn(mockMetadata); when(mockCsarHelper.getMetadataPropertyValue(mockMetadata, "customizationUUID")).thenReturn("aaaa-bbbb-cccc-dddd"); when(mockCsarHelper.getNodeTemplatePropertyLeafValue(mockNodeTemplate, "nfc_naming_code")).thenReturn("test-nfc-naming-code"); @@ -50,9 +55,14 @@ public class SdncVFCModelTest { cpPropertiesMap.put("cp-node-1", propertiesMap); when(mockCsarHelper.getCpPropertiesFromVfcAsObject(mockVFCNodeTemplate)).thenReturn(cpPropertiesMap); - testSdncVFCModel = new SdncVFCModel(mockCsarHelper, mockNodeTemplate, mockDBResourceManager); - testSdncVFCModel.setVmType("Test-type"); - testSdncVFCModel.setVmCount("5"); + try { + testSdncVFCModel = new SdncVFCModel(mockCsarHelper, mockEntityDetails, mockDBResourceManager, mockSdncUebConfiguration); + testSdncVFCModel.setVmType("Test-type"); + testSdncVFCModel.setVmCount("5"); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } @@ -83,7 +93,7 @@ public class SdncVFCModelTest { @Test public void testInsertVFCtoNetworkRoleMappingData() { try { - testSdncVFCModel.insertVFCtoNetworkRoleMappingData(mockVFCNodeTemplate); + testSdncVFCModel.insertVFCtoNetworkRoleMappingData(mockEntityDetails); } catch (IOException e) { // TODO Auto-generated catch block e.printStackTrace(); -- cgit 1.2.3-korg