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>

36 files changed, 172 insertions, 1 deletions

diff --git a/src/test/resources/karatetest/features/04--StatusRessourceTest.feature b/src/test/resources/karatetest/features/04--StatusRessourceTest.feature
index f616e90..5db5c78 100644
--- a/src/test/resources/karatetest/features/04--StatusRessourceTest.feature
+++ b/src/test/resources/karatetest/features/04--StatusRessourceTest.feature
@@ -9,9 +9,43 @@ Background:
 * call Context.startServers();
     
 Scenario: testHealthCheck
+Given path 'status'
+When method get
+Then status 200
+And match response.status == 'ok'
+And match response.name == 'nbi'
 
+Scenario: testFullHealthCheck
 Given path 'status'
+And params {fullStatus :true}
 When method get
 Then status 200
 And match response.status == 'ok'
-And match response.name == 'nbi'
\ No newline at end of file
+And match response.name == 'nbi'
+And assert response.components.length == 4
+And match each $.components contains {status :'ok'}
+
+
+Scenario: testFullHealthChecWithoutWiremock
+* call Context.stopWiremock();
+Given path 'status'
+And params {fullStatus :true}
+When method get
+Then status 200
+And match response.status == 'ok'
+And match response.name == 'nbi'
+And assert response.components.length == 4
+And match each response.components contains {  status: 'ko'}
+* call Context.startServers();
+
+Scenario: testFullHealthCheckWithSDCNotResponding
+* call Context.removeWireMockMapping("/sdc/v1/artifactTypes");
+Given path 'status'
+And params {fullStatus :true}
+When method get
+Then status 200
+And match response.status == 'ok'
+And match response.name == 'nbi'
+And assert response.components.length == 4
+And match response.components contains [{name:'sdc connectivity', status: 'ko'},{name:'so connectivity', status: 'ok'},{name:'aai connectivity', status: 'ok'},{name:'dmaap connectivity', status: 'ok'},]
+* call Context.startServers();
diff --git a/src/test/resources/mappings/aai_get_6490_service-subscriptions.json b/src/test/resources/mappings/aai/aai_get_6490_service-subscriptions.json
index 7606483..7606483 100644
--- a/src/test/resources/mappings/aai_get_6490_service-subscriptions.json
+++ b/src/test/resources/mappings/aai/aai_get_6490_service-subscriptions.json
diff --git a/src/test/resources/mappings/aai_get_customer_6490.json b/src/test/resources/mappings/aai/aai_get_customer_6490.json
index 8361f94..8361f94 100644
--- a/src/test/resources/mappings/aai_get_customer_6490.json
+++ b/src/test/resources/mappings/aai/aai_get_customer_6490.json
diff --git a/src/test/resources/mappings/aai_get_customer_generic.json b/src/test/resources/mappings/aai/aai_get_customer_generic.json
index 9194687..9194687 100644
--- a/src/test/resources/mappings/aai_get_customer_generic.json
+++ b/src/test/resources/mappings/aai/aai_get_customer_generic.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_get_generic_service-subscriptions.json b/src/test/resources/mappings/aai/aai_get_generic_service-subscriptions.json
index 73bd5e1..73bd5e1 100644
--- a/src/test/resources/mappings/aai_get_generic_service-subscriptions.json
+++ b/src/test/resources/mappings/aai/aai_get_generic_service-subscriptions.json
diff --git a/src/test/resources/mappings/aai_get_service-subscription-Ansible-service.json b/src/test/resources/mappings/aai/aai_get_service-subscription-Ansible-service.json
index 121f7d1..121f7d1 100644
--- a/src/test/resources/mappings/aai_get_service-subscription-Ansible-service.json
+++ b/src/test/resources/mappings/aai/aai_get_service-subscription-Ansible-service.json
diff --git a/src/test/resources/mappings/aai_get_service-subscription_vnf.json b/src/test/resources/mappings/aai/aai_get_service-subscription_vnf.json
index 7c33979..7c33979 100644
--- a/src/test/resources/mappings/aai_get_service-subscription_vnf.json
+++ b/src/test/resources/mappings/aai/aai_get_service-subscription_vnf.json
diff --git a/src/test/resources/mappings/aai_get_service-subscriptionsVFW.json b/src/test/resources/mappings/aai/aai_get_service-subscriptionsVFW.json
index 6fb1b4c..6fb1b4c 100644
--- a/src/test/resources/mappings/aai_get_service-subscriptionsVFW.json
+++ b/src/test/resources/mappings/aai/aai_get_service-subscriptionsVFW.json
diff --git a/src/test/resources/mappings/aai_get_service-subscriptionsvFW-service-2VF-based.json b/src/test/resources/mappings/aai/aai_get_service-subscriptionsvFW-service-2VF-based.json
index 10c172d..10c172d 100644
--- a/src/test/resources/mappings/aai_get_service-subscriptionsvFW-service-2VF-based.json
+++ b/src/test/resources/mappings/aai/aai_get_service-subscriptionsvFW-service-2VF-based.json
diff --git a/src/test/resources/mappings/aai_get_service_3.json b/src/test/resources/mappings/aai/aai_get_service_3.json
index fc2e416..fc2e416 100644
--- a/src/test/resources/mappings/aai_get_service_3.json
+++ b/src/test/resources/mappings/aai/aai_get_service_3.json
diff --git a/src/test/resources/mappings/aai_get_service_3_format_resource_url.json b/src/test/resources/mappings/aai/aai_get_service_3_format_resource_url.json
index f78847d..f78847d 100644
--- a/src/test/resources/mappings/aai_get_service_3_format_resource_url.json
+++ b/src/test/resources/mappings/aai/aai_get_service_3_format_resource_url.json
diff --git a/src/test/resources/mappings/aai_get_service_instance.json b/src/test/resources/mappings/aai/aai_get_service_instance.json
index d9f2ab2..d9f2ab2 100644
--- a/src/test/resources/mappings/aai_get_service_instance.json
+++ b/src/test/resources/mappings/aai/aai_get_service_instance.json
diff --git a/src/test/resources/mappings/aai_get_service_instance_2.json b/src/test/resources/mappings/aai/aai_get_service_instance_2.json
index 7d90bc2..7d90bc2 100644
--- a/src/test/resources/mappings/aai_get_service_instance_2.json
+++ b/src/test/resources/mappings/aai/aai_get_service_instance_2.json
diff --git a/src/test/resources/mappings/aai_get_service_instance_2_format_resource_url.json b/src/test/resources/mappings/aai/aai_get_service_instance_2_format_resource_url.json
index 086441e..086441e 100644
--- a/src/test/resources/mappings/aai_get_service_instance_2_format_resource_url.json
+++ b/src/test/resources/mappings/aai/aai_get_service_instance_2_format_resource_url.json
diff --git a/src/test/resources/mappings/aai_get_service_instance_format_resource_url.json b/src/test/resources/mappings/aai/aai_get_service_instance_format_resource_url.json
index 7f0db27..7f0db27 100644
--- a/src/test/resources/mappings/aai_get_service_instance_format_resource_url.json
+++ b/src/test/resources/mappings/aai/aai_get_service_instance_format_resource_url.json
diff --git a/src/test/resources/mappings/aai_get_tenants.json b/src/test/resources/mappings/aai/aai_get_tenants.json
index 2dda86e..2dda86e 100644
--- a/src/test/resources/mappings/aai_get_tenants.json
+++ b/src/test/resources/mappings/aai/aai_get_tenants.json
diff --git a/src/test/resources/mappings/aai_put_customer.json b/src/test/resources/mappings/aai/aai_put_customer.json
index f9f2418..f9f2418 100644
--- a/src/test/resources/mappings/aai_put_customer.json
+++ b/src/test/resources/mappings/aai/aai_put_customer.json
diff --git a/src/test/resources/mappings/aai_put_customer_service.json b/src/test/resources/mappings/aai/aai_put_customer_service.json
index 98ed133..98ed133 100644
--- a/src/test/resources/mappings/aai_put_customer_service.json
+++ b/src/test/resources/mappings/aai/aai_put_customer_service.json
diff --git a/src/test/resources/mappings/dmaap_get_aaievents.json b/src/test/resources/mappings/dmaap/dmaap_get_aaievents.json
index 6b5c630..6b5c630 100644
--- a/src/test/resources/mappings/dmaap_get_aaievents.json
+++ b/src/test/resources/mappings/dmaap/dmaap_get_aaievents.json
diff --git a/src/test/resources/mappings/sdc_find.json b/src/test/resources/mappings/sdc/sdc_find.json
index c04ecae..c04ecae 100644
--- a/src/test/resources/mappings/sdc_find.json
+++ b/src/test/resources/mappings/sdc/sdc_find.json
diff --git a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json b/src/test/resources/mappings/sdc/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json
index 4956be7..4956be7 100644
--- a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json
+++ b/src/test/resources/mappings/sdc/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439.json
diff --git a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json b/src/test/resources/mappings/sdc/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json
index ebf72bb..ebf72bb 100644
--- a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json
+++ b/src/test/resources/mappings/sdc/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_tosca.json
diff --git a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json b/src/test/resources/mappings/sdc/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json
index 35554f0..35554f0 100644
--- a/src/test/resources/mappings/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json
+++ b/src/test/resources/mappings/sdc/sdc_get_1e3feeb0-8e36-46c6-862c-236d9c626439_withoutTosca.json
diff --git a/src/test/resources/mappings/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_toscafile.json b/src/test/resources/mappings/sdc/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_toscafile.json
index 9886df7..9886df7 100644
--- a/src/test/resources/mappings/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_toscafile.json
+++ b/src/test/resources/mappings/sdc/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_toscafile.json
diff --git a/src/test/resources/mappings/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_withTosca.json b/src/test/resources/mappings/sdc/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_withTosca.json
index 848b725..848b725 100644
--- a/src/test/resources/mappings/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_withTosca.json
+++ b/src/test/resources/mappings/sdc/sdc_get_462f84e5-f0e5-44c5-ab95-38fb4bf77064_withTosca.json
diff --git a/src/test/resources/mappings/sdc/sdc_get_artifactTypes.json b/src/test/resources/mappings/sdc/sdc_get_artifactTypes.json
new file mode 100644
index 0000000..2c7f635
--- /dev/null
+++ b/src/test/resources/mappings/sdc/sdc_get_artifactTypes.json
@@ -0,0 +1,68 @@
+{
+    "request": {
+        "method": "GET",
+        "url": "/sdc/v1/artifactTypes"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody":
+[
+    "CHEF",
+    "PUPPET",
+    "YANG",
+    "SHELL_SCRIPT",
+    "SHELL",
+    "ICON",
+    "UNKNOWN",
+    "HEAT",
+    "DG_XML",
+    "MURANO_PKG",
+    "HEAT_ENV",
+    "YANG_XML",
+    "HEAT_VOL",
+    "HEAT_NET",
+    "OTHER",
+    "WORKFLOW",
+    "NETWORK_CALL_FLOW",
+    "TOSCA_TEMPLATE",
+    "TOSCA_CSAR",
+    "VNF_CATALOG",
+    "VF_LICENSE",
+    "BPEL",
+    "VENDOR_LICENSE",
+    "MODEL_INVENTORY_PROFILE",
+    "MODEL_QUERY_SPEC",
+    "APPC_CONFIG",
+    "HEAT_NESTED",
+    "HEAT_ARTIFACT",
+    "VF_MODULES_METADATA",
+    "LIFECYCLE_OPERATIONS",
+    "VES_EVENTS",
+    "PERFORMANCE_COUNTER",
+    "UCPE_LAYER_2_CONFIGURATION",
+    "DCAE_TOSCA",
+    "DCAE_JSON",
+    "DCAE_POLICY",
+    "DCAE_DOC",
+    "DCAE_EVENT",
+    "DCAE_INVENTORY_TOSCA",
+    "DCAE_INVENTORY_JSON",
+    "DCAE_INVENTORY_POLICY",
+    "DCAE_INVENTORY_DOC",
+    "DCAE_INVENTORY_BLUEPRINT",
+    "DCAE_INVENTORY_EVENT",
+    "AAI_SERVICE_MODEL",
+    "AAI_VF_MODEL",
+    "AAI_VF_MODULE_MODEL",
+    "AAI_VF_INSTANCE_MODEL",
+    "SNMP_POLL",
+    "SNMP_TRAP",
+    "GUIDE",
+    "PLAN"
+]
+        ,
+        "headers": {
+            "Content-Type": "application/json"
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/test/resources/mappings/so_delete_service_instance.json b/src/test/resources/mappings/so/so_delete_service_instance.json
index 92a713d..92a713d 100644
--- a/src/test/resources/mappings/so_delete_service_instance.json
+++ b/src/test/resources/mappings/so/so_delete_service_instance.json
diff --git a/src/test/resources/mappings/so_e2e_delete_service_instance.json b/src/test/resources/mappings/so/so_e2e_delete_service_instance.json
index ea7b446..ea7b446 100644
--- a/src/test/resources/mappings/so_e2e_delete_service_instance.json
+++ b/src/test/resources/mappings/so/so_e2e_delete_service_instance.json
diff --git a/src/test/resources/mappings/so_get_.json b/src/test/resources/mappings/so/so_get_.json
index a251e69..a251e69 100644
--- a/src/test/resources/mappings/so_get_.json
+++ b/src/test/resources/mappings/so/so_get_.json
diff --git a/src/test/resources/mappings/so_get_e2e.json b/src/test/resources/mappings/so/so_get_e2e.json
index 530cd84..530cd84 100644
--- a/src/test/resources/mappings/so_get_e2e.json
+++ b/src/test/resources/mappings/so/so_get_e2e.json
diff --git a/src/test/resources/mappings/so_get_e2e_delete.json b/src/test/resources/mappings/so/so_get_e2e_delete.json
index 34247e0..34247e0 100644
--- a/src/test/resources/mappings/so_get_e2e_delete.json
+++ b/src/test/resources/mappings/so/so_get_e2e_delete.json
diff --git a/src/test/resources/mappings/so/so_get_healthcheck.json b/src/test/resources/mappings/so/so_get_healthcheck.json
new file mode 100644
index 0000000..8f2171d
--- /dev/null
+++ b/src/test/resources/mappings/so/so_get_healthcheck.json
@@ -0,0 +1,12 @@
+{
+    "request": {
+        "method": "GET",
+        "url": "/globalhealthcheck"
+    },
+    "response": {
+        "status": 200,
+        "jsonBody": {
+            "bodyFileName": "so_healthcheck.xml"
+        }
+    }
+}
diff --git a/src/test/resources/mappings/so/so_healthcheck.xml b/src/test/resources/mappings/so/so_healthcheck.xml
new file mode 100644
index 0000000..d023c9f
--- /dev/null
+++ b/src/test/resources/mappings/so/so_healthcheck.xml
@@ -0,0 +1,23 @@
+<!--
+     Copyright (c) 2019 Orange
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+         http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="ISO-8859-1">
+    <title>Health Check</title>
+  </head>
+  <body>Application ready</body>
+</html>
\ No newline at end of file
diff --git a/src/test/resources/mappings/so_post_create_service_instance.json b/src/test/resources/mappings/so/so_post_create_service_instance.json
index 8d319f6..8d319f6 100644
--- a/src/test/resources/mappings/so_post_create_service_instance.json
+++ b/src/test/resources/mappings/so/so_post_create_service_instance.json
diff --git a/src/test/resources/mappings/so_post_e2e_create_service_instance.json b/src/test/resources/mappings/so/so_post_e2e_create_service_instance.json
index a357bef..a357bef 100644
--- a/src/test/resources/mappings/so_post_e2e_create_service_instance.json
+++ b/src/test/resources/mappings/so/so_post_e2e_create_service_instance.json