Make Actors event-agnostic

Removed event and event-context code from the Actor code.  Also removed
the preprocessing steps from the Actor code, giving the application
complete control over any preprocessing.
Also fixed a bug wherein the APPC actor was treating the
AAI_RESOURCE_VNF property as a String instead of as a GenericVnf.

Issue-ID: POLICY-2746-actor
Change-Id: Ibc05fe39ffedc0bc461abf10e6a960861ac70119
Signed-off-by: Jim Hahn <jrh3@att.com>

9 files changed, 53 insertions, 5043 deletions

diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java
index d2e2872d5..4b05daa23 100644
--- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java
+++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/BasicSoOperation.java
@@ -20,7 +20,6 @@
 
 package org.onap.policy.controlloop.actor.so;
 
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 
 import java.util.Collections;
@@ -29,7 +28,6 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import org.mockito.Mock;
-import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.common.endpoints.event.comm.bus.internal.BusTopicParams;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
 import org.onap.policy.common.endpoints.http.server.HttpServletServerFactoryInstance;
@@ -174,9 +172,4 @@ public abstract class BasicSoOperation extends BasicHttpOperation {
 
         return payload;
     }
-
-    protected AaiCqResponse makeCqResponse() {
-        when(cqResponse.getVfModuleCount(any(), any(), any())).thenReturn(VF_COUNT);
-        return cqResponse;
-    }
 }
diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java
index e9a49545e..6f4ac0ed3 100644
--- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java
+++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoOperationTest.java
@@ -24,12 +24,10 @@ package org.onap.policy.controlloop.actor.so;
 import static org.assertj.core.api.Assertions.assertThatCode;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.time.LocalDateTime;
@@ -37,22 +35,11 @@ import java.time.Month;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.BiConsumer;
-import java.util.function.Supplier;
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.aai.domain.yang.CloudRegion;
-import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.ModelVer;
-import org.onap.aai.domain.yang.ServiceInstance;
-import org.onap.aai.domain.yang.Tenant;
-import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.common.utils.coder.Coder;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.controlloop.ControlLoopOperation;
-import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
-import org.onap.policy.controlloop.actorserviceprovider.OperationProperties;
 import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
 import org.onap.policy.so.SoModelInfo;
@@ -63,13 +50,8 @@ import org.onap.policy.so.SoResponse;
 
 public class SoOperationTest extends BasicSoOperation {
 
-    private static final String VF_COUNT_KEY = SoConstants.VF_COUNT_PREFIX
-                    + "[my-model-customization-id][my-model-invariant-id][my-model-version-id]";
-
     private static final List<String> PROP_NAMES = Collections.emptyList();
 
-    private static final String VERSION_ID = "1.2.3";
-
     private SoOperation oper;
 
     /**
@@ -120,77 +102,6 @@ public class SoOperationTest extends BasicSoOperation {
     }
 
     @Test
-    public void testStartPreprocessorAsync() {
-        assertNotNull(oper.startPreprocessorAsync());
-    }
-
-    @Test
-    public void testObtainVfCount_testGetVfCount_testSetVfCount() throws Exception {
-        // insert CQ data so it's there for the check
-        context.setProperty(AaiCqResponse.CONTEXT_KEY, makeCqResponse());
-
-        // shouldn't actually need to do anything
-        assertNull(oper.obtainVfCount());
-
-        // verify that the count was stored
-        Integer vfcount = context.getProperty(VF_COUNT_KEY);
-        assertEquals(VF_COUNT, vfcount);
-        assertEquals(VF_COUNT.intValue(), oper.getVfCount());
-
-        // change the count and then verify that it isn't overwritten by another call
-        oper.setVfCount(VF_COUNT + 1);
-
-        assertNull(oper.obtainVfCount());
-        vfcount = context.getProperty(VF_COUNT_KEY);
-        assertEquals(VF_COUNT + 1, vfcount.intValue());
-        assertEquals(VF_COUNT + 1, oper.getVfCount());
-    }
-
-    /**
-     * Tests the VF Count methods when properties are being used.
-     * @throws Exception if an error occurs
-     */
-    @Test
-    public void testGetVfCount_testSetVfCount_ViaProperties() throws Exception {
-        oper.setProperty(OperationProperties.DATA_VF_COUNT, VF_COUNT);
-
-        // verify that the count was stored
-        assertEquals(VF_COUNT.intValue(), oper.getVfCount());
-
-        oper.setVfCount(VF_COUNT + 1);
-
-        int count = oper.getProperty(OperationProperties.DATA_VF_COUNT);
-        assertEquals(VF_COUNT + 1, count);
-        assertEquals(VF_COUNT + 1, oper.getVfCount());
-    }
-
-    /**
-     * Tests obtainVfCount() when it actually has to query.
-     */
-    @Test
-    public void testObtainVfCountQuery() throws Exception {
-        CompletableFuture<OperationOutcome> future2 = oper.obtainVfCount();
-        assertNotNull(future2);
-        assertTrue(executor.runAll(100));
-
-        // not done yet
-        assertFalse(future2.isDone());
-
-        provideCqResponse(makeCqResponse());
-
-        assertTrue(executor.runAll(100));
-        assertTrue(future2.isDone());
-        assertEquals(OperationResult.SUCCESS, future2.get().getResult());
-
-        // verify that the count was stored
-        Integer vfcount = context.getProperty(VF_COUNT_KEY);
-        assertEquals(VF_COUNT, vfcount);
-
-        // repeat - shouldn't need to do anything now
-        assertNull(oper.obtainVfCount());
-    }
-
-    @Test
     public void testGetRequestState() {
         SoResponse resp = new SoResponse();
         assertNull(oper.getRequestState(resp));
@@ -295,117 +206,6 @@ public class SoOperationTest extends BasicSoOperation {
     }
 
     @Test
-    public void testGetItem() {
-        AaiCqResponse cq = mock(AaiCqResponse.class);
-        params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, cq);
-
-        // in neither property nor custom query
-        assertThatIllegalArgumentException().isThrownBy(() -> oper.getItem("propA", cq2 -> null, "not found"))
-                        .withMessage("not found");
-
-        // only in custom query
-        assertEquals("valueB", oper.getItem("propB", cq2 -> "valueB", "failureB"));
-
-        // both - should choose the property
-        oper.setProperty("propC", "valueC");
-        assertEquals("valueC", oper.getItem("propC", cq2 -> "valueC2", "failureC"));
-
-        // both - should choose the property, even if it's null
-        oper.setProperty("propD", null);
-        assertNull(oper.getItem("propD", cq2 -> "valueD2", "failureD"));
-    }
-
-    @Test
-    public void testGetVnfItem() {
-        // @formatter:off
-        verifyItems(OperationProperties.AAI_VNF, GenericVnf::new,
-            (cq, instance) -> when(cq.getGenericVnfByVfModuleModelInvariantId(MODEL_INVAR_ID)).thenReturn(instance),
-            () -> oper.getVnfItem(oper.prepareSoModelInfo()),
-            "missing generic VNF");
-        // @formatter:on
-    }
-
-    @Test
-    public void testGetServiceInstance() {
-        // @formatter:off
-        verifyItems(OperationProperties.AAI_SERVICE, ServiceInstance::new,
-            (cq, instance) -> when(cq.getServiceInstance()).thenReturn(instance),
-            () -> oper.getServiceInstance(),
-            "missing VNF Service Item");
-        // @formatter:on
-    }
-
-    @Test
-    public void testGetDefaultTenant() {
-        // @formatter:off
-        verifyItems(OperationProperties.AAI_DEFAULT_TENANT, Tenant::new,
-            (cq, tenant) -> when(cq.getDefaultTenant()).thenReturn(tenant),
-            () -> oper.getDefaultTenant(),
-            "missing Default Tenant Item");
-        // @formatter:on
-    }
-
-    @Test
-    public void testGetVnfModel() {
-        GenericVnf vnf = new GenericVnf();
-        vnf.setModelVersionId(VERSION_ID);
-
-        // @formatter:off
-        verifyItems(OperationProperties.AAI_VNF_MODEL, ModelVer::new,
-            (cq, model) -> when(cq.getModelVerByVersionId(VERSION_ID)).thenReturn(model),
-            () -> oper.getVnfModel(vnf),
-            "missing generic VNF Model");
-        // @formatter:on
-    }
-
-    @Test
-    public void testGetServiceModel() {
-        ServiceInstance service = new ServiceInstance();
-        service.setModelVersionId(VERSION_ID);
-
-        // @formatter:off
-        verifyItems(OperationProperties.AAI_SERVICE_MODEL, ModelVer::new,
-            (cq, model) -> when(cq.getModelVerByVersionId(VERSION_ID)).thenReturn(model),
-            () -> oper.getServiceModel(service),
-            "missing Service Model");
-        // @formatter:on
-    }
-
-    @Test
-    public void testGetDefaultCloudRegion() {
-        // @formatter:off
-        verifyItems(OperationProperties.AAI_DEFAULT_CLOUD_REGION, CloudRegion::new,
-            (cq, region) -> when(cq.getDefaultCloudRegion()).thenReturn(region),
-            () -> oper.getDefaultCloudRegion(),
-            "missing Default Cloud Region");
-        // @formatter:on
-    }
-
-    private <T> void verifyItems(String propName, Supplier<T> maker, BiConsumer<AaiCqResponse, T> setter,
-                    Supplier<T> getter, String errmsg) {
-
-        AaiCqResponse cq = mock(AaiCqResponse.class);
-        params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, cq);
-
-        // in neither property nor custom query
-        assertThatIllegalArgumentException().isThrownBy(getter::get).withMessage(errmsg);
-
-        // only in custom query
-        final T item1 = maker.get();
-        setter.accept(cq, item1);
-        assertSame(item1, getter.get());
-
-        // both - should choose the property
-        final T item2 = maker.get();
-        oper.setProperty(propName, item2);
-        assertSame(item2, getter.get());
-
-        // both - should choose the property, even if it's null
-        oper.setProperty(propName, null);
-        assertNull(getter.get());
-    }
-
-    @Test
     public void testGetCoder() throws CoderException {
         Coder opcoder = oper.getCoder();
 
diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java
index 9d4d00908..8dca7c844 100644
--- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java
+++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleCreateTest.java
@@ -24,39 +24,30 @@ package org.onap.policy.controlloop.actor.so;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
-import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import org.apache.commons.lang3.tuple.Pair;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.mockito.ArgumentCaptor;
 import org.onap.aai.domain.yang.CloudRegion;
 import org.onap.aai.domain.yang.GenericVnf;
 import org.onap.aai.domain.yang.ModelVer;
 import org.onap.aai.domain.yang.ServiceInstance;
 import org.onap.aai.domain.yang.Tenant;
-import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 import org.onap.policy.controlloop.actorserviceprovider.OperationProperties;
 import org.onap.policy.controlloop.actorserviceprovider.OperationResult;
-import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingConfig;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.HttpPollingParams;
 import org.onap.policy.so.SoRequest;
@@ -86,11 +77,15 @@ public class VfModuleCreateTest extends BasicSoOperation {
         destroyAfterClass();
     }
 
-    @Override
+    /**
+     * Sets up.
+     */
     @Before
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         oper = new VfModuleCreate(params, config);
+        loadProperties();
     }
 
     /**
@@ -103,50 +98,11 @@ public class VfModuleCreateTest extends BasicSoOperation {
                         .maxPolls(2).build();
         config = new HttpPollingConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory());
 
-        params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build();
-
-        oper = new VfModuleCreate(params, config);
-
-        outcome = oper.start().get();
-        assertEquals(OperationResult.SUCCESS, outcome.getResult());
-        assertTrue(outcome.getResponse() instanceof SoResponse);
-    }
-
-    /**
-     * Tests "success" case with simulator, using properties instead of custom query data.
-     */
-    @Test
-    public void testSuccessViaProperties() throws Exception {
-        HttpPollingParams opParams = HttpPollingParams.builder().clientName(MY_CLIENT)
-                        .path("serviceInstantiation/v7/serviceInstances").pollPath("orchestrationRequests/v5/")
-                        .maxPolls(2).build();
-        config = new HttpPollingConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory());
-
         params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).preprocessed(true).build();
