Improve nbi status

-add components to check connectivity with onap (sdc, aai, so, dmaap)
-activate full status with ?fullStatus=true
-change test
-change mock tests folders

Change-Id: Iddcd7fce3c1b3b5abfea14c46b2f611f27057319
Issue-ID: EXTAPI-209
Signed-off-by: romaingimbert <romain.gimbert@orange.com>

18 files changed, 786 insertions, 0 deletions

diff --git a/src/test/resources/mappings/aai/aai_get_6490_service-subscriptions.json b/src/test/resources/mappings/aai/aai_get_6490_service-subscriptions.json
new file mode 100644
index 0000000..7606483
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_6490_service-subscriptions.json
@@ -0,0 +1,36 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/business/customers/customer/6490/service-subscriptions"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+        "service-subscription": [
+          {
+            "service-type": "vFW-service-2VF-based",
+            "resource-version": "1519809287769"
+          },
+          {
+            "service-type": "vFW",
+            "resource-version": "1519660513613",
+            "service-instances": {
+              "service-instance": [
+                {
+                  "service-instance-id": "39ff3f9d-f210-4566-9d19-fa37edf1697d",
+                  "service-instance-name": "vPCRF",
+                  "model-invariant-id": "a09e799f-58eb-4c00-bfcc-4fa371a557e3",
+                  "model-version-id": "4c393977-09ea-42c2-bcd9-f50302ebba48",
+                  "resource-version": "1524672125232"
+                }
+              ]
+            }
+
+          }
+        ]
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_customer_6490.json b/src/test/resources/mappings/aai/aai_get_customer_6490.json
new file mode 100644
index 0000000..8361f94
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_customer_6490.json
@@ -0,0 +1,18 @@
+{
+    "request": {
+        "method": "GET",
+        "url": "/aai/v14/business/customers/customer/6490"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "global-customer-id": "6490",
+            "subscriber-name": "Jean Pontus",
+            "subscriber-type": "BSS",
+            "resource-version": "1518595364087"
+        },
+        "headers": {
+            "Content-Type": "application/json"
+        }
+    }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_customer_generic.json b/src/test/resources/mappings/aai/aai_get_customer_generic.json
new file mode 100644
index 0000000..9194687
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_customer_generic.json
@@ -0,0 +1,18 @@
+{
+    "request": {
+        "method": "GET",
+        "url": "/aai/v14/business/customers/customer/generic"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "global-customer-id": "generic",
+            "subscriber-name": "generic",
+            "subscriber-type": "BSS",
+            "resource-version": "1518595364087"
+        },
+        "headers": {
+            "Content-Type": "application/json"
+        }
+    }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_customers.json b/src/test/resources/mappings/aai/aai_get_customers.json
new file mode 100644
index 0000000..4146b6a
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_customers.json
@@ -0,0 +1,34 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/business/customers"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "customer": [
+        {
+          "global-customer-id": "generic",
+          "subscriber-name": "generic",
+          "subscriber-type": "INFRA",
+          "resource-version": "1550238542827"
+        },
+        {
+          "global-customer-id": "Generic-Vendor",
+          "subscriber-name": "Generic-Vendor",
+          "subscriber-type": "INFRA",
+          "resource-version": "1550569650318"
+        },
+        {
+          "global-customer-id": "customerRG",
+          "subscriber-name": "customerRG",
+          "subscriber-type": "INFRA",
+          "resource-version": "1551445667218"
+        }
+      ]
+    },
+    "headers": {
+      "Content-Type": "application/xml"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_generic_service-subscriptions.json b/src/test/resources/mappings/aai/aai_get_generic_service-subscriptions.json
new file mode 100644
index 0000000..73bd5e1
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_generic_service-subscriptions.json
@@ -0,0 +1,20 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/business/customers/customer/generic/service-subscriptions"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+        "service-subscription": [
+          {
+            "service-type": "vFW",
+            "resource-version": "1519660513613"
+          }
+        ]
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service-subscription-Ansible-service.json b/src/test/resources/mappings/aai/aai_get_service-subscription-Ansible-service.json
new file mode 100644
index 0000000..121f7d1
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service-subscription-Ansible-service.json
@@ -0,0 +1,52 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/business/customers/customer/6490/service-subscriptions/service-subscription/AnsibleService/service-instances/service-instance/405c8c00-44b9-4303-9f27-6797d22ca096"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "service-instance-id": "405c8c00-44b9-4303-9f27-6797d22ca096",
+      "service-instance-name": "ansibleService-service-instance-065FYE",
+      "environment-context": "General_Revenue-Bearing",
+      "workload-context": "Production",
+      "model-invariant-id": "f3ec9092-5c98-41f1-9fea-96be80abd064",
+      "model-version-id": "0bf5f56a-4506-4e98-ab50-336d73ca4b07",
+      "resource-version": "1530200875713",
+      "orchestration-status": "Active",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "generic-vnf",
+            "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3f73377f-d9be-4a33-b068-e3f35b5b770b",
+            "relationship-data": [
+              {
+                "relationship-key": "generic-vnf.vnf-id",
+                "relationship-value": "3f73377f-d9be-4a33-b068-e3f35b5b770b"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "generic-vnf.vnf-name",
+                "property-value": "ansibleService-vnf-instance-DebianVNF_0_065FYE"
+              }
+            ]
+          },
+          {
+            "related-to": "owning-entity",
+            "related-link": "/aai/v11/business/owning-entities/owning-entity/OE-generic",
+            "relationship-data": [
+              {
+                "relationship-key": "owning-entity.owning-entity-id",
+                "relationship-value": "OE-generic"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service-subscription_vnf.json b/src/test/resources/mappings/aai/aai_get_service-subscription_vnf.json
new file mode 100644
index 0000000..7c33979
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service-subscription_vnf.json
@@ -0,0 +1,58 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "vnf-id": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+      "vnf-name": "NewFreeRadius-VNF-instance-01",
+      "vnf-type": "NewFreeRadius-service/New-FreeRadius 0",
+      "service-id": "709d157b-52fb-4250-976e-7133dff5c347",
+      "prov-status": "PREPROV",
+      "orchestration-status": "Created",
+      "in-maint": false,
+      "is-closed-loop-disabled": false,
+      "resource-version": "1516871905399",
+      "model-invariant-id": "f5993703-977f-4346-a1c9-c1884f8cfd8d",
+      "model-version-id": "902438f7-1e4c-492d-b7cc-8650e13b8aeb",
+      "model-customization-id": "a2def5c8-ab15-482b-a2cd-2af0b987300f",
+      "nf-type": "",
+      "nf-function": "",
+      "nf-role": "",
+      "nf-naming-code": "",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "service-instance",
+            "related-link": "/aai/v11/business/customers/customer/Sina/service-subscriptions/service-subscription/NewFreeRadius-service/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb",
+            "relationship-data": [
+              {
+                "relationship-key": "customer.global-customer-id",
+                "relationship-value": "Sina"
+              },
+              {
+                "relationship-key": "service-subscription.service-type",
+                "relationship-value": "NewFreeRadius-service"
+              },
+              {
+                "relationship-key": "service-instance.service-instance-id",
+                "relationship-value": "e4688e5f-61a0-4f8b-ae02-a2fbde623bcb"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "service-instance.service-instance-name",
+                "property-value": "NewFreeRadius-service-instance-01"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/test/resources/mappings/aai/aai_get_service-subscriptionsVFW.json b/src/test/resources/mappings/aai/aai_get_service-subscriptionsVFW.json
new file mode 100644
index 0000000..6fb1b4c
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service-subscriptionsVFW.json
@@ -0,0 +1,43 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/business/customers/customer/6490/service-subscriptions/service-subscription/vFW/service-instances/"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "service-instance": [
+        {
+          "service-instance-id": "e4688e5f-61a0-4f8b-ae02-a2fbde623bcb",
+          "service-instance-name": "NewFreeRadius-service-instance-01",
+          "model-invariant-id": "709d157b-52fb-4250-976e-7133dff5c347",
+          "model-version-id": "98d95267-5e0f-4531-abf8-f14b90031dc5",
+          "resource-version": "1518508381261",
+          "relationship-list": {
+            "relationship": [
+              {
+                "related-to": "generic-vnf",
+                "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+                "relationship-data": [
+                  {
+                    "relationship-key": "generic-vnf.vnf-id",
+                    "relationship-value": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+                  }
+                ],
+                "related-to-property": [
+                  {
+                    "property-key": "generic-vnf.vnf-name",
+                    "property-value": "NewFreeRadius-VNF-instance-01"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service-subscriptionsvFW-service-2VF-based.json b/src/test/resources/mappings/aai/aai_get_service-subscriptionsvFW-service-2VF-based.json
new file mode 100644
index 0000000..10c172d
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service-subscriptionsvFW-service-2VF-based.json
@@ -0,0 +1,43 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/business/customers/customer/6490/service-subscriptions/service-subscription/vFW-service-2VF-based/service-instances/"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "service-instance": [
+        {
+          "service-instance-id": "vfw-service-id",
+          "service-instance-name": "vfw-service-name",
+          "model-invariant-id": "vfw-service-invariant-id",
+          "model-version-id": "9vfw-service-modek-version-id",
+          "resource-version": "1518508381261",
+          "relationship-list": {
+            "relationship": [
+              {
+                "related-to": "generic-vnf",
+                "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+                "relationship-data": [
+                  {
+                    "relationship-key": "generic-vnf.vnf-id",
+                    "relationship-value": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+                  }
+                ],
+                "related-to-property": [
+                  {
+                    "property-key": "generic-vnf.vnf-name",
+                    "property-value": "NewFreeRadius-VNF-instance-01"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service_3.json b/src/test/resources/mappings/aai/aai_get_service_3.json
new file mode 100644
index 0000000..fc2e416
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service_3.json
@@ -0,0 +1,19 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/nodes/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcbWithoutList"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+        "service-instance-id": "e4688e5f-61a0-4f8b-ae02-a2fbde623bcb",
+        "service-instance-name": "NewFreeRadius-service-instance-01",
+        "model-invariant-id": "709d157b-52fb-4250-976e-7133dff5c347",
+        "model-version-id": "98d95267-5e0f-4531-abf8-f14b90031dc5",
+        "resource-version": "1518508381261"
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service_3_format_resource_url.json b/src/test/resources/mappings/aai/aai_get_service_3_format_resource_url.json
new file mode 100644
index 0000000..f78847d
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service_3_format_resource_url.json
@@ -0,0 +1,26 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/nodes/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcbWithoutList?format=resource_and_url"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+        "results": [
+        {
+        "url": "/aai/v14/business/customers/customer/DemoTest3/service-subscriptions/service-subscription/servicename3/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcbWithoutList",
+       "service-instance": {
+        "service-instance-id": "e4688e5f-61a0-4f8b-ae02-a2fbde623bcbWithoutList",
+        "service-instance-name": "NewFreeRadius-service-instance-01",
+        "model-invariant-id": "709d157b-52fb-4250-976e-7133dff5c347",
+        "model-version-id": "98d95267-5e0f-4531-abf8-f14b90031dc5",
+        "resource-version": "1518508381261"
+ }
+    }
+    ]
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service_instance.json b/src/test/resources/mappings/aai/aai_get_service_instance.json
new file mode 100644
index 0000000..d9f2ab2
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service_instance.json
@@ -0,0 +1,52 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/nodes/service-instances/service-instance/405c8c00-44b9-4303-9f27-6797d22ca096"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "service-instance-id": "405c8c00-44b9-4303-9f27-6797d22ca096",
+      "service-instance-name": "ansibleService-service-instance-065FYE",
+      "environment-context": "General_Revenue-Bearing",
+      "workload-context": "Production",
+      "model-invariant-id": "f3ec9092-5c98-41f1-9fea-96be80abd064",
+      "model-version-id": "0bf5f56a-4506-4e98-ab50-336d73ca4b07",
+      "resource-version": "1530200875713",
+      "orchestration-status": "Active",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "generic-vnf",
+            "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3f73377f-d9be-4a33-b068-e3f35b5b770b",
+            "relationship-data": [
+              {
+                "relationship-key": "generic-vnf.vnf-id",
+                "relationship-value": "3f73377f-d9be-4a33-b068-e3f35b5b770b"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "generic-vnf.vnf-name",
+                "property-value": "ansibleService-vnf-instance-DebianVNF_0_065FYE"
+              }
+            ]
+          },
+          {
+            "related-to": "owning-entity",
+            "related-link": "/aai/v11/business/owning-entities/owning-entity/OE-generic",
+            "relationship-data": [
+              {
+                "relationship-key": "owning-entity.owning-entity-id",
+                "relationship-value": "OE-generic"
+              }
+            ]
+          }
+        ]
+      }
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service_instance_2.json b/src/test/resources/mappings/aai/aai_get_service_instance_2.json
new file mode 100644
index 0000000..7d90bc2
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service_instance_2.json
@@ -0,0 +1,55 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/nodes/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+        "service-instance-id": "e4688e5f-61a0-4f8b-ae02-a2fbde623bcb",
+        "service-instance-name": "NewFreeRadius-service-instance-01",
+        "model-invariant-id": "709d157b-52fb-4250-976e-7133dff5c347",
+        "model-version-id": "98d95267-5e0f-4531-abf8-f14b90031dc5",
+        "resource-version": "1518508381261",
+        "relationship-list": {
+          "relationship": [
+            {
+              "related-to": "generic-vnf",
+              "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+              "relationship-data": [
+                {
+                  "relationship-key": "generic-vnf.vnf-id",
+                  "relationship-value": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+                }
+              ],
+              "related-to-property": [
+                {
+                  "property-key": "generic-vnf.vnf-name",
+                  "property-value": "NewFreeRadius-VNF-instance-01"
+                }
+              ]
+            },
+            {
+              "related-to": "generic-vnf",
+              "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+              "relationship-data": [
+                {
+                  "relationship-key": "generic-vnf.vnf-id",
+                  "relationship-value": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+                }
+              ],
+              "related-to-property": [
+                {
+                  "property-key": "generic-vnf.vnf-name",
+                  "property-value": "NewFreeRadius-VNF-instance-01"
+                }
+              ]
+            }
+          ]
+        }
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service_instance_2_format_resource_url.json b/src/test/resources/mappings/aai/aai_get_service_instance_2_format_resource_url.json
new file mode 100644
index 0000000..086441e
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service_instance_2_format_resource_url.json
@@ -0,0 +1,62 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/nodes/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb?format=resource_and_url"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+    "results": [
+        {
+        "url": "/aai/v14/business/customers/customer/DemoTest2/service-subscriptions/service-subscription/servicename2/service-instances/service-instance/e4688e5f-61a0-4f8b-ae02-a2fbde623bcb",
+       "service-instance": {
+        "service-instance-id": "e4688e5f-61a0-4f8b-ae02-a2fbde623bcb",
+        "service-instance-name": "NewFreeRadius-service-instance-01",
+        "model-invariant-id": "709d157b-52fb-4250-976e-7133dff5c347",
+        "model-version-id": "98d95267-5e0f-4531-abf8-f14b90031dc5",
+        "resource-version": "1518508381261",
+        "relationship-list": {
+          "relationship": [
+            {
+              "related-to": "generic-vnf",
+              "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+              "relationship-data": [
+                {
+                  "relationship-key": "generic-vnf.vnf-id",
+                  "relationship-value": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+                }
+              ],
+              "related-to-property": [
+                {
+                  "property-key": "generic-vnf.vnf-name",
+                  "property-value": "NewFreeRadius-VNF-instance-01"
+                }
+              ]
+            },
+            {
+              "related-to": "generic-vnf",
+              "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/cb80fbb6-9aa7-4ac5-9541-e14f45de533e",
+              "relationship-data": [
+                {
+                  "relationship-key": "generic-vnf.vnf-id",
+                  "relationship-value": "cb80fbb6-9aa7-4ac5-9541-e14f45de533e"
+                }
+              ],
+              "related-to-property": [
+                {
+                  "property-key": "generic-vnf.vnf-name",
+                  "property-value": "NewFreeRadius-VNF-instance-01"
+                }
+              ]
+            }
+          ]
+        }
+}
+    }
+    ]
+    },
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_service_instance_format_resource_url.json b/src/test/resources/mappings/aai/aai_get_service_instance_format_resource_url.json
new file mode 100644
index 0000000..7f0db27
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_service_instance_format_resource_url.json
@@ -0,0 +1,59 @@
+{
+  "request": {
+    "method": "GET",
+    "url": "/aai/v14/nodes/service-instances/service-instance/405c8c00-44b9-4303-9f27-6797d22ca096?format=resource_and_url"
+  },
+  "response": {
+    "status": 200,
+    "jsonBody": {
+      "results": [
+        {
+        "url": "/aai/v14/business/customers/customer/DemoTest1/service-subscriptions/service-subscription/servicename1/service-instances/service-instance/405c8c00-44b9-4303-9f27-6797d22ca096",
+       "service-instance": {
+      "service-instance-id": "405c8c00-44b9-4303-9f27-6797d22ca096",
+      "service-instance-name": "ansibleService-service-instance-065FYE",
+      "environment-context": "General_Revenue-Bearing",
+      "workload-context": "Production",
+      "model-invariant-id": "f3ec9092-5c98-41f1-9fea-96be80abd064",
+      "model-version-id": "0bf5f56a-4506-4e98-ab50-336d73ca4b07",
+      "resource-version": "1530200875713",
+      "orchestration-status": "Active",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "generic-vnf",
+            "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/3f73377f-d9be-4a33-b068-e3f35b5b770b",
+            "relationship-data": [
+              {
+                "relationship-key": "generic-vnf.vnf-id",
+                "relationship-value": "3f73377f-d9be-4a33-b068-e3f35b5b770b"
+              }
+            ],
+            "related-to-property": [
+              {
+                "property-key": "generic-vnf.vnf-name",
+                "property-value": "ansibleService-vnf-instance-DebianVNF_0_065FYE"
+              }
+            ]
+          },
+          {
+            "related-to": "owning-entity",
+            "related-link": "/aai/v11/business/owning-entities/owning-entity/OE-generic",
+            "relationship-data": [
+              {
+                "relationship-key": "owning-entity.owning-entity-id",
+                "relationship-value": "OE-generic"
+              }
+            ]
+          }
+        ]
+      }
+    }
+    }
+    ]
+},
+    "headers": {
+      "Content-Type": "application/json"
+    }
+  }
+}
diff --git a/src/test/resources/mappings/aai/aai_get_tenants.json b/src/test/resources/mappings/aai/aai_get_tenants.json
new file mode 100644
index 0000000..2dda86e
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_get_tenants.json
@@ -0,0 +1,167 @@
+{
+    "request": {
+        "method": "GET",
+        "url": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+
+    "tenant": [
+        {
+            "tenant-id": "31047205ce114b60833b23e400d6a535",
+            "tenant-name": "onap-vnfs",
+            "resource-version": "1516022902124",
+            "relationship-list": {
+                "relationship": [
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/OPL-User/service-subscriptions/service-subscription/OPL_FWtest1_service_type",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "OPL-User"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "OPL_FWtest1_service_type"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/Sina/service-subscriptions/service-subscription/NewFreeRadius-service",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "Sina"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "NewFreeRadius-service"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/Sina/service-subscriptions/service-subscription/vMRFaaS3",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "Sina"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "vMRFaaS3"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/Sina/service-subscriptions/service-subscription/FreeRadius-service",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "Sina"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "FreeRadius-service"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/6401/service-subscriptions/service-subscription/vFW-service-model",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "6401"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "vFW-service-model"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/Sina/service-subscriptions/service-subscription/vFW-service-model",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "Sina"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "vFW-service-model"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/6404/service-subscriptions/service-subscription/vFW-service-model",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "6404"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "vFW-service-model"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/6405/service-subscriptions/service-subscription/vFW-service-model",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "6405"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "vFW-service-model"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/6406/service-subscriptions/service-subscription/vFW-service-model",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "6406"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "vFW-service-model"
+                            }
+                        ]
+                    },
+                    {
+                        "related-to": "service-subscription",
+                        "related-link": "/aai/v11/business/customers/customer/Sina/service-subscriptions/service-subscription/serviceFRDBS",
+                        "relationship-data": [
+                            {
+                                "relationship-key": "customer.global-customer-id",
+                                "relationship-value": "Sina"
+                            },
+                            {
+                                "relationship-key": "service-subscription.service-type",
+                                "relationship-value": "serviceFRDBS"
+                            }
+                        ]
+                    }
+                ]
+            }
+        }
+    ]
+
+        },
+        "headers": {
+            "Content-Type": "application/json"
+        }
+    }
+}
diff --git a/src/test/resources/mappings/aai/aai_put_customer.json b/src/test/resources/mappings/aai/aai_put_customer.json
new file mode 100644
index 0000000..f9f2418
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_put_customer.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "PUT",
+        "url": "/aai/v14/business/customers/customer/new"
+    },
+    "response": {
+        "status": 201,
+        "headers": {
+            "Content-Type": "application/json"
+        }
+    }
+}
diff --git a/src/test/resources/mappings/aai/aai_put_customer_service.json b/src/test/resources/mappings/aai/aai_put_customer_service.json
new file mode 100644
index 0000000..98ed133
--- /dev/null
+++ b/src/test/resources/mappings/aai/aai_put_customer_service.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "PUT",
+        "url": "/aai/v14/business/customers/customer/new/service-subscriptions/service-subscription/vFW"
+    },
+    "response": {
+        "status": 201,
+        "headers": {
+            "Content-Type": "application/json"
+        }
+    }
+}