From ac680dd59dc046d25bd7fa406e003c32b0f08608 Mon Sep 17 00:00:00 2001 From: "Benjamin, Max" Date: Wed, 21 Oct 2020 10:52:20 -0400 Subject: add hasRelationships method to wrapper add hasRelationships method to wrapper Issue-ID: SO-3323 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I8b7b43f8fa367ce2cddf32a5716de11b6238decf --- .../graphinventory/entities/GraphInventoryResultWrapper.java | 10 ++++++++++ .../aaiclient/client/aai/entities/AAIResultWrapperTest.java | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/GraphInventoryResultWrapper.java b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/GraphInventoryResultWrapper.java index 9e6572388b..ae32107339 100644 --- a/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/GraphInventoryResultWrapper.java +++ b/graph-inventory/aai-client/src/main/java/org/onap/aaiclient/client/graphinventory/entities/GraphInventoryResultWrapper.java @@ -28,6 +28,7 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; import org.onap.aaiclient.client.graphinventory.GraphInventoryCommonObjectMapperProvider; +import org.onap.aaiclient.client.graphinventory.GraphInventoryObjectName; import org.onap.so.jsonpath.JsonPathUtil; import org.slf4j.Logger; import com.fasterxml.jackson.core.JsonProcessingException; @@ -63,6 +64,15 @@ public abstract class GraphInventoryResultWrapper rOpt = this.getRelationships(); + if (rOpt.isPresent()) { + return rOpt.get().getRelatedLinks(name).size() > 0; + } else { + return false; + } + } + public Optional getRelationships() { final String path = "$.relationship-list"; if (isEmpty()) { diff --git a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/entities/AAIResultWrapperTest.java b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/entities/AAIResultWrapperTest.java index adc2e7284e..98431759de 100644 --- a/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/entities/AAIResultWrapperTest.java +++ b/graph-inventory/aai-client/src/test/java/org/onap/aaiclient/client/aai/entities/AAIResultWrapperTest.java @@ -21,8 +21,9 @@ package org.onap.aaiclient.client.aai.entities; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.io.IOException; -import java.io.Serializable; import java.nio.file.Files; import java.nio.file.Paths; import java.util.HashMap; @@ -36,6 +37,7 @@ import org.junit.runner.RunWith; import org.mockito.junit.MockitoJUnitRunner; import org.onap.aai.domain.yang.GenericVnf; import org.onap.aaiclient.client.aai.AAICommonObjectMapperProvider; +import org.onap.aaiclient.client.generated.fluentbuilders.AAIFluentTypeBuilder.Types; import org.springframework.util.SerializationUtils; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.type.TypeReference; @@ -107,4 +109,11 @@ public class AAIResultWrapperTest { AAIResultWrapper wrapper = new AAIResultWrapper(new GenericVnf()); assertEquals("{}", wrapper.getJson()); } + + @Test + public void hasRelationshipToTest() { + assertTrue(aaiResultWrapper.hasRelationshipsTo(Types.VCE)); + assertFalse(aaiResultWrapper.hasRelationshipsTo(Types.CLASS_OF_SERVICE)); + + } } -- cgit 1.2.3-korg