From 69c5de8f6d5f4f05e152094bc1e40c03922dcd72 Mon Sep 17 00:00:00 2001 From: Harish Venkata Kajur Date: Fri, 28 Dec 2018 17:25:05 -0500 Subject: Update DBSerializer for relationships retrieving Enhance the code for how the db serializer works when it comes to dealing with the relationships For a particular vertex, when retrieving its relationship vertexes it doesn't need to get all the properties of the relationship vertex as it only cares about the aai-uri and named properties so only partially retrieving those props that is needed for relationships Issue-ID: AAI-1987 Change-Id: I1440c561d187ff180a599a3f52ac5c8715d5c8e3 Signed-off-by: Harish Venkata Kajur --- .../onap/aai/serialization/db/DbSerializerTest.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'aai-core/src/test') diff --git a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java index 5041c7d1..42775cbf 100644 --- a/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java +++ b/aai-core/src/test/java/org/onap/aai/serialization/db/DbSerializerTest.java @@ -47,6 +47,7 @@ import java.net.URI; import java.net.URISyntaxException; import java.util.*; +import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.*; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -714,18 +715,27 @@ public class DbSerializerTest extends AAISetup { @Test public void addRelatedToPropertyTest() throws AAIException { + engine.startTransaction(); + + Vertex gvnf = engine.tx().addVertex("aai-node-type","generic-vnf", + "vnf-id","myname", + "vnf-name","myname", + "aai-uri", "/network/generic-vnfs/generic-vnf/myname" + ); + engine.tx().addVertex("aai-node-type","vnfc","vnfc-name","a-name", "aai-uri", "/network/vnfcs/vnfc/a-name"); Loader loader = loaderFactory.createLoaderForVersion(ModelType.MOXY, schemaVersions.getAppRootVersion()); Introspector gv = loader.introspectorFromName("generic-vnf"); gv.setValue("vnf-name", "myname"); + Introspector rel = loader.introspectorFromName("relationship"); DBSerializer dbser = new DBSerializer(schemaVersions.getAppRootVersion(), dbEngine, ModelType.MOXY, "AAI-TEST"); - dbser.addRelatedToProperty(rel, gv); + dbser.addRelatedToProperty(rel, gvnf, "generic-vnf"); List relToProps = rel.getWrappedListValue("related-to-property"); - assertTrue(relToProps.size() == 1); + assertThat(relToProps.size(), is(1)); Introspector relToProp = relToProps.get(0); - assertTrue("generic-vnf.vnf-name".equals(relToProp.getValue("property-key"))); - assertTrue("myname".equals(relToProp.getValue("property-value"))); + assertThat(relToProp.getValue("property-key"), is("generic-vnf.vnf-name")); + assertThat(relToProp.getValue("property-value"), is("myname")); } @Test -- cgit