From 22fce245d748d59a980c9744ab8a133b9a4fa758 Mon Sep 17 00:00:00 2001 From: Hengye Date: Thu, 5 Dec 2019 15:13:45 +0800 Subject: [PATCH] change HealthCheckReport URL from self to hostName Issue-ID: POLICY-1689 Consolidate Policy Health Check into PAP Change-Id: Ie7f8edf1d1a083c6c696824f249544959f72694d Signed-off-by: Hengye --- .../onap/policy/api/main/rest/provider/HealthCheckProvider.java | 8 +++++--- .../java/org/onap/policy/api/main/rest/TestApiRestServer.java | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/main/src/main/java/org/onap/policy/api/main/rest/provider/HealthCheckProvider.java b/main/src/main/java/org/onap/policy/api/main/rest/provider/HealthCheckProvider.java index e59aee8b..a8edaa12 100644 --- a/main/src/main/java/org/onap/policy/api/main/rest/provider/HealthCheckProvider.java +++ b/main/src/main/java/org/onap/policy/api/main/rest/provider/HealthCheckProvider.java @@ -1,9 +1,10 @@ /*- * ============LICENSE_START======================================================= - * ONAP Policy API - * ================================================================================ + * ONAP Policy API + * ================================================================================ * Copyright (C) 2018 Samsung Electronics Co., Ltd. All rights reserved. * Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. + * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,6 +26,7 @@ package org.onap.policy.api.main.rest.provider; import org.onap.policy.api.main.startstop.ApiActivator; import org.onap.policy.common.endpoints.report.HealthCheckReport; +import org.onap.policy.common.utils.network.NetworkUtil; /** * Class to fetch health check of api service. @@ -34,7 +36,7 @@ public class HealthCheckProvider { private static final String NOT_ALIVE = "not alive"; private static final String ALIVE = "alive"; - private static final String URL = "self"; + private static final String URL = NetworkUtil.getHostname(); private static final String NAME = "Policy API"; /** diff --git a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java index 359533ff..4dd88c07 100644 --- a/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java +++ b/main/src/test/java/org/onap/policy/api/main/rest/TestApiRestServer.java @@ -85,7 +85,7 @@ public class TestApiRestServer { private static final Logger LOGGER = LoggerFactory.getLogger(TestApiRestServer.class); private static final String NOT_ALIVE = "not alive"; private static final String ALIVE = "alive"; - private static final String SELF = "self"; + private static final String SELF = NetworkUtil.getHostname(); private static final String NAME = "Policy API"; private static final String APP_JSON = "application/json"; private static final String APP_YAML = "application/yaml"; -- 2.16.6