update AAI response classes per API

Several of the AAI response classes did not match the new AAI
interface.  Updated AaiGetVnfResponse and AaiGetVserverResponse
and the classes they use to reflect the new API; other top-level
classes were left untouched.
Fix checkstyle errors.

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

8 files changed, 398 insertions, 0 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
new file mode 100644
index 000000000..6751fef5c
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetResponseError.json
@@ -0,0 +1,14 @@
+{
+    "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
new file mode 100644
index 000000000..faa0e0e1b
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVnfResponse.json
@@ -0,0 +1,123 @@
+{
+    "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
new file mode 100644
index 000000000..19885942e
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiGetVserverResponse.json
@@ -0,0 +1,82 @@
+{
+    "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/AaiNqVServer.json b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqVServer.json
new file mode 100644
index 000000000..0a59d8a87
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/AaiNqVServer.json
@@ -0,0 +1,78 @@
+{
+    "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
new file mode 100644
index 000000000..2211b3725
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelatedToProperty.json
@@ -0,0 +1,4 @@
+{
+    "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
new file mode 100644
index 000000000..39d9ce1b6
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/Relationship.json
@@ -0,0 +1,25 @@
+
+{
+    "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
new file mode 100644
index 000000000..4bbb39e8f
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipData.json
@@ -0,0 +1,4 @@
+{
+    "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
new file mode 100644
index 000000000..ae180f056
--- /dev/null
+++ b/controlloop/common/model-impl/aai/src/test/resources/org/onap/policy/aai/RelationshipList.json
@@ -0,0 +1,68 @@
+{
+    "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"
+                }
+            ]
+        }
+    ]
+}