summaryrefslogtreecommitdiffstats
path: root/src/main
diff options
context:
space:
mode:
authorromaingimbert <romain.gimbert@orange.com>2019-03-12 16:36:47 +0100
committerromaingimbert <romain.gimbert@orange.com>2019-03-12 16:36:47 +0100
commitfc19502598ae23128fdfe5262ebfec2b4b5c3a44 (patch)
tree1a7d5b26d10dbaa4e31c569daab150e6827dbbca /src/main
parent66403a1729296f9d90ce61a4d4cb0d102e03cd1e (diff)
change url onap status
-change healtcheck of aai and sdc for nbi status -change test Change-Id: I38a962d3725f53458dd7b66af6a26d8f6efe745c Issue-ID: EXTAPI-212 Signed-off-by: romaingimbert <romain.gimbert@orange.com>
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java4
-rw-r--r--src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java b/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
index 428788d..0796c2f 100644
--- a/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
+++ b/src/main/java/org/onap/nbi/OnapComponentsUrlPaths.java
@@ -27,7 +27,7 @@ public final class OnapComponentsUrlPaths {
public static final String SDC_ROOT_URL = "/sdc/v1/catalog/services";
public static final String SDC_GET_PATH = "/metadata";
public static final String SDC_TOSCA_PATH = "/toscaModel";
- public static final String SDC_HEALTH_CHECK = "/sdc/v1/artifactTypes";
+ public static final String SDC_HEALTH_CHECK = "/sdc2/rest/healthCheck";
// AAI
@@ -39,7 +39,7 @@ public final class OnapComponentsUrlPaths {
public static final String AAI_PUT_SERVICE_FOR_CUSTOMER_PATH =
"/aai/v14/business/customers/customer/$customerId/service-subscriptions/service-subscription/";
public static final String AAI_HEALTH_CHECK =
- "/aai/v14/business/customers";
+ "aai/util/echo?action=long";
public static final String AAI_GET_SERVICE =
"/aai/v14/nodes/service-instances/service-instance/$serviceId";
public static final String AAI_GET_SERVICE_CUSTOMER =
diff --git a/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java b/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java
index 419a34a..0be415c 100644
--- a/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java
+++ b/src/main/java/org/onap/nbi/apis/servicecatalog/SdcClient.java
@@ -115,11 +115,11 @@ public class SdcClient {
}
- public List<LinkedHashMap> callCheckConnectivity() {
+ public LinkedHashMap callCheckConnectivity() {
UriComponentsBuilder callURI = UriComponentsBuilder.fromHttpUrl(sdcHealthCheck);
ResponseEntity<Object> response = callSdc(callURI.build().encode().toUri());
- return (List<LinkedHashMap>) response.getBody();
+ return (LinkedHashMap) response.getBody();
}