From 92726bd4b993c518f2f208465390e90499af35a2 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Tue, 1 May 2018 19:55:48 -0400 Subject: Remove the client load balancer use http client Issue-ID: AAI-965 Change-Id: I68600c2a586faa5537ac58ca21b06e984413a8bc Signed-off-by: Kajur, Harish (vk250x) --- aai-client-loadbalancer/LICENSE.TXT | 17 -- aai-client-loadbalancer/pom.xml | 158 ------------- .../java/org/onap/aai/AAIRibbonConfiguration.java | 52 ----- .../main/java/org/onap/aai/config/HttpPing.java | 66 ------ .../java/org/onap/aai/config/HttpPingImpl.java | 249 --------------------- 5 files changed, 542 deletions(-) delete mode 100644 aai-client-loadbalancer/LICENSE.TXT delete mode 100644 aai-client-loadbalancer/pom.xml delete mode 100644 aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java delete mode 100644 aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java delete mode 100644 aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java (limited to 'aai-client-loadbalancer') diff --git a/aai-client-loadbalancer/LICENSE.TXT b/aai-client-loadbalancer/LICENSE.TXT deleted file mode 100644 index 34558621..00000000 --- a/aai-client-loadbalancer/LICENSE.TXT +++ /dev/null @@ -1,17 +0,0 @@ -============LICENSE_START======================================================= -org.onap.aai -================================================================================ -Copyright © 2017-2018 AT&T Intellectual Property. 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. -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. -============LICENSE_END========================================================= diff --git a/aai-client-loadbalancer/pom.xml b/aai-client-loadbalancer/pom.xml deleted file mode 100644 index ace8aa0d..00000000 --- a/aai-client-loadbalancer/pom.xml +++ /dev/null @@ -1,158 +0,0 @@ - - - 4.0.0 - - org.onap.aai.aai-common - aai-common - 1.2.4-SNAPSHOT - - aai-client-loadbalancer - 1.2.4-SNAPSHOT - - - - org.apache.maven.plugins - maven-compiler-plugin - - ${java.version} - ${java.version} - - - - - jar - - aai-client-loadbalancer - AAI Client Side Loader Balancer to replace Dmaap - - - UTF-8 - 1.8 - 1.2.3 - - - - - org.springframework.cloud - spring-cloud-starter-ribbon - - - org.bouncycastle - bcprov-jdk15on - - - org.bouncycastle - bcpkix-jdk15on - - - - - org.springframework.cloud - spring-cloud-commons - - - org.springframework.boot - spring-boot-starter-web - 1.5.12.RELEASE - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - org.springframework - spring-core - 4.3.16.RELEASE - - - com.att.eelf - eelf-core - 1.0.0 - - - io.netty - netty-codec-http - 4.1.9.Final - - - ch.qos.logback - logback-core - ${logback.version} - - - ch.qos.logback - logback-classic - ${logback.version} - - - ch.qos.logback - logback-access - ${logback.version} - - - com.fasterxml.jackson.core - jackson-core - 2.8.11 - - - com.fasterxml.jackson.core - jackson-databind - 2.8.11 - - - - - - - org.springframework.cloud - spring-cloud-dependencies - Camden.SR5 - pom - import - - - - - - - spring-snapshots - Spring Snapshots - https://repo.spring.io/snapshot - - true - - - - spring-milestones - Spring Milestones - https://repo.spring.io/milestone - - false - - - - - diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java deleted file mode 100644 index 601c8734..00000000 --- a/aai-client-loadbalancer/src/main/java/org/onap/aai/AAIRibbonConfiguration.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. 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. - * 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. - * ============LICENSE_END========================================================= - */ -package org.onap.aai; - -import com.netflix.client.config.IClientConfig; -import com.netflix.loadbalancer.ILoadBalancer; -import com.netflix.loadbalancer.LoadBalancerBuilder; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cloud.client.loadbalancer.LoadBalanced; -import org.springframework.context.annotation.Bean; -import org.springframework.web.client.RestTemplate; - -/** - * AAIRibbonConfiguration is responsible for configuring the dmaap - * and it reads the users the application properties class - * and is mostly configurable via properties - */ -public class AAIRibbonConfiguration { - - @Autowired - IClientConfig ribbonClientConfig; - - @Bean - public ILoadBalancer ribbonLoadBalancer() { - return LoadBalancerBuilder.newBuilder() - .withClientConfig(ribbonClientConfig) - .buildLoadBalancerFromConfigWithReflection(); - } - - @LoadBalanced - @Bean - public RestTemplate loadBalancedRestTemplate(){ - return new RestTemplate(); - } -} diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java deleted file mode 100644 index fcda0747..00000000 --- a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPing.java +++ /dev/null @@ -1,66 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. 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. - * 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. - * ============LICENSE_END========================================================= - */ -package org.onap.aai.config; - -import java.util.Optional; - -/** - * HttpPing interface provides access to update the endpoint and - * and the security level of the server that the user is trying to access - */ -public interface HttpPing { - - /** - * Sets the endpoint that the http get request will - * make to verify if the url can be reached - * - * @param endpoint - the endpoint of the url that is used to do healthcheck - */ - void setHealthCheckEndpoint(String endpoint); - - /** - * Returns the health check endpoint that the implementation - * will use in order to verify if the server is reachable at that location - * - * @return endpoint - the endpoint of the url that is used to do healthcheck - */ - String getHealthCheckEndpoint(); - - /** - * Set the credentials for the rest endpoint to verify authorization - * - * @param username - the username to the server trying to connect to - * @param password - the password to the server trying to connect to - */ - void setCredentials(String username, String password); - - /** - * Return the base64 authorization string set from the username and password - * - * @return encoded string using base64 of the username and password values - * like this: - * 
-     * @{code
-     *      "username:password" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ="
-     * }
-     *
- */ - Optional getAuthorization(); -} diff --git a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java b/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java deleted file mode 100644 index dd198016..00000000 --- a/aai-client-loadbalancer/src/main/java/org/onap/aai/config/HttpPingImpl.java +++ /dev/null @@ -1,249 +0,0 @@ -/** - * ============LICENSE_START======================================================= - * org.onap.aai - * ================================================================================ - * Copyright © 2017-2018 AT&T Intellectual Property. 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. - * 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. - * ============LICENSE_END========================================================= - */ -package org.onap.aai.config; - -import com.att.eelf.configuration.EELFLogger; -import com.att.eelf.configuration.EELFManager; -import com.netflix.client.config.DefaultClientConfigImpl; -import com.netflix.client.config.IClientConfig; -import com.netflix.loadbalancer.IPing; -import com.netflix.loadbalancer.Server; -import org.springframework.http.*; -import org.springframework.web.client.HttpClientErrorException; -import org.springframework.web.client.RestTemplate; - -import java.io.IOException; -import java.net.InetSocketAddress; -import java.net.Socket; -import java.net.SocketAddress; -import java.util.Base64; -import java.util.Collections; -import java.util.Map; -import java.util.Optional; - -public class HttpPingImpl implements HttpPing, IPing { - - private static final EELFLogger logger = EELFManager.getInstance().getLogger(HttpPingImpl.class); - - private static final Base64.Encoder base64Encoder = Base64.getEncoder(); - - private static final HttpHeaders HTTP_HEADERS = new HttpHeaders(); - - // This is a workaround for the topics that the user - // does not have the access to read their own topic status - private static final String MR_STATUS_PATTERN = ".*\"mrstatus\":\\s*4002.*"; - - private static final int HTTPS_PORT = 3905; - private static final int DEFAULT_TIMEOUT = 2; - - private String healthCheckEndpoint; - private String username; - private String password; - - private int timeout; - - private final RestTemplate restTemplate; - - public HttpPingImpl(String healthCheckEndpoint) { - this(new RestTemplate()); - this.healthCheckEndpoint = healthCheckEndpoint; - this.timeout = DEFAULT_TIMEOUT; - } - - public HttpPingImpl(RestTemplate restTemplate) { - this.restTemplate = restTemplate; - this.healthCheckEndpoint = ""; - this.timeout = DEFAULT_TIMEOUT; - } - - public HttpPingImpl() { - this(""); - } - - public HttpPingImpl(IClientConfig clientConfig) { - - if (!(clientConfig instanceof DefaultClientConfigImpl)) { - throw new UnsupportedOperationException("Unable to support the client config implementation: " + clientConfig.getClass().getName()); - } - - DefaultClientConfigImpl defaultClientConfig = (DefaultClientConfigImpl) clientConfig; - - Map map = defaultClientConfig.getProperties(); - - this.setCredentials(map.get("username").toString(), map.get("password").toString()); - this.setHealthCheckEndpoint(map.get("health.endpoint").toString()); - this.setTimeoutInSecs(Integer.valueOf(map.get("pingport.timeout").toString())); - - this.restTemplate = new RestTemplate(); - } - - /** - * {@inheritDoc} - */ - @Override - public void setHealthCheckEndpoint(String endpoint) { - this.healthCheckEndpoint = endpoint; - } - - /** - * {@inheritDoc} - */ - @Override - public String getHealthCheckEndpoint() { - return healthCheckEndpoint; - } - - @Override - public void setCredentials(String username, String password) { - this.username = username; - this.password = password; - } - - public void setTimeoutInSecs(int timeout) { - this.timeout = timeout; - } - - @Override - public Optional getAuthorization() { - - if (username == null && password == null) { - return Optional.empty(); - } - - if (username == null || username.isEmpty()) { - logger.error("Username is null while the password is not correctly set"); - return Optional.empty(); - } - - if (password == null || password.isEmpty()) { - logger.error("Password is null while the username is not correctly set"); - return Optional.empty(); - } - - String auth = String.format("%s:%s", username, password); - return Optional.ofNullable("Basic " + base64Encoder.encodeToString(auth.getBytes())); - } - - /** - * @{inheritDoc} - */ - @Override - public boolean isAlive(Server server) { - - String url = null; - - // If unable to ping the port then return immediately - if (!pingPort(server)) { - return false; - } - - if (server.getPort() == HTTPS_PORT) { - url = "https://"; - } else { - - url = "http://"; - } - - url = url + server.getId(); - url = url + this.getHealthCheckEndpoint(); - - boolean isAlive = false; - - Optional authorization = getAuthorization(); - - HttpHeaders httpHeaders = new HttpHeaders(); - httpHeaders.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON)); - - if (authorization.isPresent()) { - httpHeaders.add("Authorization", authorization.get()); - } - - HttpEntity httpEntity = new HttpEntity<>(httpHeaders); - try { - - ResponseEntity responseEntity = restTemplate.exchange(url, HttpMethod.GET, httpEntity, String.class); - - HttpStatus httpStatus = responseEntity.getStatusCode(); - - if (httpStatus == HttpStatus.OK) { - isAlive = true; - logger.info("Successfully established connection to the following url {}", url); - return isAlive; - } - - logger.warn("Unable to establish a connection the following url {} due to HTTP Code {}, and reason {}", - url, httpStatus.value(), httpStatus.getReasonPhrase()); - - } catch (HttpClientErrorException ex) { - HttpStatus httpStatus = ex.getStatusCode(); - if (httpStatus == HttpStatus.FORBIDDEN) { - // This is a workaround being in play for the topics - // that are unable to read themselves for this user - // In the case of the username and password being - // wrong the response would be unauthorized (401) but if the - // user is authorized but unable to read this topic, then - // we get back the (403) with the message mrstatus 4002 - // This is a temporary workaround to properly identify which server is down - String body = ex.getResponseBodyAsString(); - if (body.matches(MR_STATUS_PATTERN)) { - isAlive = true; - logger.info("Successfully connected by workaround due to unable to read own topic {}", url); - return isAlive; - } else { - logger.warn("Unable to establish a connection to {} due to {}", server.getHostPort(), ex.getMessage()); - } - } else { - logger.warn("Unable to establish a connection to {} due to {}", server.getHostPort(), ex.getMessage()); - } - } catch (Exception ex) { - logger.warn("Unable to establish a connection to {} due to {}", server.getHostPort(), ex.getMessage()); - } - - return isAlive; - } - - /** - * Returns true if it can connect to the host and port within - * the given timeout from the given server parameter - * - * @param server - server that will be taken from the src/main/resources/application.yml file - * @return true if it can make a successful socket connection to the port on the host - */ - public boolean pingPort(Server server) { - - String host = server.getHost(); - Integer port = server.getPort(); - - boolean success = false; - SocketAddress socketAddress = new InetSocketAddress(host, port); - - try (Socket socket = new Socket()) { - socket.connect(socketAddress, timeout * 1000); - if (socket.isConnected()) { - success = true; - } - } catch (IOException e) { - logger.warn("Unable to connect to the host {} on port {} due to {}", host, port, e.getLocalizedMessage()); - success = false; - } - - return success; - } -} -- cgit 1.2.3-korg