-        params.getContext().removeProperty(AaiCqResponse.CONTEXT_KEY);
 
         oper = new VfModuleCreate(params, config);
 
-        // set the properties
-        ServiceInstance instance = new ServiceInstance();
-        instance.setServiceInstanceId(SVC_INSTANCE_ID);
-        oper.setProperty(OperationProperties.AAI_SERVICE, instance);
-
-        ModelVer modelVers = new ModelVer();
-        modelVers.setModelName(MODEL_NAME2);
-        modelVers.setModelVersion(MODEL_VERS2);
-
-        oper.setProperty(OperationProperties.AAI_SERVICE_MODEL, modelVers);
-        oper.setProperty(OperationProperties.AAI_VNF_MODEL, modelVers);
-
-        GenericVnf vnf = new GenericVnf();
-        vnf.setVnfId(VNF_ID);
-        oper.setProperty(OperationProperties.AAI_VNF, vnf);
-
-        oper.setProperty(OperationProperties.AAI_DEFAULT_CLOUD_REGION, new CloudRegion());
-        oper.setProperty(OperationProperties.AAI_DEFAULT_TENANT, new Tenant());
-
-        oper.setProperty(OperationProperties.DATA_VF_COUNT, VF_COUNT);
+        loadProperties();
 
         // run the operation
         outcome = oper.start().get();
@@ -185,75 +141,7 @@ public class VfModuleCreateTest extends BasicSoOperation {
     }
 
     @Test
-    public void testStartPreprocessorAsync() throws Exception {
-        // insert CQ data so it's there for the check
-        context.setProperty(AaiCqResponse.CONTEXT_KEY, makeCqResponse());
-
-        AtomicBoolean guardStarted = new AtomicBoolean();
-
-        oper = new VfModuleCreate(params, config) {
-            @Override
-            protected CompletableFuture<OperationOutcome> startGuardAsync() {
-                guardStarted.set(true);
-                return super.startGuardAsync();
-            }
-        };
-
-        CompletableFuture<OperationOutcome> future3 = oper.startPreprocessorAsync();
-        assertNotNull(future3);
-        assertTrue(guardStarted.get());
-    }
-
-    /**
-     * Tests startPreprocessorAsync(), when preprocessing is disabled.
-     */
-    @Test
-    public void testStartPreprocessorAsyncDisabled() {
-        params = params.toBuilder().preprocessed(true).build();
-        assertNull(new VfModuleCreate(params, config).startPreprocessorAsync());
-    }
-
-    @Test
-    public void testStartGuardAsync() throws Exception {
-        // remove CQ data so it's forced to query
-        context.removeProperty(AaiCqResponse.CONTEXT_KEY);
-
-        CompletableFuture<OperationOutcome> future2 = oper.startPreprocessorAsync();
-        assertTrue(executor.runAll(100));
-        assertFalse(future2.isDone());
-
-        provideCqResponse(makeCqResponse());
-        assertTrue(executor.runAll(100));
-        assertTrue(future2.isDone());
-        assertEquals(OperationResult.SUCCESS, future2.get().getResult());
-    }
-
-    @Test
-    public void testMakeGuardPayload() {
-        final int origCount = 30;
-        oper.setVfCount(origCount);
-
-        CompletableFuture<OperationOutcome> future2 = oper.startPreprocessorAsync();
-        assertTrue(executor.runAll(100));
-        assertTrue(future2.isDone());
-
-        // get the payload from the request
-        ArgumentCaptor<ControlLoopOperationParams> captor = ArgumentCaptor.forClass(ControlLoopOperationParams.class);
-        verify(guardOperator).buildOperation(captor.capture());
-
-        Map<String, Object> payload = captor.getValue().getPayload();
-        assertNotNull(payload);
-
-        Integer newCount = (Integer) payload.get(VfModuleCreate.PAYLOAD_KEY_VF_COUNT);
-        assertNotNull(newCount);
-        assertEquals(origCount + 1, newCount.intValue());
-    }
-
-    @Test
     public void testStartOperationAsync_testSuccessfulCompletion() throws Exception {
-        final int origCount = 30;
-        oper.setVfCount(origCount);
-
         when(client.post(any(), any(), any(), any())).thenAnswer(provideResponse(rawResponse));
 
         // use a real executor
@@ -266,6 +154,11 @@ public class VfModuleCreateTest extends BasicSoOperation {
             }
         };
 
+        loadProperties();
+
+        final int origCount = 30;
+        oper.setVfCount(origCount);
+
         CompletableFuture<OperationOutcome> future2 = oper.start();
 
         outcome = future2.get(5, TimeUnit.SECONDS);
@@ -298,6 +191,8 @@ public class VfModuleCreateTest extends BasicSoOperation {
             }
         };
 
+        loadProperties();
+
         CompletableFuture<OperationOutcome> future2 = oper.start();
 
         outcome = future2.get(5, TimeUnit.SECONDS);
@@ -317,29 +212,26 @@ public class VfModuleCreateTest extends BasicSoOperation {
         verifyRequest("vfModuleCreate.json", pair.getRight());
     }
 
-
-    @Override
-    protected void makeContext() {
-        super.makeContext();
-
-        AaiCqResponse cq = mock(AaiCqResponse.class);
-
-        GenericVnf vnf = new GenericVnf();
-        when(cq.getGenericVnfByVfModuleModelInvariantId(MODEL_INVAR_ID)).thenReturn(vnf);
-        vnf.setVnfId(VNF_ID);
-
+    private void loadProperties() {
+        // set the properties
         ServiceInstance instance = new ServiceInstance();
-        when(cq.getServiceInstance()).thenReturn(instance);
         instance.setServiceInstanceId(SVC_INSTANCE_ID);
-
-        when(cq.getDefaultTenant()).thenReturn(new Tenant());
-        when(cq.getDefaultCloudRegion()).thenReturn(new CloudRegion());
+        oper.setProperty(OperationProperties.AAI_SERVICE, instance);
 
         ModelVer modelVers = new ModelVer();
-        when(cq.getModelVerByVersionId(any())).thenReturn(modelVers);
         modelVers.setModelName(MODEL_NAME2);
         modelVers.setModelVersion(MODEL_VERS2);
 
-        params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, cq);
+        oper.setProperty(OperationProperties.AAI_SERVICE_MODEL, modelVers);
+        oper.setProperty(OperationProperties.AAI_VNF_MODEL, modelVers);
+
+        GenericVnf vnf = new GenericVnf();
+        vnf.setVnfId(VNF_ID);
+        oper.setProperty(OperationProperties.AAI_VNF, vnf);
+
+        oper.setProperty(OperationProperties.AAI_DEFAULT_CLOUD_REGION, new CloudRegion());
+        oper.setProperty(OperationProperties.AAI_DEFAULT_TENANT, new Tenant());
+
+        oper.setProperty(OperationProperties.DATA_VF_COUNT, VF_COUNT);
     }
 }
diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java
index 300d73b53..3bce9b0f8 100644
--- a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java
+++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/VfModuleDeleteTest.java
@@ -24,9 +24,7 @@ package org.onap.policy.controlloop.actor.so;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException;
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -47,7 +45,6 @@ import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ForkJoinPool;
 import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javax.ws.rs.client.InvocationCallback;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
@@ -60,10 +57,8 @@ import org.mockito.ArgumentCaptor;
 import org.mockito.Mock;
 import org.onap.aai.domain.yang.CloudRegion;
 import org.onap.aai.domain.yang.GenericVnf;
-import org.onap.aai.domain.yang.ModelVer;
 import org.onap.aai.domain.yang.ServiceInstance;
 import org.onap.aai.domain.yang.Tenant;
-import org.onap.policy.aai.AaiCqResponse;
 import org.onap.policy.common.endpoints.http.client.HttpClientFactoryInstance;
 import org.onap.policy.common.utils.coder.CoderException;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
