Merge "Extend probe mechanism"

3 files changed, 20 insertions, 0 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/AsdcClient.java b/vid-app-common/src/main/java/org/onap/vid/asdc/AsdcClient.java
index 37d3d2e97..e264e4e3e 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/AsdcClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/AsdcClient.java
@@ -3,6 +3,7 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@
 
 package org.onap.vid.asdc;
 
+import io.joshworks.restclient.http.HttpResponse;
 import org.onap.vid.asdc.beans.Service;
 
 import java.nio.file.Path;
@@ -32,6 +34,7 @@ public interface AsdcClient {
 	class URIS{
 		public static final String METADATA_URL_TEMPLATE = "%s%s/%s/metadata";
 		public static final String TOSCA_MODEL_URL_TEMPLATE = "%s%s/%s/toscaModel";
+		public static final String HEALTH_CHECK_ENDPOINT = "sdc2/rest/healthCheck";
 	}
 	/**
 	 * Gets the service.
@@ -51,4 +54,6 @@ public interface AsdcClient {
 	 */
 	Path getServiceToscaModel(UUID uuid) throws AsdcCatalogException;
 
+
+	HttpResponse<String> checkSDCConnectivity();
 }
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/local/LocalAsdcClient.java b/vid-app-common/src/main/java/org/onap/vid/asdc/local/LocalAsdcClient.java
index 4e5574afd..0bd581abc 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/local/LocalAsdcClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/local/LocalAsdcClient.java
@@ -3,6 +3,7 @@
  * VID
  * ================================================================================
  * Copyright (C) 2017 - 2019 AT&T Intellectual Property. All rights reserved.
+ * Modifications Copyright (C) 2019 Nokia. All rights reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +24,7 @@ package org.onap.vid.asdc.local;
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import io.joshworks.restclient.http.HttpResponse;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.onap.vid.asdc.AsdcCatalogException;
@@ -156,6 +158,11 @@ public class LocalAsdcClient implements AsdcClient {
         }
     }
 
+    @Override
+    public HttpResponse<String> checkSDCConnectivity() {
+        return HttpResponse.fallback("");
+    }
+
     /**
      * The Class Builder.
      */
diff --git a/vid-app-common/src/main/java/org/onap/vid/asdc/rest/SdcRestClient.java b/vid-app-common/src/main/java/org/onap/vid/asdc/rest/SdcRestClient.java
index ab07aaeed..428083e7b 100644
--- a/vid-app-common/src/main/java/org/onap/vid/asdc/rest/SdcRestClient.java
+++ b/vid-app-common/src/main/java/org/onap/vid/asdc/rest/SdcRestClient.java
@@ -22,6 +22,7 @@ package org.onap.vid.asdc.rest;
 
 import com.att.eelf.configuration.EELFLogger;
 import com.google.common.collect.ImmutableMap;
+import io.joshworks.restclient.http.HttpResponse;
 import io.vavr.control.Try;
 import org.onap.portalsdk.core.util.SystemProperties;
 import org.onap.vid.asdc.AsdcCatalogException;
@@ -97,6 +98,13 @@ public class SdcRestClient implements AsdcClient {
     }
 
 
+    public HttpResponse<String> checkSDCConnectivity() {
+        String finalUrl = baseUrl + URIS.HEALTH_CHECK_ENDPOINT;
+
+        return syncRestClient
+                .get(finalUrl, prepareHeaders(auth, APPLICATION_JSON), Collections.emptyMap(), String.class);
+    }
+
     private Map<String, String> prepareHeaders(String auth, String contentType) {
         return ImmutableMap.of(
                 X_ECOMP_INSTANCE_ID, SystemProperties.getProperty(APP_DISPLAY_NAME),