Add payload to vFW policy yaml

Added new "streams" payload to vFW policy yaml files.
Removed references to pg-streams.
Also deleted directories that were moved to policy/models.
Also removed references to trafficgenerator.
Updated licenses.
Removed some trailing whitespace.

Change-Id: I6becaa573628eee677f0959fadf86f9a9f032f88
Issue-ID: POLICY-1752
Signed-off-by: Jim Hahn <jrh3@att.com>

12 files changed, 0 insertions, 917 deletions

diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetResponseError.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetResponseError.json
deleted file mode 100644
index 6751fef5c..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetResponseError.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "requestError": {
-        "serviceException": {
-            "messageId": "SVC3001",
-            "text": "Resource not found for %1 using id %2 (msg=%3) (ec=%4)",
-            "variables": [
-                "GET",
-                "network/generic-vnfs/generic-vnf/3f02-f878-436b-870c-f0e91e81570d",
-                "Node Not Found:No Node of type generic-vnf found at: network/generic-vnfs/generic-vnf/3f02-f878-436b-870c-f0e91e81570d",
-                "ERR.5.4.6114"
-            ]
-        }
-    }
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVnfResponse.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVnfResponse.json
deleted file mode 100644
index faa0e0e1b..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVnfResponse.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "in-maint": false,
-    "ipv4-oam-address": "10.0.150.1",
-    "is-closed-loop-disabled": true,
-    "model-customization-id": "6c1a5439-3b77-4d8a-bb2b-9fe7006ad671",
-    "model-invariant-id": "53638a85-361a-437d-8830-4b0d5329225e",
-    "model-version-id": "a82cd55f-1452-4c36-941a-c9f970a3e67c",
-    "nf-function": "",
-    "nf-naming-code": "",
-    "nf-role": "vLB",
-    "nf-type": "",
-    "orchestration-status": "Active",
-    "prov-status": "PROV",
-    "relationship-list": {
-        "relationship": [
-            {
-                "related-link": "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/service-instances/service-instance/b66d24cc-feca-4fdc-8090-2e9539a8bbac",
-                "related-to": "service-instance",
-                "related-to-property": [
-                    {
-                        "property-key": "service-instance.service-instance-name",
-                        "property-value": "vLoadBalancerMS-Service-0809-1"
-                    }
-                ],
-                "relationship-data": [
-                    {
-                        "relationship-key": "customer.global-customer-id",
-                        "relationship-value": "Demonstration"
-                    },
-                    {
-                        "relationship-key": "service-subscription.service-type",
-                        "relationship-value": "vLB"
-                    },
-                    {
-                        "relationship-key": "service-instance.service-instance-id",
-                        "relationship-value": "b66d24cc-feca-4fdc-8090-2e9539a8bbac"
-                    }
-                ]
-            },
-            {
-                "related-link": "/aai/v11/business/lines-of-business/line-of-business/Test-Business",
-                "related-to": "line-of-business",
-                "relationship-data": [
-                    {
-                        "relationship-key": "line-of-business.line-of-business-name",
-                        "relationship-value": "Test-Business"
-                    }
-                ]
-            },
-            {
-                "related-link": "/aai/v11/business/platforms/platform/Test-Platform",
-                "related-to": "platform",
-                "relationship-data": [
-                    {
-                        "relationship-key": "platform.platform-name",
-                        "relationship-value": "Test-Platform"
-                    }
-                ]
-            },
-            {
-                "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/4086f396c5e04caf9502c5fdeca575c4/vservers/vserver/191729bd-cb1d-485d-aa06-b20c888272a8",
-                "related-to": "vserver",
-                "related-to-property": [
-                    {
-                        "property-key": "vserver.vserver-name",
-                        "property-value": "vdns-ms01-0809-1"
-                    }
-                ],
-                "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": "4086f396c5e04caf9502c5fdeca575c4"
-                    },
-                    {
-                        "relationship-key": "vserver.vserver-id",
-                        "relationship-value": "191729bd-cb1d-485d-aa06-b20c888272a8"
-                    }
-                ]
-            },
-            {
-                "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/4086f396c5e04caf9502c5fdeca575c4/vservers/vserver/1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-                "related-to": "vserver",
-                "related-to-property": [
-                    {
-                        "property-key": "vserver.vserver-name",
-                        "property-value": "vlb-ms-0809-1"
-                    }
-                ],
-                "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": "4086f396c5e04caf9502c5fdeca575c4"
-                    },
-                    {
-                        "relationship-key": "vserver.vserver-id",
-                        "relationship-value": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-                    }
-                ]
-            }
-        ]
-    },
-    "resource-version": "1533850960381",
-    "service-id": "50e1b0be-e0c9-48e2-9f42-15279a783ee8",
-    "vnf-id": "807a3f02-f878-436b-870c-f0e91e81570d",
-    "vnf-name": "vLoadBalancerMS-Vnf-0809-2",
-    "vnf-type": "vLoadBalancerMS/vLoadBalancerMS 0"
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVserverResponse.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVserverResponse.json
deleted file mode 100644
index 19885942e..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVserverResponse.json
+++ /dev/null
@@ -1,82 +0,0 @@
-{
-    "vserver": [
-        {
-            "in-maint": false,
-            "is-closed-loop-disabled": true,
-            "prov-status": "ACTIVE",
-            "relationship-list": {
-                "relationship": [
-                    {
-                        "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/807a3f02-f878-436b-870c-f0e91e81570d",
-                        "related-to": "generic-vnf",
-                        "related-to-property": [
-                            {
-                                "property-key": "generic-vnf.vnf-name",
-                                "property-value": "vLoadBalancerMS-Vnf-0809-2"
-                            }
-                        ],
-                        "relationship-data": [
-                            {
-                                "relationship-key": "generic-vnf.vnf-id",
-                                "relationship-value": "807a3f02-f878-436b-870c-f0e91e81570d"
-                            }
-                        ]
-                    },
-                    {
-                        "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/6e219e86-cd94-4989-9119-def29aa10b12",
-                        "related-to": "image",
-                        "related-to-property": [
-                            {
-                                "property-key": "image.image-name",
-                                "property-value": "unknown"
-                            }
-                        ],
-                        "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": "6e219e86-cd94-4989-9119-def29aa10b12"
-                            }
-                        ]
-                    },
-                    {
-                        "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                        "related-to": "flavor",
-                        "related-to-property": [
-                            {
-                                "property-key": "flavor.flavor-name",
-                                "property-value": "m1.medium"
-                            }
-                        ],
-                        "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"
-                            }
-                        ]
-                    }
-                ]
-            },
-            "resource-version": "1533850964910",
-            "vserver-id": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-            "vserver-name": "vlb-ms-0809-1",
-            "vserver-name2": "vlb-ms-0809-7",
-            "vserver-selflink": "http://localhost:8774/v2.1/4086f396c5e04caf9502c5fdeca575c4/servers/1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-        }
-    ]
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoItems.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoItems.json
deleted file mode 100644
index 996692402..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoItems.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-    "inventory-response-item": [
-        {
-            "extra-properties": {},
-            "inventory-response-items": {
-                "inventory-response-item": [
-                    {
-                        "extra-properties": {
-                            "extra-property": [
-                                {
-                                    "property-name": "model-ver.model-version-id",
-                                    "property-value": "a82cd55f-1452-4c36-941a-c9f970a3e67c"
-                                },
-                                {
-                                    "property-name": "model-ver.model-name",
-                                    "property-value": "vLoadBalancerMS"
-                                },
-                                {
-                                    "property-name": "model.model-type",
-                                    "property-value": "resource"
-                                },
-                                {
-                                    "property-name": "model.model-invariant-id",
-                                    "property-value": "53638a85-361a-437d-8830-4b0d5329225e"
-                                },
-                                {
-                                    "property-name": "model-ver.model-version",
-                                    "property-value": "1.0"
-                                }
-                            ]
-                        },
-                        "generic-vnf": {
-                            "in-maint": false,
-                            "ipv4-oam-address": "10.0.150.1",
-                            "is-closed-loop-disabled": false,
-                            "model-customization-id": "6c1a5439-3b77-4d8a-bb2b-9fe7006ad671",
-                            "model-invariant-id": "53638a85-361a-437d-8830-4b0d5329225e",
-                            "model-version-id": "a82cd55f-1452-4c36-941a-c9f970a3e67c",
-                            "nf-function": "",
-                            "nf-naming-code": "",
-                            "nf-role": "vLB",
-                            "nf-type": "",
-                            "orchestration-status": "Active",
-                            "prov-status": "PROV",
-                            "resource-version": "1533850960381",
-                            "service-id": "50e1b0be-e0c9-48e2-9f42-15279a783ee8",
-                            "vnf-id": "807a3f02-f878-436b-870c-f0e91e81570d",
-                            "vnf-name": "vLoadBalancerMS-Vnf-0809-2",
-                            "vnf-type": "vLoadBalancerMS/vLoadBalancerMS 0"
-                        },
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                            ]
-                        },
-                        "model-name": "vLoadBalancerMS"
-                    },
-                    {
-                        "extra-properties": {},
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "cloud-region": {
-                                        "cloud-owner": "CloudOwner",
-                                        "cloud-region-id": "RegionOne",
-                                        "cloud-region-version": "v2.5",
-                                        "cloud-type": "openstack",
-                                        "cloud-zone": "zone-1",
-                                        "owner-defined-type": "owner type",
-                                        "resource-version": "1533652058185",
-                                        "sriov-automation": false
-                                    },
-                                    "extra-properties": {}
-                                }
-                            ]
-                        },
-                        "tenant": {
-                            "resource-version": "1533652058206",
-                            "tenant-id": "4086f396c5e04caf9502c5fdeca575c4",
-                            "tenant-name": "PFPP"
-                        }
-                    }
-                ]
-            },
-            "vserver": {
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "prov-status": "ACTIVE",
-                "resource-version": "1533850964910",
-                "vserver-id": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-                "vserver-name": "vlb-ms-0809-1",
-                "vserver-name2": "vlb-ms-0809-1",
-                "vserver-selflink": "http://10.12.25.2:8774/v2.1/4086f396c5e04caf9502c5fdeca575c4/servers/1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-            }
-        }
-    ]
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoModules.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoModules.json
deleted file mode 100644
index 2dd6090c7..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoModules.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "inventory-response-item": [
-        {
-            "extra-properties": {},
-            "inventory-response-items": {
-                "inventory-response-item": [
-                    {
-                        "extra-properties": {
-                            "extra-property": [
-                                {
-                                    "property-name": "model-ver.model-version-id",
-                                    "property-value": "a82cd55f-1452-4c36-941a-c9f970a3e67c"
-                                },
-                                {
-                                    "property-name": "model-ver.model-name",
-                                    "property-value": "vLoadBalancerMS"
-                                },
-                                {
-                                    "property-name": "model.model-type",
-                                    "property-value": "resource"
-                                },
-                                {
-                                    "property-name": "model.model-invariant-id",
-                                    "property-value": "53638a85-361a-437d-8830-4b0d5329225e"
-                                },
-                                {
-                                    "property-name": "model-ver.model-version",
-                                    "property-value": "1.0"
-                                }
-                            ]
-                        },
-                        "generic-vnf": {
-                            "in-maint": false,
-                            "ipv4-oam-address": "10.0.150.1",
-                            "is-closed-loop-disabled": false,
-                            "model-customization-id": "6c1a5439-3b77-4d8a-bb2b-9fe7006ad671",
-                            "model-invariant-id": "53638a85-361a-437d-8830-4b0d5329225e",
-                            "model-version-id": "a82cd55f-1452-4c36-941a-c9f970a3e67c",
-                            "nf-function": "",
-                            "nf-naming-code": "",
-                            "nf-role": "vLB",
-                            "nf-type": "",
-                            "orchestration-status": "Active",
-                            "prov-status": "PROV",
-                            "resource-version": "1533850960381",
-                            "service-id": "50e1b0be-e0c9-48e2-9f42-15279a783ee8",
-                            "vnf-id": "807a3f02-f878-436b-870c-f0e91e81570d",
-                            "vnf-name": "vLoadBalancerMS-Vnf-0809-2",
-                            "vnf-type": "vLoadBalancerMS/vLoadBalancerMS 0"
-                        },
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "extra-properties": {
-                                        "extra-property": [
-                                            {
-                                                "property-name": "model-ver.model-version-id",
-                                                "property-value": "4feb459d-d8ef-4cde-a714-235c79787962"
-                                            },
-                                            {
-                                                "property-name": "model-ver.model-name",
-                                                "property-value": "vLoadBalancerMS"
-                                            },
-                                            {
-                                                "property-name": "model.model-type",
-                                                "property-value": "service"
-                                            },
-                                            {
-                                                "property-name": "model.model-invariant-id",
-                                                "property-value": "b5477216-9b7d-4e75-8777-5b632d406759"
-                                            },
-                                            {
-                                                "property-name": "model-ver.model-version",
-                                                "property-value": "1.0"
-                                            }
-                                        ]
-                                    },
-                                    "model-name": "vLoadBalancerMS",
-                                    "service-instance": {
-                                        "environment-context": "General_Revenue-Bearing",
-                                        "model-invariant-id": "b5477216-9b7d-4e75-8777-5b632d406759",
-                                        "model-version-id": "4feb459d-d8ef-4cde-a714-235c79787962",
-                                        "orchestration-status": "Active",
-                                        "resource-version": "1533848425145",
-                                        "service-instance-id": "b66d24cc-feca-4fdc-8090-2e9539a8bbac",
-                                        "service-instance-name": "vLoadBalancerMS-Service-0809-1",
-                                        "workload-context": "Production"
-                                    }
-                                }
-                            ]
-                        },
-                        "model-name": "vLoadBalancerMS"
-                    },
-                    {
-                        "extra-properties": {},
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "cloud-region": {
-                                        "cloud-owner": "CloudOwner",
-                                        "cloud-region-id": "RegionOne",
-                                        "cloud-region-version": "v2.5",
-                                        "cloud-type": "openstack",
-                                        "cloud-zone": "zone-1",
-                                        "owner-defined-type": "owner type",
-                                        "resource-version": "1533652058185",
-                                        "sriov-automation": false
-                                    },
-                                    "extra-properties": {}
-                                }
-                            ]
-                        },
-                        "tenant": {
-                            "resource-version": "1533652058206",
-                            "tenant-id": "4086f396c5e04caf9502c5fdeca575c4",
-                            "tenant-name": "PFPP"
-                        }
-                    }
-                ]
-            },
-            "vserver": {
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "prov-status": "ACTIVE",
-                "resource-version": "1533850964910",
-                "vserver-id": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-                "vserver-name": "vlb-ms-0809-1",
-                "vserver-name2": "vlb-ms-0809-1",
-                "vserver-selflink": "http://10.12.25.2:8774/v2.1/4086f396c5e04caf9502c5fdeca575c4/servers/1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-            }
-        }
-    ]
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoNames.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoNames.json
deleted file mode 100644
index 9c1a9bc5d..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-NoNames.json
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-    "inventory-response-item": [
-        {
-            "extra-properties": {},
-            "inventory-response-items": {
-                "inventory-response-item": [
-                    {
-                        "extra-properties": {
-                            "extra-property": [
-                                {
-                                    "property-name": "model-ver.model-version-id",
-                                    "property-value": "a82cd55f-1452-4c36-941a-c9f970a3e67c"
-                                },
-                                {
-                                    "property-name": "model-ver.model-name",
-                                    "property-value": "vLoadBalancerMS"
-                                },
-                                {
-                                    "property-name": "model.model-type",
-                                    "property-value": "resource"
-                                },
-                                {
-                                    "property-name": "model.model-invariant-id",
-                                    "property-value": "53638a85-361a-437d-8830-4b0d5329225e"
-                                },
-                                {
-                                    "property-name": "model-ver.model-version",
-                                    "property-value": "1.0"
-                                }
-                            ]
-                        },
-                        "generic-vnf": {
-                            "in-maint": false,
-                            "ipv4-oam-address": "10.0.150.1",
-                            "is-closed-loop-disabled": false,
-                            "model-customization-id": "6c1a5439-3b77-4d8a-bb2b-9fe7006ad671",
-                            "model-invariant-id": "53638a85-361a-437d-8830-4b0d5329225e",
-                            "model-version-id": "a82cd55f-1452-4c36-941a-c9f970a3e67c",
-                            "nf-function": "",
-                            "nf-naming-code": "",
-                            "nf-role": "vLB",
-                            "nf-type": "",
-                            "orchestration-status": "Active",
-                            "prov-status": "PROV",
-                            "resource-version": "1533850960381",
-                            "service-id": "50e1b0be-e0c9-48e2-9f42-15279a783ee8",
-                            "vnf-id": "807a3f02-f878-436b-870c-f0e91e81570d",
-                            "vnf-name": "vLoadBalancerMS-Vnf-0809-2",
-                            "vnf-type": "vLoadBalancerMS/vLoadBalancerMS 0"
-                        },
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "model-name": "vLoadBalancerMS",
-                                    "service-instance": {
-                                        "environment-context": "General_Revenue-Bearing",
-                                        "model-invariant-id": "b5477216-9b7d-4e75-8777-5b632d406759",
-                                        "model-version-id": "4feb459d-d8ef-4cde-a714-235c79787962",
-                                        "orchestration-status": "Active",
-                                        "resource-version": "1533848425145",
-                                        "service-instance-id": "b66d24cc-feca-4fdc-8090-2e9539a8bbac",
-                                        "service-instance-name": "vLoadBalancerMS-Service-0809-1",
-                                        "workload-context": "Production"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "is-base-vf-module": false,
-                                        "model-invariant-id": "6d01b7f1-769a-4080-b8ea-57fd03ef1572",
-                                        "model-version-id": "3302088a-457e-496c-9282-2eb3d5b8dd24",
-                                        "resource-version": "1534270663202",
-                                        "vf-module-id": "dummy_807a3f02-f878-436b-870c-f0e91e81570d",
-                                        "vf-module-name": "dummy_807a3f02-f878-436b-870c-f0e91e81570d"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "heat-stack-id": "Vfmodule_vLBMS-0809-1/83ab2394-2b22-40f9-8ba2-383698dd2958",
-                                        "is-base-vf-module": true,
-                                        "model-customization-id": "5198f732-8f22-48f9-98f8-d6b8b50118be",
-                                        "model-invariant-id": "1f566a81-58ba-4762-81f9-d2259509429a",
-                                        "model-version-id": "94827d25-4ac3-4850-abfc-7b6e3c531db4",
-                                        "module-index": 0,
-                                        "orchestration-status": "active",
-                                        "resource-version": "1533850416834",
-                                        "vf-module-id": "b861467d-d3a7-4b21-81b3-94d928a7e8b7",
-                                        "vf-module-name": "Vfmodule_vLBMS-0809-1"
-                                    }
-                                }
-                            ]
-                        },
-                        "model-name": "vLoadBalancerMS"
-                    },
-                    {
-                        "extra-properties": {},
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "cloud-region": {
-                                        "cloud-owner": "CloudOwner",
-                                        "cloud-region-id": "RegionOne",
-                                        "cloud-region-version": "v2.5",
-                                        "cloud-type": "openstack",
-                                        "cloud-zone": "zone-1",
-                                        "owner-defined-type": "owner type",
-                                        "resource-version": "1533652058185",
-                                        "sriov-automation": false
-                                    },
-                                    "extra-properties": {}
-                                }
-                            ]
-                        },
-                        "tenant": {
-                            "resource-version": "1533652058206",
-                            "tenant-id": "4086f396c5e04caf9502c5fdeca575c4",
-                            "tenant-name": "PFPP"
-                        }
-                    }
-                ]
-            },
-            "vserver": {
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "prov-status": "ACTIVE",
-                "resource-version": "1533850964910",
-                "vserver-id": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-                "vserver-name": "vlb-ms-0809-1",
-                "vserver-name2": "vlb-ms-0809-1",
-                "vserver-selflink": "http://10.12.25.2:8774/v2.1/4086f396c5e04caf9502c5fdeca575c4/servers/1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-            }
-        }
-    ]
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-Vserver.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-Vserver.json
deleted file mode 100644
index fb341dc65..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqResponseWrapper-Vserver.json
+++ /dev/null
@@ -1,157 +0,0 @@
-{
-    "inventory-response-item": [
-        {
-            "extra-properties": {},
-            "inventory-response-items": {
-                "inventory-response-item": [
-                    {
-                        "extra-properties": {
-                            "extra-property": [
-                                {
-                                    "property-name": "model-ver.model-version-id",
-                                    "property-value": "a82cd55f-1452-4c36-941a-c9f970a3e67c"
-                                },
-                                {
-                                    "property-name": "model-ver.model-name",
-                                    "property-value": "vLoadBalancerMS"
-                                },
-                                {
-                                    "property-name": "model.model-type",
-                                    "property-value": "resource"
-                                },
-                                {
-                                    "property-name": "model.model-invariant-id",
-                                    "property-value": "53638a85-361a-437d-8830-4b0d5329225e"
-                                },
-                                {
-                                    "property-name": "model-ver.model-version",
-                                    "property-value": "1.0"
-                                }
-                            ]
-                        },
-                        "generic-vnf": {
-                            "in-maint": false,
-                            "ipv4-oam-address": "10.0.150.1",
-                            "is-closed-loop-disabled": false,
-                            "model-customization-id": "6c1a5439-3b77-4d8a-bb2b-9fe7006ad671",
-                            "model-invariant-id": "53638a85-361a-437d-8830-4b0d5329225e",
-                            "model-version-id": "a82cd55f-1452-4c36-941a-c9f970a3e67c",
-                            "nf-function": "",
-                            "nf-naming-code": "",
-                            "nf-role": "vLB",
-                            "nf-type": "",
-                            "orchestration-status": "Active",
-                            "prov-status": "PROV",
-                            "resource-version": "1533850960381",
-                            "service-id": "50e1b0be-e0c9-48e2-9f42-15279a783ee8",
-                            "vnf-id": "807a3f02-f878-436b-870c-f0e91e81570d",
-                            "vnf-name": "vLoadBalancerMS-Vnf-0809-2",
-                            "vnf-type": "vLoadBalancerMS/vLoadBalancerMS 0"
-                        },
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "model-name": "vLoadBalancerMS",
-                                    "service-instance": {
-                                        "environment-context": "General_Revenue-Bearing",
-                                        "model-invariant-id": "b5477216-9b7d-4e75-8777-5b632d406759",
-                                        "model-version-id": "4feb459d-d8ef-4cde-a714-235c79787962",
-                                        "orchestration-status": "Active",
-                                        "resource-version": "1533848425145",
-                                        "service-instance-id": "b66d24cc-feca-4fdc-8090-2e9539a8bbac",
-                                        "service-instance-name": "vLoadBalancerMS-Service-0809-1",
-                                        "workload-context": "Production"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "is-base-vf-module": false,
-                                        "model-invariant-id": "6d01b7f1-769a-4080-b8ea-57fd03ef1572",
-                                        "model-version-id": "3302088a-457e-496c-9282-2eb3d5b8dd24",
-                                        "resource-version": "1534270663202",
-                                        "vf-module-id": "dummy_807a3f02-f878-436b-870c-f0e91e81570d",
-                                        "vf-module-name": "dummy_807a3f02-f878-436b-870c-f0e91e81570d"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "is-base-vf-module": false,
-                                        "vf-module-name": "my-module-abc_1"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "heat-stack-id": "Vfmodule_vLBMS-0809-1/83ab2394-2b22-40f9-8ba2-383698dd2958",
-                                        "is-base-vf-module": true,
-                                        "model-customization-id": "5198f732-8f22-48f9-98f8-d6b8b50118be",
-                                        "model-invariant-id": "1f566a81-58ba-4762-81f9-d2259509429a",
-                                        "model-version-id": "94827d25-4ac3-4850-abfc-7b6e3c531db4",
-                                        "module-index": 0,
-                                        "orchestration-status": "active",
-                                        "resource-version": "1533850416834",
-                                        "vf-module-id": "b861467d-d3a7-4b21-81b3-94d928a7e8b7",
-                                        "vf-module-name": "Vfmodule_vLBMS-0809-1"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "is-base-vf-module": false,
-                                        "vf-module-name": "my-module-abc_123"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "is-base-vf-module": false,
-                                        "vf-module-name": "no-underscore-number-9999"
-                                    }
-                                },
-                                {
-                                    "vf-module": {
-                                        "is-base-vf-module": false,
-                                        "vf-module-name": "my-module-abc_34"
-                                    }
-                                }
-                            ]
-                        },
-                        "model-name": "vLoadBalancerMS"
-                    },
-                    {
-                        "extra-properties": {},
-                        "inventory-response-items": {
-                            "inventory-response-item": [
-                                {
-                                    "cloud-region": {
-                                        "cloud-owner": "CloudOwner",
-                                        "cloud-region-id": "RegionOne",
-                                        "cloud-region-version": "v2.5",
-                                        "cloud-type": "openstack",
-                                        "cloud-zone": "zone-1",
-                                        "owner-defined-type": "owner type",
-                                        "resource-version": "1533652058185",
-                                        "sriov-automation": false
-                                    },
-                                    "extra-properties": {}
-                                }
-                            ]
-                        },
-                        "tenant": {
-                            "resource-version": "1533652058206",
-                            "tenant-id": "4086f396c5e04caf9502c5fdeca575c4",
-                            "tenant-name": "PFPP"
-                        }
-                    }
-                ]
-            },
-            "vserver": {
-                "in-maint": false,
-                "is-closed-loop-disabled": false,
-                "prov-status": "ACTIVE",
-                "resource-version": "1533850964910",
-                "vserver-id": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-                "vserver-name": "vlb-ms-0809-1",
-                "vserver-name2": "vlb-ms-0809-1",
-                "vserver-selflink": "http://10.12.25.2:8774/v2.1/4086f396c5e04caf9502c5fdeca575c4/servers/1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-            }
-        }
-    ]
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqVServer.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqVServer.json
deleted file mode 100644
index 0a59d8a87..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqVServer.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
-    "in-maint": false,
-    "is-closed-loop-disabled": true,
-    "prov-status": "ACTIVE",
-    "relationship-list": {
-        "relationship": [
-            {
-                "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/807a3f02-f878-436b-870c-f0e91e81570d",
-                "related-to": "generic-vnf",
-                "related-to-property": [
-                    {
-                        "property-key": "generic-vnf.vnf-name",
-                        "property-value": "vLoadBalancerMS-Vnf-0809-2"
-                    }
-                ],
-                "relationship-data": [
-                    {
-                        "relationship-key": "generic-vnf.vnf-id",
-                        "relationship-value": "807a3f02-f878-436b-870c-f0e91e81570d"
-                    }
-                ]
-            },
-            {
-                "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/6e219e86-cd94-4989-9119-def29aa10b12",
-                "related-to": "image",
-                "related-to-property": [
-                    {
-                        "property-key": "image.image-name",
-                        "property-value": "unknown"
-                    }
-                ],
-                "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": "6e219e86-cd94-4989-9119-def29aa10b12"
-                    }
-                ]
-            },
-            {
-                "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-                "related-to": "flavor",
-                "related-to-property": [
-                    {
-                        "property-key": "flavor.flavor-name",
-                        "property-value": "m1.medium"
-                    }
-                ],
-                "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"
-                    }
-                ]
-            }
-        ]
-    },
-    "resource-version": "1533850964910",
-    "vserver-id": "1c94da3f-16f1-4fc7-9ed1-e018dfa62774",
-    "vserver-name": "vlb-ms-0809-1",
-    "vserver-name2": "vlb-ms-0809-7",
-    "vserver-selflink": "http://localhost:8774/v2.1/4086f396c5e04caf9502c5fdeca575c4/servers/1c94da3f-16f1-4fc7-9ed1-e018dfa62774"
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelatedToProperty.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelatedToProperty.json
deleted file mode 100644
index 2211b3725..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelatedToProperty.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "property-key": "generic-vnf.vnf-name",
-    "property-value": "vLoadBalancerMS-Vnf-0809-1"
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/Relationship.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/Relationship.json
deleted file mode 100644
index 39d9ce1b6..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/Relationship.json
+++ /dev/null
@@ -1,25 +0,0 @@
-
-{
-    "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/807a3f02-f878-436b-870c-f0e91e81570d",
-    "related-to": "generic-vnf",
-    "related-to-property": [
-        {
-            "property-key": "generic-vnf.vnf-name",
-            "property-value": "vLoadBalancerMS-Vnf-0809-1"
-        },
-        {
-            "property-key": "generic-vnf.vnf-name",
-            "property-value": "vLoadBalancerMS-Vnf-0809-2"
-        }
-    ],
-    "relationship-data": [
-        {
-            "relationship-key": "generic-vnf.vnf-id",
-            "relationship-value": "807a3f02-f878-436b-870c-f0e91e81570d"
-        },
-        {
-            "relationship-key": "generic-vnf.vnf-id",
-            "relationship-value": "907a3f02-f878-436b-870c-f0e91e81570e"
-        }
-    ]
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipData.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipData.json
deleted file mode 100644
index 4bbb39e8f..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipData.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "relationship-key": "generic-vnf.vnf-id",
-    "relationship-value": "807a3f02-f878-436b-870c-f0e91e81570d"
-}
diff --git a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipList.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipList.json
deleted file mode 100644
index ae180f056..000000000
--- a/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipList.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-    "relationship": [
-        {
-            "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/807a3f02-f878-436b-870c-f0e91e81570d",
-            "related-to": "generic-vnf",
-            "related-to-property": [
-                {
-                    "property-key": "generic-vnf.vnf-name",
-                    "property-value": "vLoadBalancerMS-Vnf-0809-2"
-                }
-            ],
-            "relationship-data": [
-                {
-                    "relationship-key": "generic-vnf.vnf-id",
-                    "relationship-value": "807a3f02-f878-436b-870c-f0e91e81570d"
-                }
-            ]
-        },
-        {
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/images/image/6e219e86-cd94-4989-9119-def29aa10b12",
-            "related-to": "image",
-            "related-to-property": [
-                {
-                    "property-key": "image.image-name",
-                    "property-value": "unknown"
-                }
-            ],
-            "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": "6e219e86-cd94-4989-9119-def29aa10b12"
-                }
-            ]
-        },
-        {
-            "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/flavors/flavor/764efb04-5a46-4806-a766-2bdd24559f39",
-            "related-to": "flavor",
-            "related-to-property": [
-                {
-                    "property-key": "flavor.flavor-name",
-                    "property-value": "m1.medium"
-                }
-            ],
-            "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"
-                }
-            ]
-        }
-    ]
-}