@@ -77,8 +72,6 @@ import org.onap.policy.so.SoResponse;
 
 public class VfModuleDeleteTest extends BasicSoOperation {
     private static final String EXPECTED_EXCEPTION = "expected exception";
-    private static final String MODEL_NAME2 = "my-model-name-B";
-    private static final String MODEL_VERS2 = "my-model-version-B";
     private static final String SVC_INSTANCE_ID = "my-service-instance-id";
     private static final String VNF_ID = "my-vnf-id";
 
@@ -119,6 +112,8 @@ public class VfModuleDeleteTest extends BasicSoOperation {
         configureResponse(coder.encode(response));
 
         oper = new MyOperation(params, config);
+
+        loadProperties();
     }
 
     /**
@@ -130,42 +125,11 @@ public class VfModuleDeleteTest extends BasicSoOperation {
                         .pollPath("orchestrationRequests/v5/").maxPolls(2).build();
         config = new HttpPollingConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory());
 
-        params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).build();
-
-        oper = new VfModuleDelete(params, config);
-
-        outcome = oper.start().get();
-        assertEquals(OperationResult.SUCCESS, outcome.getResult());
-        assertTrue(outcome.getResponse() instanceof SoResponse);
-    }
-
-    /**
-     * Tests "success" case with simulator, using properties instead of custom query data.
-     */
-    @Test
-    public void testSuccessViaProperties() throws Exception {
-        HttpPollingParams opParams = HttpPollingParams.builder().clientName(MY_CLIENT).path("serviceInstances/v7")
-                        .pollPath("orchestrationRequests/v5/").maxPolls(2).build();
-        config = new HttpPollingConfig(blockingExecutor, opParams, HttpClientFactoryInstance.getClientFactory());
-
         params = params.toBuilder().retry(0).timeoutSec(5).executor(blockingExecutor).preprocessed(true).build();
-        params.getContext().removeProperty(AaiCqResponse.CONTEXT_KEY);
 
         oper = new VfModuleDelete(params, config);
 
-        // set the properties
-        ServiceInstance instance = new ServiceInstance();
-        instance.setServiceInstanceId(SVC_INSTANCE_ID);
-        oper.setProperty(OperationProperties.AAI_SERVICE, instance);
-
-        GenericVnf vnf = new GenericVnf();
-        vnf.setVnfId(VNF_ID);
-        oper.setProperty(OperationProperties.AAI_VNF, vnf);
-
-        oper.setProperty(OperationProperties.AAI_DEFAULT_CLOUD_REGION, new CloudRegion());
-        oper.setProperty(OperationProperties.AAI_DEFAULT_TENANT, new Tenant());
-
-        oper.setProperty(OperationProperties.DATA_VF_COUNT, VF_COUNT);
+        loadProperties();
 
         // run the operation
         outcome = oper.start().get();
@@ -202,75 +166,7 @@ public class VfModuleDeleteTest extends BasicSoOperation {
     }
 
     @Test
-    public void testStartPreprocessorAsync() throws Exception {
-        // insert CQ data so it's there for the check
-        context.setProperty(AaiCqResponse.CONTEXT_KEY, makeCqResponse());
-
-        AtomicBoolean guardStarted = new AtomicBoolean();
-
-        oper = new MyOperation(params, config) {
-            @Override
-            protected CompletableFuture<OperationOutcome> startGuardAsync() {
-                guardStarted.set(true);
-                return super.startGuardAsync();
-            }
-        };
-
-        CompletableFuture<OperationOutcome> future3 = oper.startPreprocessorAsync();
-        assertNotNull(future3);
-        assertTrue(guardStarted.get());
-    }
-
-    /**
-     * Tests startPreprocessorAsync(), when preprocessing is disabled.
-     */
-    @Test
-    public void testStartPreprocessorAsyncDisabled() {
-        params = params.toBuilder().preprocessed(true).build();
-        assertNull(new MyOperation(params, config).startPreprocessorAsync());
-    }
-
-    @Test
-    public void testStartGuardAsync() throws Exception {
-        // remove CQ data so it's forced to query
-        context.removeProperty(AaiCqResponse.CONTEXT_KEY);
-
-        CompletableFuture<OperationOutcome> future2 = oper.startPreprocessorAsync();
-        assertTrue(executor.runAll(100));
-        assertFalse(future2.isDone());
-
-        provideCqResponse(makeCqResponse());
-        assertTrue(executor.runAll(100));
-        assertTrue(future2.isDone());
-        assertEquals(OperationResult.SUCCESS, future2.get().getResult());
-    }
-
-    @Test
-    public void testMakeGuardPayload() {
-        final int origCount = 30;
-        oper.setVfCount(origCount);
-
-        CompletableFuture<OperationOutcome> future2 = oper.startPreprocessorAsync();
-        assertTrue(executor.runAll(100));
-        assertTrue(future2.isDone());
-
-        // get the payload from the request
-        ArgumentCaptor<ControlLoopOperationParams> captor = ArgumentCaptor.forClass(ControlLoopOperationParams.class);
-        verify(guardOperator).buildOperation(captor.capture());
-
-        Map<String, Object> payload = captor.getValue().getPayload();
-        assertNotNull(payload);
-
-        Integer newCount = (Integer) payload.get(VfModuleDelete.PAYLOAD_KEY_VF_COUNT);
-        assertNotNull(newCount);
-        assertEquals(origCount - 1, newCount.intValue());
-    }
-
-    @Test
     public void testStartOperationAsync_testSuccessfulCompletion() throws Exception {
-        final int origCount = 30;
-        oper.setVfCount(origCount);
-
         // use a real executor
         params = params.toBuilder().executor(ForkJoinPool.commonPool()).build();
 
@@ -281,6 +177,11 @@ public class VfModuleDeleteTest extends BasicSoOperation {
             }
         };
 
+        loadProperties();
+
+        final int origCount = 30;
+        oper.setVfCount(origCount);
+
         CompletableFuture<OperationOutcome> future2 = oper.start();
 
         outcome = future2.get(5, TimeUnit.SECONDS);
@@ -315,6 +216,8 @@ public class VfModuleDeleteTest extends BasicSoOperation {
             }
         };
 
+        loadProperties();
+
         CompletableFuture<OperationOutcome> future2 = oper.start();
 
         outcome = future2.get(5, TimeUnit.SECONDS);
@@ -454,32 +357,6 @@ public class VfModuleDeleteTest extends BasicSoOperation {
         assertNotNull(new MyOperation(params, config).makeHttpClient());
     }
 
-
-    @Override
-    protected void makeContext() {
-        super.makeContext();
-
-        AaiCqResponse cq = mock(AaiCqResponse.class);
-
-        GenericVnf vnf = new GenericVnf();
-        when(cq.getGenericVnfByVfModuleModelInvariantId(MODEL_INVAR_ID)).thenReturn(vnf);
-        vnf.setVnfId(VNF_ID);
-
-        ServiceInstance instance = new ServiceInstance();
-        when(cq.getServiceInstance()).thenReturn(instance);
-        instance.setServiceInstanceId(SVC_INSTANCE_ID);
-
-        when(cq.getDefaultTenant()).thenReturn(new Tenant());
-        when(cq.getDefaultCloudRegion()).thenReturn(new CloudRegion());
-
-        ModelVer modelVers = new ModelVer();
-        when(cq.getModelVerByVersionId(any())).thenReturn(modelVers);
-        modelVers.setModelName(MODEL_NAME2);
-        modelVers.setModelVersion(MODEL_VERS2);
-
-        params.getContext().setProperty(AaiCqResponse.CONTEXT_KEY, cq);
-    }
-
     private void initHostPort() {
         when(client.getBaseUrl()).thenReturn("http://my-host:6969/");
     }
@@ -505,4 +382,20 @@ public class VfModuleDeleteTest extends BasicSoOperation {
             return javaClient;
         }
     }
+
+    private void loadProperties() {
+        // set the properties
+        ServiceInstance instance = new ServiceInstance();
+        instance.setServiceInstanceId(SVC_INSTANCE_ID);
+        oper.setProperty(OperationProperties.AAI_SERVICE, instance);
+
+        GenericVnf vnf = new GenericVnf();
+        vnf.setVnfId(VNF_ID);
+        oper.setProperty(OperationProperties.AAI_VNF, vnf);
+
+        oper.setProperty(OperationProperties.AAI_DEFAULT_CLOUD_REGION, new CloudRegion());
+        oper.setProperty(OperationProperties.AAI_DEFAULT_TENANT, new Tenant());
+
+        oper.setProperty(OperationProperties.DATA_VF_COUNT, VF_COUNT);
+    }
 }
