From 52670a9e0b450074dfbe0d151925d0133bc8442a Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Sun, 2 Feb 2020 20:04:18 +0200 Subject: Respect owning-entity-id when searching instances by Subscriber Issue-ID: VID-758 Change-Id: Ife6d8679b3ea00d4bb9efb24810b5a50652f5d76 Signed-off-by: Ittay Stern --- .../java/org/onap/vid/services/AaiServiceTest.java | 64 ++++++++++++++++++++-- 1 file changed, 60 insertions(+), 4 deletions(-) (limited to 'vid-app-common/src/test/java/org') diff --git a/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceTest.java b/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceTest.java index 338657b51..12774f431 100644 --- a/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceTest.java +++ b/vid-app-common/src/test/java/org/onap/vid/services/AaiServiceTest.java @@ -20,22 +20,23 @@ package org.onap.vid.services; +import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.arrayWithSize; import static org.hamcrest.Matchers.equalTo; -import static org.mockito.ArgumentMatchers.any; +import static org.hamcrest.Matchers.nullValue; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static org.mockito.Mockito.withSettings; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.ImmutableMap; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Map; import org.mockito.InjectMocks; @@ -44,6 +45,7 @@ import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.onap.vid.aai.AaiClientInterface; import org.onap.vid.aai.AaiResponse; +import org.onap.vid.aai.ServiceInstance; import org.onap.vid.aai.model.AaiGetPnfResponse; import org.onap.vid.aai.model.AaiGetPnfs.Pnf; import org.onap.vid.aai.model.AaiGetTenatns.GetTenantsResponse; @@ -53,7 +55,6 @@ import org.onap.vid.aai.model.RelationshipData; import org.onap.vid.aai.model.RelationshipList; import org.onap.vid.aai.model.ServiceRelationships; import org.onap.vid.model.aaiTree.AAITreeNode; -import org.onap.vid.roles.Role; import org.onap.vid.roles.RoleValidator; import org.onap.vid.roles.RoleValidatorFactory; import org.testng.annotations.BeforeMethod; @@ -220,4 +221,59 @@ public class AaiServiceTest { assertThat(anyMatch, equalTo(expectedMatch)); } + @DataProvider + public static Object[][] dataToDestroy() { + return new Object[][]{ + {"nothing"}, {"relationship-list"}, {"relationship"}, {"relationship-data"} ,{"owning-entity-id"} + }; + } + + + @Test(dataProvider = "dataToDestroy") + public void relatedOwningEntityId_givenInstanceAndOptionalError_extractCorrectlyOrReturnNull(String dataToDestroy) throws JsonProcessingException { + ServiceInstance serviceInstance = new ObjectMapper().readValue(("" + + "{ " + + " \"service-instance-id\": \"5d521981-33be-4bb5-bb20-5616a9c52a5a\", " + + " \"service-instance-name\": \"dfgh\", " + + " \"service-type\": \"\", " + + " \"service-role\": \"\", " + + " \"environment-context\": \"null\", " + + " \"workload-context\": \"null\", " + + " \"model-invariant-id\": \"331a194d-9248-4533-88bc-62c812ccb5c1\", " + + " \"model-version-id\": \"171b3887-e73e-479d-8ef8-2690bf74f2aa\", " + + " \"resource-version\": \"1508832105498\", " + + " \"orchestration-status\": \"Active\", " + + " \"relationship-list\": { " + + " \"relationship\": [ " + + " { " + + " \"related-to\": \"project\", " + + " \"related-link\": \"/aai/v11/business/projects/project/Kennedy\", " + + " \"relationship-data\": [ " + + " { " + + " \"relationship-key\": \"project.project-name\", " + + " \"relationship-value\": \"Kennedy\" " + + " } " + + " ] " + + " }, " + + " { " + + " \"related-to\": \"owning-entity\", " + + " \"related-link\": \"/aai/v11/business/owning-entities/owning-entity/4d4ecf59-41f1-40d4-818d-885234680a42\", " + + " \"relationship-data\": [ " + + " { " + + " \"relationship-key\": \"owning-entity.owning-entity-id\", " + + " \"relationship-value\": \"4d4ecf59-41f1-40d4-818d-885234680a42\" " + + " } " + + " ] " + + " } " + + " ] " + + " } " + + "}").replace(dataToDestroy, "omitted"), ServiceInstance.class); + + if (dataToDestroy.equals("nothing")) { + assertThat(aaiService.relatedOwningEntityId(serviceInstance), is("4d4ecf59-41f1-40d4-818d-885234680a42")); + } else { + assertThat(aaiService.relatedOwningEntityId(serviceInstance), is(nullValue())); + } + } + } -- cgit 1.2.3-korg