Use getEntity to populate Policy-Related tables

Changes made:
Update SdncBaseModel policy data methods to use getEntity.
Update SdncVFModel to call updated SdncBaseModel policy data methods.
Minor changes in SdncServiceModel.java.
Corresponding junit changes for getEntity migration.

Issue-ID: CCSDK-1456
Change-Id: Idf000bb48896ca4c57d6d1659730e2aea7f49ec4
Signed-off-by: lalena.aria <lalena.aria@att.com>

1 files changed, 3 insertions, 1 deletions

diff --git a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModelTest.java b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModelTest.java
index 95f5a75ec..af17e2291 100644
--- a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModelTest.java
+++ b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncServiceModelTest.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 
 import org.junit.Before;
 import org.junit.Test;
+import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
 import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
 import org.onap.sdc.toscaparser.api.elements.Metadata;
  
@@ -17,13 +18,14 @@ import org.onap.sdc.toscaparser.api.elements.Metadata;
 	@Before
  	public void setUp() throws Exception {
 		ISdcCsarHelper mockCsarHelper = mock(ISdcCsarHelper.class);
+		DBResourceManager mockDBResourceManager = mock(DBResourceManager.class);
 		Metadata mockMetadata = mock(Metadata.class);
 		
 		when(mockCsarHelper.getMetadataPropertyValue(mockMetadata, "UUID")).thenReturn("aaaa-bbbb-cccc-dddd");
 		when(mockCsarHelper.getMetadataPropertyValue(mockMetadata, "invariantUUID")).thenReturn("bbbb-cccc-dddd-eeee");
 		when(mockCsarHelper.getMetadataPropertyValue(mockMetadata, "namingPolicy")).thenReturn("test-naming-policy");
 		
-		testSdncServiceModel = new SdncServiceModel(mockCsarHelper,mockMetadata);
+		testSdncServiceModel = new SdncServiceModel(mockCsarHelper,mockMetadata,mockDBResourceManager);
 
  		assertNotNull(testSdncServiceModel);
  	}