Add protocols to hosts

Add default protocols for Consul hosts

Add controller for healt check

Fix for merging properties from file and Consul

Change-Id: Ifa8c7cdfa333d8ffee175b5eb4446f0c3a986f27
Issue-ID: DCAEGEN2-747
Signed-off-by: Jakub Zieba <jakub.zieba@nokia.com>

1 files changed, 7 insertions, 9 deletions

diff --git a/src/test/java/org/onap/dcae/WiremockBasedTest.java b/src/test/java/org/onap/dcae/WiremockBasedTest.java
index ae851259..58626340 100644
--- a/src/test/java/org/onap/dcae/WiremockBasedTest.java
+++ b/src/test/java/org/onap/dcae/WiremockBasedTest.java
@@ -17,19 +17,17 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-package org.onap.dcae;
 
-import static com.github.tomakehurst.wiremock.client.WireMock.aResponse;
-import static com.github.tomakehurst.wiremock.client.WireMock.get;
-import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
-import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
-import static io.vavr.API.Map;
+package org.onap.dcae;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import io.vavr.collection.Map;
 import org.junit.Rule;
 
+import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
+import static io.vavr.API.Map;
+
 /**
  * @author Pawel Szalapski (pawel.szalapski@nokia.com)
  */
@@ -51,7 +49,7 @@ public class WiremockBasedTest {
 
     protected Map<String, String> wiremockBasedEnvProps() {
         return Map(
-            "CONSUL_HOST", "http://localhost",
+            "CONSUL_HOST", "localhost",
             "CONSUL_PORT", "" + wireMockRule.port(),
             "HOSTNAME", "VESCollector",
             "CONFIG_BINDING_SERVICE", "CBSName"
@@ -61,7 +59,7 @@ public class WiremockBasedTest {
     protected String validLocalCBSConf() {
         return ""
             + "[{ "
-            + "\"ServiceAddress\": \"http://localhost\","
+            + "\"ServiceAddress\": \"localhost\","
             + "\"ServicePort\":" + wireMockRule.port()
             + "}]";
     }