diff --git a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json
deleted file mode 100644
index 1aa914422..000000000
--- a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseFull.json
+++ /dev/null
@@ -1,3870 +0,0 @@
-{
-    "results": [
-        {
-            "vserver": {
-                "vserver-id": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                "vserver-name": "Ete_vFWCLvFWSNK_7ba1fbde_0",
-                "vserver-name2": "Ete_vFWCLvFWSNK_7ba1fbde_0",
-                "prov-status": "ACTIVE",
-                "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "resource-version": "1556725250281",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "vnfc",
-                            "relationship-label": "tosca.relationships.HostedOn",
-                            "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vFWCLvFWSNK_7ba1fbde_0",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "vnfc.vnfc-name",
-                                    "relationship-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "generic-vnf",
-                            "relationship-label": "tosca.relationships.HostedOn",
-                            "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "generic-vnf.vnf-id",
-                                    "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "generic-vnf.vnf-name",
-                                    "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "vf-module",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd/vf-modules/vf-module/a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "generic-vnf.vnf-id",
-                                    "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                },
-                                {
-                                    "relationship-key": "vf-module.vf-module-id",
-                                    "relationship-value": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "image",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "image.image-id",
-                                    "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "image.image-name",
-                                    "property-value": "unknown"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "flavor",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "flavor.flavor-id",
-                                    "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "flavor.flavor-name",
-                                    "property-value": "m1.medium"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                "l-interfaces": {
-                    "l-interface": [
-                        {
-                            "interface-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0-vfw_0_int_unprotected_private_port_0-u2lkra6bpz7l",
-                            "interface-id": "bd621b3f-da40-4a8a-a703-3db290295cd9",
-                            "macaddr": "fa:16:3e:0c:27:e4",
-                            "network-name": "4e291560-92f8-4822-9dcf-dd75c04c9617",
-                            "is-port-mirrored": false,
-                            "resource-version": "1556725250653",
-                            "in-maint": false,
-                            "is-ip-unnumbered": false
-                        },
-                        {
-                            "interface-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0-vfw_0_onap_private_port_0-nfvykwarrnxr",
-                            "interface-id": "86bbce7d-51ba-4ad2-a34a-aa2742f9789f",
-                            "macaddr": "fa:16:3e:39:d9:27",
-                            "network-name": "3ef9d123-0d09-4400-8ed0-c0fd5c76aa2b",
-                            "is-port-mirrored": false,
-                            "resource-version": "1556725250531",
-                            "in-maint": false,
-                            "is-ip-unnumbered": false
-                        },
-                        {
-                            "interface-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0-vfw_0_int_protected_private_port_0-bz3hsoxjcgyw",
-                            "interface-id": "b1a8a573-d70d-4b32-b717-21fd6bb549a6",
-                            "macaddr": "fa:16:3e:95:1d:e9",
-                            "network-name": "47cae58a-b052-4f73-8f42-e154c260d5df",
-                            "is-port-mirrored": false,
-                            "resource-version": "1556725250584",
-                            "in-maint": false,
-                            "is-ip-unnumbered": false
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "generic-vnf": {
-                "vnf-id": "f17face5-69cb-4c88-9e0b-7426db7edddd",
-                "vnf-name": "Ete_vFWCLvFWSNK_7ba1fbde_0",
-                "vnf-type": "vFWCL 2019-05-01 15:30:/vFWCL_vFWSNK bbefb8ce-2bde 0",
-                "service-id": "e591441a-e649-4490-82e0-07dac05d674b",
-                "prov-status": "ACTIVE",
-                "orchestration-status": "Active",
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "resource-version": "1556725242259",
-                "model-invariant-id": "bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38",
-                "model-version-id": "189a5070-3bd5-45ac-8a1d-c84ca40b277b",
-                "model-customization-id": "f3733725-19a1-41a0-ba2d-540bf03862a8",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "service-instance",
-                            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                },
-                                {
-                                    "relationship-key": "service-instance.service-instance-id",
-                                    "relationship-value": "7be584e2-0bb2-4126-adaf-ced2c77ca0b3"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "service-instance.service-instance-name",
-                                    "property-value": "Service_Ete_Name7ba1fbde-6187-464a-a62d-d9dd25bdf4e8"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "platform",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/platforms/platform/Platform-Demonstration",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "platform.platform-name",
-                                    "relationship-value": "Platform-Demonstration"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "vserver",
-                            "relationship-label": "tosca.relationships.HostedOn",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/b75ccb62-131b-4e76-adad-28636fc60fb8",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                },
-                                {
-                                    "relationship-key": "vserver.vserver-id",
-                                    "relationship-value": "b75ccb62-131b-4e76-adad-28636fc60fb8"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "vserver.vserver-name",
-                                    "property-value": "demofwl01snkfbde"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "vserver",
-                            "relationship-label": "tosca.relationships.HostedOn",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                },
-                                {
-                                    "relationship-key": "vserver.vserver-id",
-                                    "relationship-value": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "vserver.vserver-name",
-                                    "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                "vf-modules": {
-                    "vf-module": [
-                        {
-                            "vf-module-id": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
-                            "vf-module-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0",
-                            "heat-stack-id": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0/6769f192-0579-4dab-b4e7-170d334c37dd",
-                            "orchestration-status": "active",
-                            "is-base-vf-module": true,
-                            "automated-assignment": false,
-                            "resource-version": "1556725224323",
-                            "model-invariant-id": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
-                            "model-version-id": "94b18b1d-cc91-4f43-911a-e6348665f292",
-                            "model-customization-id": "47958575-138f-452a-8c8d-d89b595f8164",
-                            "module-index": 0,
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/b75ccb62-131b-4e76-adad-28636fc60fb8",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "b75ccb62-131b-4e76-adad-28636fc60fb8"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01snkfbde"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "model-ver": {
-                "model-version-id": "189a5070-3bd5-45ac-8a1d-c84ca40b277b",
-                "model-name": "vFWCL_vFWSNK bbefb8ce-2bde",
-                "model-version": "2.0",
-                "model-description": "vendor software product",
-                "resource-version": "1556724755172",
-                "model-elements": {
-                    "model-element": [
-                        {
-                            "model-element-uuid": "d4dd3710-eb91-4b15-98d7-a8a90fa28f1b",
-                            "new-data-del-flag": "T",
-                            "cardinality": "unbounded",
-                            "resource-version": "1556724755172",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model-ver",
-                                        "relationship-label": "org.onap.relationships.inventory.IsA",
-                                        "related-link": "/aai/v15/service-design-and-creation/models/model/acc6edd8-a8d4-4b93-afaa-0994068be14c/model-vers/model-ver/93a6166f-b3d5-4f06-b4ba-aed48d009ad9",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "acc6edd8-a8d4-4b93-afaa-0994068be14c"
-                                            },
-                                            {
-                                                "relationship-key": "model-ver.model-version-id",
-                                                "relationship-value": "93a6166f-b3d5-4f06-b4ba-aed48d009ad9"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "model-ver.model-name",
-                                                "property-value": "generic-vnf"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "model-element",
-                            "relationship-label": "org.onap.relationships.inventory.IsA",
-                            "related-link": "/aai/v15/service-design-and-creation/models/model/f6937c86-584c-47ae-ad29-8d41d6f0cc7c/model-vers/model-ver/a03b1102-ac3b-44dd-8862-9b94f1951040/model-elements/model-element/aa23fd76-27cf-4dbe-85c7-dca15bec5ca6/model-elements/model-element/f837e297-a5e8-45d8-9ee8-2a1b436dbddb",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "model.model-invariant-id",
-                                    "relationship-value": "f6937c86-584c-47ae-ad29-8d41d6f0cc7c"
-                                },
-                                {
-                                    "relationship-key": "model-ver.model-version-id",
-                                    "relationship-value": "a03b1102-ac3b-44dd-8862-9b94f1951040"
-                                },
-                                {
-                                    "relationship-key": "model-element.model-element-uuid",
-                                    "relationship-value": "aa23fd76-27cf-4dbe-85c7-dca15bec5ca6"
-                                },
-                                {
-                                    "relationship-key": "model-element.model-element-uuid",
-                                    "relationship-value": "f837e297-a5e8-45d8-9ee8-2a1b436dbddb"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "model": {
-                "model-invariant-id": "bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38",
-                "model-type": "resource",
-                "resource-version": "1556724755172",
-                "model-vers": {
-                    "model-ver": [
-                        {
-                            "model-version-id": "189a5070-3bd5-45ac-8a1d-c84ca40b277b",
-                            "model-name": "vFWCL_vFWSNK bbefb8ce-2bde",
-                            "model-version": "1.0",
-                            "model-description": "vendor software product",
-                            "resource-version": "1556724755172",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model-element",
-                                        "relationship-label": "org.onap.relationships.inventory.IsA",
-                                        "related-link": "/aai/v15/service-design-and-creation/models/model/f6937c86-584c-47ae-ad29-8d41d6f0cc7c/model-vers/model-ver/a03b1102-ac3b-44dd-8862-9b94f1951040/model-elements/model-element/aa23fd76-27cf-4dbe-85c7-dca15bec5ca6/model-elements/model-element/f837e297-a5e8-45d8-9ee8-2a1b436dbddb",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "f6937c86-584c-47ae-ad29-8d41d6f0cc7c"
-                                            },
-                                            {
-                                                "relationship-key": "model-ver.model-version-id",
-                                                "relationship-value": "a03b1102-ac3b-44dd-8862-9b94f1951040"
-                                            },
-                                            {
-                                                "relationship-key": "model-element.model-element-uuid",
-                                                "relationship-value": "aa23fd76-27cf-4dbe-85c7-dca15bec5ca6"
-                                            },
-                                            {
-                                                "relationship-key": "model-element.model-element-uuid",
-                                                "relationship-value": "f837e297-a5e8-45d8-9ee8-2a1b436dbddb"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "service-instance": {
-                "service-instance-id": "7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
-                "service-instance-name": "Service_Ete_Name7ba1fbde-6187-464a-a62d-d9dd25bdf4e8",
-                "environment-context": "General_Revenue-Bearing",
-                "workload-context": "Production",
-                "model-invariant-id": "f6937c86-584c-47ae-ad29-8d41d6f0cc7c",
-                "model-version-id": "a03b1102-ac3b-44dd-8862-9b94f1951040",
-                "resource-version": "1556725033469",
-                "orchestration-status": "Active",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "project",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/projects/project/Project-Demonstration",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "project.project-name",
-                                    "relationship-value": "Project-Demonstration"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "owning-entity",
-                            "relationship-label": "org.onap.relationships.inventory.BelongsTo",
-                            "related-link": "/aai/v15/business/owning-entities/owning-entity/fcc64127-06ba-4761-b325-c681f636ad07",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "owning-entity.owning-entity-id",
-                                    "relationship-value": "fcc64127-06ba-4761-b325-c681f636ad07"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "generic-vnf",
-                            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-                            "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9cd7da50-723c-418c-a91d-af2866844a5d",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "generic-vnf.vnf-id",
-                                    "relationship-value": "9cd7da50-723c-418c-a91d-af2866844a5d"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "generic-vnf.vnf-name",
-                                    "property-value": "Ete_vFWCLvPKG_7ba1fbde_1"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "generic-vnf",
-                            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-                            "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "generic-vnf.vnf-id",
-                                    "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "generic-vnf.vnf-name",
-                                    "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "model-ver": {
-                "model-version-id": "a03b1102-ac3b-44dd-8862-9b94f1951040",
-                "model-name": "vFWCL 2019-05-01 15:30:",
-                "model-version": "1.0",
-                "distribution-status": "DISTRIBUTION_COMPLETE_OK",
-                "model-description": "catalog service description",
-                "resource-version": "1556724849102",
-                "model-elements": {
-                    "model-element": [
-                        {
-                            "model-element-uuid": "aa23fd76-27cf-4dbe-85c7-dca15bec5ca6",
-                            "new-data-del-flag": "T",
-                            "cardinality": "unbounded",
-                            "resource-version": "1556724755319",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model-ver",
-                                        "relationship-label": "org.onap.relationships.inventory.IsA",
-                                        "related-link": "/aai/v15/service-design-and-creation/models/model/82194af1-3c2c-485a-8f44-420e22a9eaa4/model-vers/model-ver/46b92144-923a-4d20-b85a-3cbd847668a9",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "82194af1-3c2c-485a-8f44-420e22a9eaa4"
-                                            },
-                                            {
-                                                "relationship-key": "model-ver.model-version-id",
-                                                "relationship-value": "46b92144-923a-4d20-b85a-3cbd847668a9"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "model-ver.model-name",
-                                                "property-value": "service-instance"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "model": {
-                "model-invariant-id": "f6937c86-584c-47ae-ad29-8d41d6f0cc7c",
-                "model-type": "service",
-                "resource-version": "1556724755319",
-                "model-vers": {
-                    "model-ver": [
-                        {
-                            "model-version-id": "a03b1102-ac3b-44dd-8862-9b94f1951040",
-                            "model-name": "vFWCL 2019-05-01 15:30:",
-                            "model-version": "1.0",
-                            "distribution-status": "DISTRIBUTION_COMPLETE_OK",
-                            "model-description": "catalog service description",
-                            "resource-version": "1556724849102"
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "generic-vnf": {
-                "vnf-id": "9cd7da50-723c-418c-a91d-af2866844a5d",
-                "vnf-name": "Ete_vFWCLvPKG_7ba1fbde_1",
-                "vnf-type": "vFWCL 2019-05-01 15:30:/vFWCL_vPKG 5101f6c6-8df3 0",
-                "service-id": "e591441a-e649-4490-82e0-07dac05d674b",
-                "prov-status": "ACTIVE",
-                "orchestration-status": "Active",
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "resource-version": "1556725432402",
-                "model-invariant-id": "9a243c47-fd5f-43d1-bd2a-f17bd12a61f2",
-                "model-version-id": "8f79aa0f-da58-4381-9abf-0d6d1926a1eb",
-                "model-customization-id": "82dd9d05-e056-4c3e-a9b4-8a3d6bd54226",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "service-instance",
-                            "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL/service-instances/service-instance/7be584e2-0bb2-4126-adaf-ced2c77ca0b3",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                },
-                                {
-                                    "relationship-key": "service-instance.service-instance-id",
-                                    "relationship-value": "7be584e2-0bb2-4126-adaf-ced2c77ca0b3"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "service-instance.service-instance-name",
-                                    "property-value": "Service_Ete_Name7ba1fbde-6187-464a-a62d-d9dd25bdf4e8"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "platform",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/platforms/platform/Platform-Demonstration",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "platform.platform-name",
-                                    "relationship-value": "Platform-Demonstration"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "vserver",
-                            "relationship-label": "tosca.relationships.HostedOn",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/80465c73-3481-4d9d-9d3b-ab4016dfffe7",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                },
-                                {
-                                    "relationship-key": "vserver.vserver-id",
-                                    "relationship-value": "80465c73-3481-4d9d-9d3b-ab4016dfffe7"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "vserver.vserver-name",
-                                    "property-value": "demofwl01pgnfbde"
-                                }
-                            ]
-                        }
-                    ]
-                },
-                "vf-modules": {
-                    "vf-module": [
-                        {
-                            "vf-module-id": "04bcd430-e1ef-4da5-a67e-3dd80463a725",
-                            "vf-module-name": "Vfmodule_Ete_vFWCLvPKG_7ba1fbde_1",
-                            "heat-stack-id": "Vfmodule_Ete_vFWCLvPKG_7ba1fbde_1/6f9827e8-68fb-45e9-a19e-e2246a43df14",
-                            "orchestration-status": "active",
-                            "is-base-vf-module": true,
-                            "automated-assignment": false,
-                            "resource-version": "1556725420287",
-                            "model-invariant-id": "4eb0297d-1256-4ba7-9ed4-7bc44b6a0031",
-                            "model-version-id": "bb755929-a025-48cd-b987-59cb4734c059",
-                            "model-customization-id": "bfcebc88-8d57-449d-906c-f508b5bd0fe0",
-                            "module-index": 0,
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/80465c73-3481-4d9d-9d3b-ab4016dfffe7",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "80465c73-3481-4d9d-9d3b-ab4016dfffe7"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01pgnfbde"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "vf-module": {
-                "vf-module-id": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
-                "vf-module-name": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0",
-                "heat-stack-id": "Vfmodule_Ete_vFWCLvFWSNK_7ba1fbde_0/6769f192-0579-4dab-b4e7-170d334c37dd",
-                "orchestration-status": "active",
-                "is-base-vf-module": true,
-                "automated-assignment": false,
-                "resource-version": "1556725224323",
-                "model-invariant-id": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
-                "model-version-id": "94b18b1d-cc91-4f43-911a-e6348665f292",
-                "model-customization-id": "47958575-138f-452a-8c8d-d89b595f8164",
-                "module-index": 0,
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "vserver",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/b75ccb62-131b-4e76-adad-28636fc60fb8",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                },
-                                {
-                                    "relationship-key": "vserver.vserver-id",
-                                    "relationship-value": "b75ccb62-131b-4e76-adad-28636fc60fb8"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "vserver.vserver-name",
-                                    "property-value": "demofwl01snkfbde"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "vserver",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "RegionOne"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                },
-                                {
-                                    "relationship-key": "vserver.vserver-id",
-                                    "relationship-value": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "vserver.vserver-name",
-                                    "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "model-ver": {
-                "model-version-id": "94b18b1d-cc91-4f43-911a-e6348665f292",
-                "model-name": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
-                "model-version": "1",
-                "resource-version": "1556724754936",
-                "model-elements": {
-                    "model-element": [
-                        {
-                            "model-element-uuid": "acdee717-9602-4c9c-acf4-8522b65c7161",
-                            "new-data-del-flag": "T",
-                            "cardinality": "unbounded",
-                            "resource-version": "1556724754936",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model-ver",
-                                        "relationship-label": "org.onap.relationships.inventory.IsA",
-                                        "related-link": "/aai/v15/service-design-and-creation/models/model/ef86f9c5-2165-44f3-8fc3-96018b609ea5/model-vers/model-ver/c00563ae-812b-4e62-8330-7c4d0f47088a",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "ef86f9c5-2165-44f3-8fc3-96018b609ea5"
-                                            },
-                                            {
-                                                "relationship-key": "model-ver.model-version-id",
-                                                "relationship-value": "c00563ae-812b-4e62-8330-7c4d0f47088a"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "model-ver.model-name",
-                                                "property-value": "vf-module"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "model-element",
-                            "relationship-label": "org.onap.relationships.inventory.IsA",
-                            "related-link": "/aai/v15/service-design-and-creation/models/model/bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38/model-vers/model-ver/189a5070-3bd5-45ac-8a1d-c84ca40b277b/model-elements/model-element/d4dd3710-eb91-4b15-98d7-a8a90fa28f1b/model-elements/model-element/d272cfdd-0700-43a9-8cab-b2fcd80c803a",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "model.model-invariant-id",
-                                    "relationship-value": "bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38"
-                                },
-                                {
-                                    "relationship-key": "model-ver.model-version-id",
-                                    "relationship-value": "189a5070-3bd5-45ac-8a1d-c84ca40b277b"
-                                },
-                                {
-                                    "relationship-key": "model-element.model-element-uuid",
-                                    "relationship-value": "d4dd3710-eb91-4b15-98d7-a8a90fa28f1b"
-                                },
-                                {
-                                    "relationship-key": "model-element.model-element-uuid",
-                                    "relationship-value": "d272cfdd-0700-43a9-8cab-b2fcd80c803a"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "model": {
-                "model-invariant-id": "e6130d03-56f1-4b0a-9a1d-e1b2ebc30e0e",
-                "model-type": "resource",
-                "resource-version": "1556724754936",
-                "model-vers": {
-                    "model-ver": [
-                        {
-                            "model-version-id": "94b18b1d-cc91-4f43-911a-e6348665f292",
-                            "model-name": "VfwclVfwsnkBbefb8ce2bde..base_vfw..module-0",
-                            "model-version": "1",
-                            "resource-version": "1556724754936",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "model-element",
-                                        "relationship-label": "org.onap.relationships.inventory.IsA",
-                                        "related-link": "/aai/v15/service-design-and-creation/models/model/bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38/model-vers/model-ver/189a5070-3bd5-45ac-8a1d-c84ca40b277b/model-elements/model-element/d4dd3710-eb91-4b15-98d7-a8a90fa28f1b/model-elements/model-element/d272cfdd-0700-43a9-8cab-b2fcd80c803a",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "model.model-invariant-id",
-                                                "relationship-value": "bbb3cefd-01c8-413c-9bdd-2b92f9ca3d38"
-                                            },
-                                            {
-                                                "relationship-key": "model-ver.model-version-id",
-                                                "relationship-value": "189a5070-3bd5-45ac-8a1d-c84ca40b277b"
-                                            },
-                                            {
-                                                "relationship-key": "model-element.model-element-uuid",
-                                                "relationship-value": "d4dd3710-eb91-4b15-98d7-a8a90fa28f1b"
-                                            },
-                                            {
-                                                "relationship-key": "model-element.model-element-uuid",
-                                                "relationship-value": "d272cfdd-0700-43a9-8cab-b2fcd80c803a"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "tenant": {
-                "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd",
-                "tenant-name": "Integration-SB-00",
-                "resource-version": "1556561749631",
-                "vservers": {
-                    "vserver": [
-                        {
-                            "vserver-id": "f7807a27-1c45-4e79-9e61-6fb33ee4b7e7",
-                            "vserver-name": "Ete_vFWCLvFWSNK_38fbaf46_0",
-                            "vserver-name2": "Ete_vFWCLvFWSNK_38fbaf46_0",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/f7807a27-1c45-4e79-9e61-6fb33ee4b7e7",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556564836725",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/0b34a0bb-84ea-424a-a0ce-a2041e115025",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "0b34a0bb-84ea-424a-a0ce-a2041e115025"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vFWCLvFWSNK_38fbaf46_0",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/0b34a0bb-84ea-424a-a0ce-a2041e115025/vf-modules/vf-module/32a2a6e2-27a4-4995-8e3d-50a65e8bfeb6",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "0b34a0bb-84ea-424a-a0ce-a2041e115025"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "32a2a6e2-27a4-4995-8e3d-50a65e8bfeb6"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "900dc2db-1d65-41ef-8b13-9b9b605cb0bd",
-                            "vserver-name": "vofwl01snkf0ef",
-                            "vserver-name2": "vofwl01snkf0ef",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/900dc2db-1d65-41ef-8b13-9b9b605cb0bd",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556567725997",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9a216ccb-6536-4dc3-a789-0634591342d3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9a216ccb-6536-4dc3-a789-0634591342d3"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvFWSNK_8edbf0ef_1"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01snkf0ef",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01snkf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9a216ccb-6536-4dc3-a789-0634591342d3/vf-modules/vf-module/3ecc64d4-3861-4024-8fd2-d81d2d6e539c",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9a216ccb-6536-4dc3-a789-0634591342d3"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "3ecc64d4-3861-4024-8fd2-d81d2d6e539c"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "cc93aa76-e88d-43a6-8e3b-331918dd3eab",
-                            "vserver-name": "demofwl01pgnaf46",
-                            "vserver-name2": "demofwl01pgnaf46",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/cc93aa76-e88d-43a6-8e3b-331918dd3eab",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556565009305",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01pgnaf46",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "demofwl01pgnaf46"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9fdccaed-6809-457d-9178-9f2187b54e15",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9fdccaed-6809-457d-9178-9f2187b54e15"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWCLvPKG_38fbaf46_1"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9fdccaed-6809-457d-9178-9f2187b54e15/vf-modules/vf-module/475496f6-38d1-43df-a995-64a387f6c788",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9fdccaed-6809-457d-9178-9f2187b54e15"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "475496f6-38d1-43df-a995-64a387f6c788"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "ab342d19-f3e6-420b-8481-ed7f16c43dfa",
-                            "vserver-name": "demofwl01snkaf46",
-                            "vserver-name2": "demofwl01snkaf46",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/ab342d19-f3e6-420b-8481-ed7f16c43dfa",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556564837108",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/0b34a0bb-84ea-424a-a0ce-a2041e115025",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "0b34a0bb-84ea-424a-a0ce-a2041e115025"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01snkaf46",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "demofwl01snkaf46"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/0b34a0bb-84ea-424a-a0ce-a2041e115025/vf-modules/vf-module/32a2a6e2-27a4-4995-8e3d-50a65e8bfeb6",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "0b34a0bb-84ea-424a-a0ce-a2041e115025"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "32a2a6e2-27a4-4995-8e3d-50a65e8bfeb6"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8",
-                            "vserver-name": "vofwl01vfw8ab3",
-                            "vserver-name2": "vofwl01vfw8ab3",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556573557549",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01vfw8ab3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01vfw8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/b2d0096d-8d50-4f05-b603-dfe95b07f1ea",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "b2d0096d-8d50-4f05-b603-dfe95b07f1ea"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvFWSNK_8b908ab3_1"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/b2d0096d-8d50-4f05-b603-dfe95b07f1ea/vf-modules/vf-module/acc2eaad-1127-483a-80d2-ac5de1ec942a",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "b2d0096d-8d50-4f05-b603-dfe95b07f1ea"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "acc2eaad-1127-483a-80d2-ac5de1ec942a"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "91277106-90d3-450d-8a10-9aa9a8727d6e",
-                            "vserver-name": "vofwl01pgnf0ef",
-                            "vserver-name2": "vofwl01pgnf0ef",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/91277106-90d3-450d-8a10-9aa9a8727d6e",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556567540588",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9e34e80d-3995-479c-8c53-54e621840ae0",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9e34e80d-3995-479c-8c53-54e621840ae0"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvPKG_8edbf0ef_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01pgnf0ef",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01pgnf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9e34e80d-3995-479c-8c53-54e621840ae0/vf-modules/vf-module/02e31bf2-8a33-418f-85f4-6b1d2903b3b7",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9e34e80d-3995-479c-8c53-54e621840ae0"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "02e31bf2-8a33-418f-85f4-6b1d2903b3b7"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "801da076-918a-4911-b87c-b44ce62822a9",
-                            "vserver-name": "vofwl01pgn8ab3",
-                            "vserver-name2": "vofwl01pgn8ab3",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/801da076-918a-4911-b87c-b44ce62822a9",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556573356532",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01pgn8ab3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01pgn8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/7f0cccbf-408d-466c-8045-a7fd677bb24f",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "7f0cccbf-408d-466c-8045-a7fd677bb24f"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvPKG_8b908ab3_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/7f0cccbf-408d-466c-8045-a7fd677bb24f/vf-modules/vf-module/1e130341-7ccd-46bc-bf83-3453c1ba5fe3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "7f0cccbf-408d-466c-8045-a7fd677bb24f"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "1e130341-7ccd-46bc-bf83-3453c1ba5fe3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "8a503052-a89c-4035-94ec-b3ab1e157b49",
-                            "vserver-name": "vofwl01vfwf0ef",
-                            "vserver-name2": "vofwl01vfwf0ef",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/8a503052-a89c-4035-94ec-b3ab1e157b49",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556567726399",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9a216ccb-6536-4dc3-a789-0634591342d3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9a216ccb-6536-4dc3-a789-0634591342d3"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvFWSNK_8edbf0ef_1"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01vfwf0ef",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01vfwf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9a216ccb-6536-4dc3-a789-0634591342d3/vf-modules/vf-module/3ecc64d4-3861-4024-8fd2-d81d2d6e539c",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9a216ccb-6536-4dc3-a789-0634591342d3"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "3ecc64d4-3861-4024-8fd2-d81d2d6e539c"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "39a77e27-ced1-444c-a5b6-f73135e09225",
-                            "vserver-name": "vofwl01snk8ab3",
-                            "vserver-name2": "vofwl01snk8ab3",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/39a77e27-ced1-444c-a5b6-f73135e09225",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556573557017",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01snk8ab3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01snk8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/b2d0096d-8d50-4f05-b603-dfe95b07f1ea",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "b2d0096d-8d50-4f05-b603-dfe95b07f1ea"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvFWSNK_8b908ab3_1"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/b2d0096d-8d50-4f05-b603-dfe95b07f1ea/vf-modules/vf-module/acc2eaad-1127-483a-80d2-ac5de1ec942a",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "b2d0096d-8d50-4f05-b603-dfe95b07f1ea"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "acc2eaad-1127-483a-80d2-ac5de1ec942a"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "0e581a27-5184-48b1-88b1-e81c5b5a450c",
-                            "vserver-name": "vofwl01snk8ab3",
-                            "vserver-name2": "vofwl01snk8ab3",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/0e581a27-5184-48b1-88b1-e81c5b5a450c",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556573767443",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01snk8ab3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01snk8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvFWSNK_8b908ab3_2"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073/vf-modules/vf-module/06a08cc1-37a5-4ec6-bb85-e5ee4d69d0f0",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "06a08cc1-37a5-4ec6-bb85-e5ee4d69d0f0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "c103ce57-6662-49e0-a589-ebfd91f05c79",
-                            "vserver-name": "vofwl01vfw8ab3",
-                            "vserver-name2": "vofwl01vfw8ab3",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/c103ce57-6662-49e0-a589-ebfd91f05c79",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556573767717",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/vofwl01vfw8ab3",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "vofwl01vfw8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWDTvFWSNK_8b908ab3_2"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073/vf-modules/vf-module/06a08cc1-37a5-4ec6-bb85-e5ee4d69d0f0",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "7d4ae51b-4d2e-45f7-a0a5-6fd42dc8a073"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "06a08cc1-37a5-4ec6-bb85-e5ee4d69d0f0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "b75ccb62-131b-4e76-adad-28636fc60fb8",
-                            "vserver-name": "demofwl01snkfbde",
-                            "vserver-name2": "demofwl01snkfbde",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/b75ccb62-131b-4e76-adad-28636fc60fb8",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556725250327",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01snkfbde",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "demofwl01snkfbde"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd/vf-modules/vf-module/a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                            "vserver-name": "Ete_vFWCLvFWSNK_7ba1fbde_0",
-                            "vserver-name2": "Ete_vFWCLvFWSNK_7ba1fbde_0",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556725250281",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/Ete_vFWCLvFWSNK_7ba1fbde_0",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/f17face5-69cb-4c88-9e0b-7426db7edddd/vf-modules/vf-module/a6936a82-e340-4fe2-8e3e-b0a10a0001e2",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "f17face5-69cb-4c88-9e0b-7426db7edddd"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "a6936a82-e340-4fe2-8e3e-b0a10a0001e2"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        },
-                        {
-                            "vserver-id": "80465c73-3481-4d9d-9d3b-ab4016dfffe7",
-                            "vserver-name": "demofwl01pgnfbde",
-                            "vserver-name2": "demofwl01pgnfbde",
-                            "prov-status": "ACTIVE",
-                            "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/80465c73-3481-4d9d-9d3b-ab4016dfffe7",
-                            "in-maint": false,
-                            "is-closed-loop-disabled": false,
-                            "resource-version": "1556725436997",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vnfc",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/vnfcs/vnfc/demofwl01pgnfbde",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "vnfc.vnfc-name",
-                                                "relationship-value": "demofwl01pgnfbde"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "generic-vnf",
-                                        "relationship-label": "tosca.relationships.HostedOn",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9cd7da50-723c-418c-a91d-af2866844a5d",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9cd7da50-723c-418c-a91d-af2866844a5d"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "generic-vnf.vnf-name",
-                                                "property-value": "Ete_vFWCLvPKG_7ba1fbde_1"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vf-module",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/9cd7da50-723c-418c-a91d-af2866844a5d/vf-modules/vf-module/04bcd430-e1ef-4da5-a67e-3dd80463a725",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "generic-vnf.vnf-id",
-                                                "relationship-value": "9cd7da50-723c-418c-a91d-af2866844a5d"
-                                            },
-                                            {
-                                                "relationship-key": "vf-module.vf-module-id",
-                                                "relationship-value": "04bcd430-e1ef-4da5-a67e-3dd80463a725"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "image",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "image.image-id",
-                                                "relationship-value": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "image.image-name",
-                                                "property-value": "unknown"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "flavor",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "flavor.flavor-id",
-                                                "relationship-value": "764efb04-5a46-4806-a766-2bdd24559f39"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "flavor.flavor-name",
-                                                "property-value": "m1.medium"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFWCL",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "SDN-ETHERNET-INTERNET"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "Demonstration"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vLB"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vIMS",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "SDN-ETHERNET-INTERNET"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vIMS"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "Demonstration"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vCPE"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFW",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "SDN-ETHERNET-INTERNET"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFW"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/gNB",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "SDN-ETHERNET-INTERNET"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "gNB"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vIMS",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "Demonstration"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vIMS"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/gNB",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "Demonstration"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "gNB"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "Demonstration"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFW"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vLB",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "SDN-ETHERNET-INTERNET"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vLB"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_8568f3da-8821-4600-b95f-6224f15943f7/service-subscriptions/service-subscription/vFWCL",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_8568f3da-8821-4600-b95f-6224f15943f7"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0/service-subscriptions/service-subscription/vFWCL",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "Demonstration"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41/service-subscriptions/service-subscription/vFWDT",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWDT"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPE",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "SDN-ETHERNET-INTERNET"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vCPE"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591/service-subscriptions/service-subscription/vFWDT",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWDT"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2/service-subscriptions/service-subscription/vFWDT",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWDT"
-                                }
-                            ]
-                        },
-                        {
-                            "related-to": "service-subscription",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "customer.global-customer-id",
-                                    "relationship-value": "DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8"
-                                },
-                                {
-                                    "relationship-key": "service-subscription.service-type",
-                                    "relationship-value": "vFWCL"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        },
-        {
-            "cloud-region": {
-                "cloud-owner": "CloudOwner",
-                "cloud-region-id": "RegionOne",
-                "cloud-type": "SharedNode",
-                "owner-defined-type": "OwnerType",
-                "cloud-region-version": "v1",
-                "cloud-zone": "CloudZone",
-                "resource-version": "1556561749631",
-                "tenants": {
-                    "tenant": [
-                        {
-                            "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd",
-                            "tenant-name": "Integration-SB-00",
-                            "resource-version": "1556561749631",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFWCL",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "SDN-ETHERNET-INTERNET"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWCL"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "Demonstration"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vLB"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vIMS",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "SDN-ETHERNET-INTERNET"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vIMS"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vCPE",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "Demonstration"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vCPE"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vFW",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "SDN-ETHERNET-INTERNET"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFW"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/gNB",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "SDN-ETHERNET-INTERNET"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "gNB"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vIMS",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "Demonstration"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vIMS"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/gNB",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "Demonstration"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "gNB"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "Demonstration"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFW"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vLB",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "SDN-ETHERNET-INTERNET"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vLB"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/DemoCust_8568f3da-8821-4600-b95f-6224f15943f7/service-subscriptions/service-subscription/vFWCL",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "DemoCust_8568f3da-8821-4600-b95f-6224f15943f7"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWCL"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0/service-subscriptions/service-subscription/vFWCL",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "DemoCust_38fbaf46-8ae5-4b08-ad4d-2cb552ca2eb0"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWCL"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFWCL",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "Demonstration"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWCL"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41/service-subscriptions/service-subscription/vFWDT",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "DemoCust_8edbf0ef-8460-4965-9e56-7e4637c31a41"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWDT"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPE",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "SDN-ETHERNET-INTERNET"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vCPE"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591/service-subscriptions/service-subscription/vFWDT",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "DemoCust_5dbd369e-2174-430a-9c15-b9a090b99591"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWDT"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2/service-subscriptions/service-subscription/vFWDT",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "DemoCust_8b908ab3-b9e6-41a9-a4e2-31cc9c5114a2"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWDT"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "service-subscription",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/business/customers/customer/DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8/service-subscriptions/service-subscription/vFWCL",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "customer.global-customer-id",
-                                                "relationship-value": "DemoCust_7ba1fbde-6187-464a-a62d-d9dd25bdf4e8"
-                                            },
-                                            {
-                                                "relationship-key": "service-subscription.service-type",
-                                                "relationship-value": "vFWCL"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "flavors": {
-                    "flavor": [
-                        {
-                            "flavor-id": "764efb04-5a46-4806-a766-2bdd24559f39",
-                            "flavor-name": "m1.medium",
-                            "flavor-vcpus": 2,
-                            "flavor-ram": 4096,
-                            "flavor-disk": 40,
-                            "flavor-ephemeral": 0,
-                            "flavor-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/flavors/764efb04-5a46-4806-a766-2bdd24559f39",
-                            "resource-version": "1556564836050",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f7807a27-1c45-4e79-9e61-6fb33ee4b7e7",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "f7807a27-1c45-4e79-9e61-6fb33ee4b7e7"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/900dc2db-1d65-41ef-8b13-9b9b605cb0bd",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "900dc2db-1d65-41ef-8b13-9b9b605cb0bd"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01snkf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/cc93aa76-e88d-43a6-8e3b-331918dd3eab",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "cc93aa76-e88d-43a6-8e3b-331918dd3eab"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01pgnaf46"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/ab342d19-f3e6-420b-8481-ed7f16c43dfa",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "ab342d19-f3e6-420b-8481-ed7f16c43dfa"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01snkaf46"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01vfw8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/91277106-90d3-450d-8a10-9aa9a8727d6e",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "91277106-90d3-450d-8a10-9aa9a8727d6e"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01pgnf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/801da076-918a-4911-b87c-b44ce62822a9",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "801da076-918a-4911-b87c-b44ce62822a9"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01pgn8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/8a503052-a89c-4035-94ec-b3ab1e157b49",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "8a503052-a89c-4035-94ec-b3ab1e157b49"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01vfwf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/39a77e27-ced1-444c-a5b6-f73135e09225",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "39a77e27-ced1-444c-a5b6-f73135e09225"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01snk8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/0e581a27-5184-48b1-88b1-e81c5b5a450c",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "0e581a27-5184-48b1-88b1-e81c5b5a450c"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01snk8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/c103ce57-6662-49e0-a589-ebfd91f05c79",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "c103ce57-6662-49e0-a589-ebfd91f05c79"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01vfw8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/b75ccb62-131b-4e76-adad-28636fc60fb8",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "b75ccb62-131b-4e76-adad-28636fc60fb8"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01snkfbde"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/80465c73-3481-4d9d-9d3b-ab4016dfffe7",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "80465c73-3481-4d9d-9d3b-ab4016dfffe7"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01pgnfbde"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "images": {
-                    "image": [
-                        {
-                            "image-id": "42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                            "image-name": "unknown",
-                            "image-architecture": "unknown",
-                            "image-os-distro": "unknown",
-                            "image-os-version": "unknown",
-                            "application": "unknown",
-                            "application-vendor": "unknown",
-                            "application-version": "unknown",
-                            "image-selflink": "http://10.12.25.2:8774/41d6d38489bd40b09ea8a6b6b852dcbd/images/42fd42f8-cf81-4f4c-a552-d4b124f83b0b",
-                            "resource-version": "1556564834957",
-                            "relationship-list": {
-                                "relationship": [
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f7807a27-1c45-4e79-9e61-6fb33ee4b7e7",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "f7807a27-1c45-4e79-9e61-6fb33ee4b7e7"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_38fbaf46_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/900dc2db-1d65-41ef-8b13-9b9b605cb0bd",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "900dc2db-1d65-41ef-8b13-9b9b605cb0bd"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01snkf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/cc93aa76-e88d-43a6-8e3b-331918dd3eab",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "cc93aa76-e88d-43a6-8e3b-331918dd3eab"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01pgnaf46"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/ab342d19-f3e6-420b-8481-ed7f16c43dfa",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "ab342d19-f3e6-420b-8481-ed7f16c43dfa"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01snkaf46"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "2a9ce7fd-ecae-4301-b2eb-0b3f42df2eb8"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01vfw8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/91277106-90d3-450d-8a10-9aa9a8727d6e",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "91277106-90d3-450d-8a10-9aa9a8727d6e"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01pgnf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/801da076-918a-4911-b87c-b44ce62822a9",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "801da076-918a-4911-b87c-b44ce62822a9"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01pgn8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/8a503052-a89c-4035-94ec-b3ab1e157b49",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "8a503052-a89c-4035-94ec-b3ab1e157b49"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01vfwf0ef"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/39a77e27-ced1-444c-a5b6-f73135e09225",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "39a77e27-ced1-444c-a5b6-f73135e09225"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01snk8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/0e581a27-5184-48b1-88b1-e81c5b5a450c",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "0e581a27-5184-48b1-88b1-e81c5b5a450c"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01snk8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/c103ce57-6662-49e0-a589-ebfd91f05c79",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "c103ce57-6662-49e0-a589-ebfd91f05c79"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "vofwl01vfw8ab3"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/b75ccb62-131b-4e76-adad-28636fc60fb8",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "b75ccb62-131b-4e76-adad-28636fc60fb8"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01snkfbde"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/f953c499-4b1e-426b-8c6d-e9e9f1fc730f",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "f953c499-4b1e-426b-8c6d-e9e9f1fc730f"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "Ete_vFWCLvFWSNK_7ba1fbde_0"
-                                            }
-                                        ]
-                                    },
-                                    {
-                                        "related-to": "vserver",
-                                        "relationship-label": "org.onap.relationships.inventory.Uses",
-                                        "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/41d6d38489bd40b09ea8a6b6b852dcbd/vservers/vserver/80465c73-3481-4d9d-9d3b-ab4016dfffe7",
-                                        "relationship-data": [
-                                            {
-                                                "relationship-key": "cloud-region.cloud-owner",
-                                                "relationship-value": "CloudOwner"
-                                            },
-                                            {
-                                                "relationship-key": "cloud-region.cloud-region-id",
-                                                "relationship-value": "RegionOne"
-                                            },
-                                            {
-                                                "relationship-key": "tenant.tenant-id",
-                                                "relationship-value": "41d6d38489bd40b09ea8a6b6b852dcbd"
-                                            },
-                                            {
-                                                "relationship-key": "vserver.vserver-id",
-                                                "relationship-value": "80465c73-3481-4d9d-9d3b-ab4016dfffe7"
-                                            }
-                                        ],
-                                        "related-to-property": [
-                                            {
-                                                "property-key": "vserver.vserver-name",
-                                                "property-value": "demofwl01pgnfbde"
-                                            }
-                                        ]
-                                    }
-                                ]
-                            }
-                        }
-                    ]
-                },
-                "availability-zones": {
-                    "availability-zone": [
-                        {
-                            "availability-zone-name": "nova",
-                            "hypervisor-type": "KVM",
-                            "operational-status": "Active",
-                            "resource-version": "1556561761360"
-                        }
-                    ]
-                },
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "complex",
-                            "relationship-label": "org.onap.relationships.inventory.LocatedIn",
-                            "related-link": "/aai/v15/cloud-infrastructure/complexes/complex/clli1",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "complex.physical-location-id",
-                                    "relationship-value": "clli1"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        }
-    ]
-}
diff --git a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseMissing.json b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseMissing.json
deleted file mode 100644
index 29f1cdd8f..000000000
--- a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiCqResponseMissing.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "results": [
-    ]
-}
diff --git a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-Full.json b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-Full.json
deleted file mode 100644
index af40be948..000000000
--- a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-Full.json
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-  "inventory-response-item": [
-    {
-      "vserver": {
-        "vserver-id": "6ed3642c-f7a1-4a7c-9290-3d51fe1531eb",
-        "vserver-name": "zdfw1lb01lb02",
-        "vserver-name2": "zdfw1lb01lb02",
-        "prov-status": "ACTIVE",
-        "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/6ed3642c-f7a1-4a7c-9290-3d51fe1531eb",
-        "in-maint": false,
-        "is-closed-loop-disabled": false,
-        "resource-version": "1510606403522"
-      },
-      "extra-properties": {
-        "extra-property": []
-      },
-      "inventory-response-items": {
-        "inventory-response-item": [
-          {
-            "model-name": "vLoadBalancer",
-            "generic-vnf": {
-              "vnf-id": "db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-              "vnf-name": "Vfmodule_vLB1113",
-              "vnf-type": "vLoadBalancer-1106/vLoadBalancer 0",
-              "service-id": "66f157fc-4148-4880-95f5-e120677e98d1",
-              "prov-status": "PREPROV",
-              "in-maint": false,
-              "is-closed-loop-disabled": false,
-              "resource-version": "1510604011851",
-              "model-invariant-id": "cee050ed-92a5-494f-ab04-234307a846dc",
-              "model-version-id": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2"
-            },
-            "extra-properties": {
-              "extra-property": [
-                {
-                  "property-name": "model-ver.model-version-id",
-                  "property-value": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2"
-                },
-                {
-                  "property-name": "model-ver.model-name",
-                  "property-value": "vLoadBalancer"
-                },
-                {
-                  "property-name": "model.model-type",
-                  "property-value": "resource"
-                },
-                {
-                  "property-name": "model.model-invariant-id",
-                  "property-value": "cee050ed-92a5-494f-ab04-234307a846dc"
-                },
-                {
-                  "property-name": "model-ver.model-version",
-                  "property-value": "1.0"
-                }
-              ]
-            },
-            "inventory-response-items": {
-              "inventory-response-item": [
-                {
-                  "model-name": "vLoadBalancer-1106",
-                  "service-instance": {
-                    "service-instance-id": "3b12f31f-8f2d-4f5c-b875-61ff1194b941",
-                    "service-instance-name": "vLoadBalancer-1113",
-                    "resource-version": "1510603936425",
-                    "model-invariant-id": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a",
-                    "model-version-id": "732d4692-4b97-46f9-a996-0b3339e88c50"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "732d4692-4b97-46f9-a996-0b3339e88c50"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "vLoadBalancer-1106"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "service"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1.0"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..base_vlb..module-0",
-                  "vf-module": {
-                    "vf-module-id": "e6b3e3eb-34e1-4c00-b8c1-2a4fbe479b12",
-                    "vf-module-name": "Vfmodule_vLB1113-1",
-                    "heat-stack-id": "Vfmodule_vLB1113-1/3dd6d900-772f-4fcc-a0cb-e250ab2bb4db",
-                    "orchestration-status": "active",
-                    "is-base-vf-module": true,
-                    "resource-version": "1510604612557",
-                    "model-invariant-id": "6d760188-9a24-451a-b05b-e08b86cb94f2",
-                    "model-version-id": "93facad9-55f2-4fe0-9574-814c2bc2d071"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "93facad9-55f2-4fe0-9574-814c2bc2d071"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..base_vlb..module-0"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "6d760188-9a24-451a-b05b-e08b86cb94f2"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "my_module_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "my_module_1",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "my_module_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "my_module_2",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "tenant": {
-              "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd",
-              "tenant-name": "Integration-SB-00",
-              "resource-version": "1509587770200"
-            },
-            "extra-properties": {
-              "extra-property": []
-            },
-            "inventory-response-items": {
-              "inventory-response-item": [
-                {
-                  "cloud-region": {
-                    "cloud-owner": "CloudOwner",
-                    "cloud-region-id": "RegionOne",
-                    "cloud-region-version": "v1",
-                    "resource-version": "1509587770092"
-                  },
-                  "extra-properties": {
-                    "extra-property": []
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoBase.json b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoBase.json
deleted file mode 100644
index 7101f60f2..000000000
--- a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoBase.json
+++ /dev/null
@@ -1,230 +0,0 @@
-{
-  "inventory-response-item": [
-    {
-      "vserver": {
-        "vserver-id": "6ed3642c-f7a1-4a7c-9290-3d51fe1531eb",
-        "vserver-name": "zdfw1lb01lb02",
-        "vserver-name2": "zdfw1lb01lb02",
-        "prov-status": "ACTIVE",
-        "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/6ed3642c-f7a1-4a7c-9290-3d51fe1531eb",
-        "in-maint": false,
-        "is-closed-loop-disabled": false,
-        "resource-version": "1510606403522"
-      },
-      "extra-properties": {
-        "extra-property": []
-      },
-      "inventory-response-items": {
-        "inventory-response-item": [
-          {
-            "model-name": "vLoadBalancer",
-            "generic-vnf": {
-              "vnf-id": "db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-              "vnf-name": "Vfmodule_vLB1113",
-              "vnf-type": "vLoadBalancer-1106/vLoadBalancer 0",
-              "service-id": "66f157fc-4148-4880-95f5-e120677e98d1",
-              "prov-status": "PREPROV",
-              "in-maint": false,
-              "is-closed-loop-disabled": false,
-              "resource-version": "1510604011851",
-              "model-invariant-id": "cee050ed-92a5-494f-ab04-234307a846dc",
-              "model-version-id": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2"
-            },
-            "extra-properties": {
-              "extra-property": [
-                {
-                  "property-name": "model-ver.model-version-id",
-                  "property-value": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2"
-                },
-                {
-                  "property-name": "model-ver.model-name",
-                  "property-value": "vLoadBalancer"
-                },
-                {
-                  "property-name": "model.model-type",
-                  "property-value": "resource"
-                },
-                {
-                  "property-name": "model.model-invariant-id",
-                  "property-value": "cee050ed-92a5-494f-ab04-234307a846dc"
-                },
-                {
-                  "property-name": "model-ver.model-version",
-                  "property-value": "1.0"
-                }
-              ]
-            },
-            "inventory-response-items": {
-              "inventory-response-item": [
-                {
-                  "model-name": "vLoadBalancer-1106",
-                  "service-instance": {
-                    "service-instance-id": "3b12f31f-8f2d-4f5c-b875-61ff1194b941",
-                    "service-instance-name": "vLoadBalancer-1113",
-                    "resource-version": "1510603936425",
-                    "model-invariant-id": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a",
-                    "model-version-id": "732d4692-4b97-46f9-a996-0b3339e88c50"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "732d4692-4b97-46f9-a996-0b3339e88c50"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "vLoadBalancer-1106"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "service"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1.0"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "my_module_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "my_module_1",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "my_module_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "my_module_2",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "tenant": {
-              "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd",
-              "tenant-name": "Integration-SB-00",
-              "resource-version": "1509587770200"
-            },
-            "extra-properties": {
-              "extra-property": []
-            },
-            "inventory-response-items": {
-              "inventory-response-item": [
-                {
-                  "cloud-region": {
-                    "cloud-owner": "CloudOwner",
-                    "cloud-region-id": "RegionOne",
-                    "cloud-region-version": "v1",
-                    "resource-version": "1509587770092"
-                  },
-                  "extra-properties": {
-                    "extra-property": []
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    }
-  ]
-}
diff --git a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoNonBase.json b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoNonBase.json
deleted file mode 100644
index a58100bc5..000000000
--- a/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoNonBase.json
+++ /dev/null
@@ -1,197 +0,0 @@
-{
-  "inventory-response-item": [
-    {
-      "vserver": {
-        "vserver-id": "6ed3642c-f7a1-4a7c-9290-3d51fe1531eb",
-        "vserver-name": "zdfw1lb01lb02",
-        "vserver-name2": "zdfw1lb01lb02",
-        "prov-status": "ACTIVE",
-        "vserver-selflink": "http://10.12.25.2:8774/v2.1/41d6d38489bd40b09ea8a6b6b852dcbd/servers/6ed3642c-f7a1-4a7c-9290-3d51fe1531eb",
-        "in-maint": false,
-        "is-closed-loop-disabled": false,
-        "resource-version": "1510606403522"
-      },
-      "extra-properties": {
-        "extra-property": []
-      },
-      "inventory-response-items": {
-        "inventory-response-item": [
-          {
-            "model-name": "vLoadBalancer",
-            "generic-vnf": {
-              "vnf-id": "db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-              "vnf-name": "Vfmodule_vLB1113",
-              "vnf-type": "vLoadBalancer-1106/vLoadBalancer 0",
-              "service-id": "66f157fc-4148-4880-95f5-e120677e98d1",
-              "prov-status": "PREPROV",
-              "in-maint": false,
-              "is-closed-loop-disabled": false,
-              "resource-version": "1510604011851",
-              "model-invariant-id": "cee050ed-92a5-494f-ab04-234307a846dc",
-              "model-version-id": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2"
-            },
-            "extra-properties": {
-              "extra-property": [
-                {
-                  "property-name": "model-ver.model-version-id",
-                  "property-value": "fd65becc-6b2c-4fe8-ace9-cc29db9a3da2"
-                },
-                {
-                  "property-name": "model-ver.model-name",
-                  "property-value": "vLoadBalancer"
-                },
-                {
-                  "property-name": "model.model-type",
-                  "property-value": "resource"
-                },
-                {
-                  "property-name": "model.model-invariant-id",
-                  "property-value": "cee050ed-92a5-494f-ab04-234307a846dc"
-                },
-                {
-                  "property-name": "model-ver.model-version",
-                  "property-value": "1.0"
-                }
-              ]
-            },
-            "inventory-response-items": {
-              "inventory-response-item": [
-                {
-                  "model-name": "vLoadBalancer-1106",
-                  "service-instance": {
-                    "service-instance-id": "3b12f31f-8f2d-4f5c-b875-61ff1194b941",
-                    "service-instance-name": "vLoadBalancer-1113",
-                    "resource-version": "1510603936425",
-                    "model-invariant-id": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a",
-                    "model-version-id": "732d4692-4b97-46f9-a996-0b3339e88c50"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "732d4692-4b97-46f9-a996-0b3339e88c50"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "vLoadBalancer-1106"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "service"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "1321d60d-f7ff-4300-96c2-6bf0b3268b7a"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1.0"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..base_vlb..module-0",
-                  "vf-module": {
-                    "vf-module-id": "e6b3e3eb-34e1-4c00-b8c1-2a4fbe479b12",
-                    "vf-module-name": "Vfmodule_vLB1113-1",
-                    "heat-stack-id": "Vfmodule_vLB1113-1/3dd6d900-772f-4fcc-a0cb-e250ab2bb4db",
-                    "orchestration-status": "active",
-                    "is-base-vf-module": true,
-                    "resource-version": "1510604612557",
-                    "model-invariant-id": "6d760188-9a24-451a-b05b-e08b86cb94f2",
-                    "model-version-id": "93facad9-55f2-4fe0-9574-814c2bc2d071"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "93facad9-55f2-4fe0-9574-814c2bc2d071"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..base_vlb..module-0"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "6d760188-9a24-451a-b05b-e08b86cb94f2"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                },
-                {
-                  "model-name": "Vloadbalancer..dnsscaling..module-1",
-                  "vf-module": {
-                    "vf-module-id": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "vf-module-name": "dummy_db373a8d-f7be-4d02-8ac8-6ca4c305d144",
-                    "is-base-vf-module": false,
-                    "resource-version": "1510610079687",
-                    "model-invariant-id": "356a1cff-71f2-4086-9980-a2927ce11c1c",
-                    "model-version-id": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                  },
-                  "extra-properties": {
-                    "extra-property": [
-                      {
-                        "property-name": "model-ver.model-version-id",
-                        "property-value": "6b93d804-cfc8-4be3-92cc-9336d135859a"
-                      },
-                      {
-                        "property-name": "model-ver.model-name",
-                        "property-value": "Vloadbalancer..dnsscaling..module-1"
-                      },
-                      {
-                        "property-name": "model.model-type",
-                        "property-value": "resource"
-                      },
-                      {
-                        "property-name": "model.model-invariant-id",
-                        "property-value": "356a1cff-71f2-4086-9980-a2927ce11c1c"
-                      },
-                      {
-                        "property-name": "model-ver.model-version",
-                        "property-value": "1"
-                      }
-                    ]
-                  }
-                }
-              ]
-            }
-          },
-          {
-            "tenant": {
-              "tenant-id": "41d6d38489bd40b09ea8a6b6b852dcbd",
-              "tenant-name": "Integration-SB-00",
-              "resource-version": "1509587770200"
-            },
-            "extra-properties": {
-              "extra-property": []
-            },
-            "inventory-response-items": {
-              "inventory-response-item": [
-                {
-                  "cloud-region": {
-                    "cloud-owner": "CloudOwner",
-                    "cloud-region-id": "RegionOne",
-                    "cloud-region-version": "v1",
-                    "resource-version": "1509587770092"
-                  },
-                  "extra-properties": {
-                    "extra-property": []
-                  }
-                }
-              ]
-            }
-          }
-        ]
-      }
-    }
-  ]
-}