move actors code in drools-applications to policy/models

remove white-space in policy/models

Issue-ID: POLICY-1264

Change-Id: I8856fc7cd2c2a57af0031637870ca33c684bacf5
Signed-off-by: ning.xi <ning.xi@est.tech>

4 files changed, 925 insertions, 0 deletions

diff --git a/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoActorServiceProviderTest.java b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoActorServiceProviderTest.java
new file mode 100644
index 000000000..d0eab120c
--- /dev/null
+++ b/models-interactions/model-actors/actor.so/src/test/java/org/onap/policy/controlloop/actor/so/SoActorServiceProviderTest.java
@@ -0,0 +1,231 @@
+/*
+ * ============LICENSE_START=======================================================
+ * TestSOActorServiceProvider
+ * ================================================================================
+ * Copyright (C) 2018 Ericsson. All rights reserved.
+ * ================================================================================
+ * Modifications Copyright (C) 2018-2019 AT&T. All rights reserved.
+ * Modifications Copyright (C) 2019 Nordix Foundation.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.policy.controlloop.actor.so;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.UUID;
+import org.apache.commons.io.IOUtils;
+import org.junit.Test;
+import org.onap.policy.aai.AaiNqResponse;
+import org.onap.policy.aai.AaiNqResponseWrapper;
+import org.onap.policy.controlloop.ControlLoopOperation;
+import org.onap.policy.controlloop.VirtualControlLoopEvent;
+import org.onap.policy.controlloop.policy.Policy;
+import org.onap.policy.so.SoOperationType;
+import org.onap.policy.so.SoRequest;
+import org.onap.policy.so.SoRequestParameters;
+import org.onap.policy.so.util.Serialization;
+
+public class SoActorServiceProviderTest {
+
+    private static final String VF_MODULE_CREATE = "VF Module Create";
+    private static final String VF_MODULE_DELETE = "VF Module Delete";
+
+    @Test
+    public void testConstructRequest() throws Exception {
+        VirtualControlLoopEvent onset = new VirtualControlLoopEvent();
+        final ControlLoopOperation operation = new ControlLoopOperation();
+        final AaiNqResponseWrapper aaiNqResp = loadAaiResponse(onset, "aai/AaiNqResponse-Full.json");
+
+        final UUID requestId = UUID.randomUUID();
+        onset.setRequestId(requestId);
+
+        Policy policy = new Policy();
+        policy.setActor("Dorothy");
+        policy.setRecipe("GoToOz");
+        
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
+
+        policy.setActor("SO");
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
+
+        policy.setRecipe(VF_MODULE_CREATE);
+
+        // empty policy payload
+        SoRequest request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+        assertNotNull(request);
+
+        assertEquals("my_module_3", request.getRequestDetails().getRequestInfo().getInstanceName());
+        assertEquals("policy", request.getRequestDetails().getRequestInfo().getRequestorId());
+        assertEquals("RegionOne", request.getRequestDetails().getCloudConfiguration().getLcpCloudRegionId());
+
+        // non-empty policy payload
+        policy.setPayload(makePayload());
+        request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+        assertNotNull(request);
+        assertEquals(true, request.getRequestDetails().getRequestParameters().isUsePreload());
+        assertEquals("avalue", request.getRequestDetails().getRequestParameters().getUserParams().get(0).get("akey"));
+        assertEquals(1, request.getRequestDetails().getConfigurationParameters().size());
+        assertEquals("cvalue", request.getRequestDetails().getConfigurationParameters().get(0).get("ckey"));
+        
+        // payload with config, but no request params
+        policy.setPayload(makePayload());
+        policy.getPayload().remove(SoActorServiceProvider.REQ_PARAM_NM);
+        request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+        assertNotNull(request);
+        assertNull(request.getRequestDetails().getRequestParameters());
+        assertNotNull(request.getRequestDetails().getConfigurationParameters());
+        
+        // payload with request, but no config params
+        policy.setPayload(makePayload());
+        policy.getPayload().remove(SoActorServiceProvider.CONFIG_PARAM_NM);
+        request = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+        assertNotNull(request);
+        assertNotNull(request.getRequestDetails().getRequestParameters());
+        assertNull(request.getRequestDetails().getConfigurationParameters());
+
+        // null response
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, null));
+
+        // response has no base VF module
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy,
+                        loadAaiResponse(onset, "aai/AaiNqResponse-NoBase.json")));
+
+        // response has no non-base VF modules (other than the "dummy")
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy,
+                        loadAaiResponse(onset, "aai/AaiNqResponse-NoNonBase.json")));
+
+        policy.setRecipe(VF_MODULE_DELETE);
+        SoRequest deleteRequest = new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp);
+        assertNotNull(deleteRequest);
+        assertEquals(SoOperationType.DELETE_VF_MODULE, deleteRequest.getOperationType());
+
+        /*
+         * NOTE: The remaining tests must be done in order
+         */
+
+        policy.setRecipe(VF_MODULE_CREATE);
+
+        // null tenant
+        aaiNqResp.getAaiNqResponse().getInventoryResponseItems().get(0).getItems().getInventoryResponseItems()
+                        .remove(1);
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
+
+        // null service item
+        aaiNqResp.getAaiNqResponse().getInventoryResponseItems().get(0).getItems().getInventoryResponseItems().get(0)
+                        .setItems(null);
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
+
+        // null response
+        aaiNqResp.setAaiNqResponse(null);
+        assertNull(new SoActorServiceProvider().constructRequest(onset, operation, policy, aaiNqResp));
+    }
+
+    @Test
+    public void testSendRequest() {
+        try {
+            SoActorServiceProvider.sendRequest(UUID.randomUUID().toString(), null, null);
+        } catch (Exception e) {
+            fail("Test should not throw an exception");
+        }
+    }
+
+    @Test
+    public void testMethods() {
+        SoActorServiceProvider sp = new SoActorServiceProvider();
+
+        assertEquals("SO", sp.actor());
+        assertEquals(2, sp.recipes().size());
+        assertEquals(VF_MODULE_CREATE, sp.recipes().get(0));
+        assertEquals(VF_MODULE_DELETE, sp.recipes().get(1));
+        assertEquals(0, sp.recipePayloads(VF_MODULE_CREATE).size());
+        assertEquals(0, sp.recipeTargets("unknown recipe").size());
+        assertEquals(1, sp.recipeTargets(VF_MODULE_CREATE).size());
+    }
+
+    /**
+     * Creates a policy payload containing request & configuration parameters.
+     *
+     * @return the payload
+     */
+    private Map<String, String> makePayload() {
+        Map<String, String> payload = new TreeMap<>();
+
+        payload.put(SoActorServiceProvider.REQ_PARAM_NM, makeReqParams());
+        payload.put(SoActorServiceProvider.CONFIG_PARAM_NM, makeConfigParams());
+
+        return payload;
+    }
+
+    /**
+     * Creates request parameters.
+     *
+     * @return request parameters, encoded as JSON
+     */
+    private String makeReqParams() {
+        SoRequestParameters params = new SoRequestParameters();
+
+        params.setUsePreload(true);
+
+        Map<String, String> map = new TreeMap<>();
+        map.put("akey", "avalue");
+
+        List<Map<String, String>> lst = new LinkedList<>();
+        lst.add(map);
+
+        params.setUserParams(lst);
+
+        return Serialization.gsonPretty.toJson(params);
+    }
+
+    /**
+     * Creates configuration parameters.
+     *
+     * @return configuration parameters, encoded as JSON
+     */
+    private String makeConfigParams() {
+        Map<String, String> map = new TreeMap<>();
+        map.put("ckey", "cvalue");
+
+        List<Map<String, String>> lst = new LinkedList<>();
+        lst.add(map);
+
+        return Serialization.gsonPretty.toJson(lst);
+    }
+
+    /**
+     * Reads an AAI vserver named-query response from a file.
+     *
+     * @param onset the ONSET event
+     * @param fileName name of the file containing the JSON response
+     * @return output from the AAI vserver named-query
+     * @throws IOException if the file cannot be read
+     */
+    private AaiNqResponseWrapper loadAaiResponse(VirtualControlLoopEvent onset, String fileName) throws IOException {
+        String resp = IOUtils.toString(getClass().getResource(fileName), StandardCharsets.UTF_8);
+        AaiNqResponse aaiNqResponse = Serialization.gsonPretty.fromJson(resp, AaiNqResponse.class);
+
+        return new AaiNqResponseWrapper(onset.getRequestId(), aaiNqResponse);
+    }
+}
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
new file mode 100644
index 000000000..af40be948
--- /dev/null
+++ b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-Full.json
@@ -0,0 +1,267 @@
+{
+  "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
new file mode 100644
index 000000000..7101f60f2
--- /dev/null
+++ b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoBase.json
@@ -0,0 +1,230 @@
+{
+  "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
new file mode 100644
index 000000000..a58100bc5
--- /dev/null
+++ b/models-interactions/model-actors/actor.so/src/test/resources/org/onap/policy/controlloop/actor/so/aai/AaiNqResponse-NoNonBase.json
@@ -0,0 +1,197 @@
+{
+  "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": []
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    }
+  ]
+}