aboutsummaryrefslogtreecommitdiffstats
path: root/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs
diff options
context:
space:
mode:
Diffstat (limited to 'rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs')
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClientFactory.java11
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java88
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java53
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/CbsClientConfiguration.java103
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationClient.java114
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationProvider.java24
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java139
7 files changed, 524 insertions, 8 deletions
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClientFactory.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClientFactory.java
index f0293564..e43cf312 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClientFactory.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClientFactory.java
@@ -4,7 +4,6 @@
* ================================================================================
* Copyright (C) 2019-2021 Nokia. All rights reserved.
* Copyright (C) 2021 Wipro Limited.
- * Copyright (C) 2022 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.
@@ -25,6 +24,8 @@ import org.jetbrains.annotations.NotNull;
import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient;
import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClientFactory;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.CbsClientConfigMap;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.CbsClientRest;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl.CbsLookup;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
import org.onap.dcaegen2.services.sdk.security.ssl.TrustStoreKeys;
import org.slf4j.Logger;
@@ -74,6 +75,12 @@ public class CbsClientFactory {
CbsClientConfiguration configuration) {
CbsClientConfigMap cbsClientConfigMap = new CbsClientConfigMap(configuration.configMapFilePath(),
configuration.policySyncFilePath(), configuration.appName());
- return Mono.just(cbsClientConfigMap);
+ return cbsClientConfigMap.verifyConfigMapFile() ? Mono.just(cbsClientConfigMap) :
+ getConfigFromCBS(httpClient, configuration);
+ }
+
+ private static Mono<CbsClient> getConfigFromCBS(RxHttpClient httpClient, CbsClientConfiguration configuration) {
+ return new CbsLookup().lookup(configuration)
+ .map(addr ->new CbsClientRest(httpClient, configuration.appName(), addr, configuration.protocol()));
}
}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java
new file mode 100644
index 00000000..3eda6d8a
--- /dev/null
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientRest.java
@@ -0,0 +1,88 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2019-2021 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.
+ * 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.dcaegen2.services.sdk.rest.services.cbs.client.impl;
+
+import com.google.gson.JsonObject;
+import org.jetbrains.annotations.NotNull;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpResponse;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.ImmutableHttpRequest;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+
+import java.net.InetSocketAddress;
+import java.net.MalformedURLException;
+import java.net.URL;
+
+public class CbsClientRest implements CbsClient {
+ private static final Logger LOGGER = LoggerFactory.getLogger(CbsClientRest.class);
+ private final RxHttpClient httpClient;
+ private final String serviceName;
+ private final InetSocketAddress cbsAddress;
+ private final String protocol;
+
+ public CbsClientRest(RxHttpClient httpClient, String serviceName, InetSocketAddress cbsAddress, String protocol) {
+ this.httpClient = httpClient;
+ this.serviceName = serviceName;
+ this.cbsAddress = cbsAddress;
+ this.protocol = protocol;
+ }
+
+ @Override
+ public @NotNull Mono<JsonObject> get(CbsRequest request) {
+ return Mono.fromCallable(() -> constructUrl(request).toString())
+ .doOnNext(this::logRequestUrl)
+ .map(url -> ImmutableHttpRequest.builder()
+ .method(HttpMethod.GET)
+ .url(url)
+ .diagnosticContext(request.diagnosticContext())
+ .build())
+ .flatMap(httpClient::call)
+ .doOnNext(HttpResponse::throwIfUnsuccessful)
+ .map(resp -> resp.bodyAsJson(JsonObject.class))
+ .map(CbsClientEnvironmentParsing::processEnvironmentVariables)
+ .doOnNext(this::logCbsResponse);
+ }
+
+ private void logRequestUrl(String url) {
+ LOGGER.debug("Calling {} for configuration", url);
+ }
+
+ private void logCbsResponse(JsonObject json) {
+ LOGGER.info("Got successful response from Config Binding Service");
+ LOGGER.debug("CBS response: {}", json);
+ }
+
+ private URL constructUrl(CbsRequest request) {
+ try {
+ return new URL(
+ this.protocol,
+ cbsAddress.getHostString(),
+ cbsAddress.getPort(),
+ request.requestPath().getForService(serviceName));
+ } catch (MalformedURLException e) {
+ throw new IllegalArgumentException("Invalid CBS URL", e);
+ }
+ }
+} \ No newline at end of file
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java
new file mode 100644
index 00000000..c07ed8e4
--- /dev/null
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsLookup.java
@@ -0,0 +1,53 @@
+/*
+ * ============LICENSE_START====================================
+ * DCAEGEN2-SERVICES-SDK
+ * =========================================================
+ * 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.
+ * 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.dcaegen2.services.sdk.rest.services.cbs.client.impl;
+
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+
+import java.net.InetSocketAddress;
+
+/**
+ * @author <a href="mailto:piotr.jaszczyk@nokia.com">Piotr Jaszczyk</a>
+ * @since February 2019
+ */
+public class CbsLookup {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(CbsLookup.class);
+
+ public Mono<InetSocketAddress> lookup(CbsClientConfiguration configuration) {
+ return Mono.just(createCbsAddress(configuration))
+ .doOnNext(this::logCbsServiceAddress);
+ }
+
+ private InetSocketAddress createCbsAddress(CbsClientConfiguration configuration) {
+ return InetSocketAddress.createUnresolved(
+ configuration.hostname(),
+ configuration.port());
+ }
+
+ private void logCbsServiceAddress(InetSocketAddress address) {
+ LOGGER.info("Config Binding Service address: {}", address);
+ }
+
+}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/CbsClientConfiguration.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/CbsClientConfiguration.java
index fa265d85..6eec6674 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/CbsClientConfiguration.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/CbsClientConfiguration.java
@@ -4,7 +4,6 @@
* =========================================================
* Copyright (C) 2019-2021 Nokia. All rights reserved.
* Copyright (C) 2021 Wipro Limited.
- * Copyright (C) 2022 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.
@@ -51,7 +50,7 @@ public interface CbsClientConfiguration {
String TRUST_JKS = "trust.jks";
String TRUST_PASS = "trust.pass";
-
+ Integer PORT_FOR_CBS_OVER_TLS = 10443;
/**
* Name of environment variable containing path to the cacert.pem file.
@@ -59,6 +58,16 @@ public interface CbsClientConfiguration {
String DCAE_CA_CERT_PATH = "DCAE_CA_CERTPATH";
/**
+ * Name of environment variable containing Config Binding Service network hostname.
+ */
+ String ENV_CBS_HOSTNAME = "CONFIG_BINDING_SERVICE";
+
+ /**
+ * Name of environment variable containing Config Binding Service network port.
+ */
+ String ENV_CBS_PORT = "CONFIG_BINDING_SERVICE_SERVICE_PORT";
+
+ /**
* Name of environment variable containing current application name.
*/
String ENV_APP_NAME = "HOSTNAME";
@@ -73,16 +82,61 @@ public interface CbsClientConfiguration {
*/
String ENV_CBS_CLIENT_POLICY_PATH = "CBS_CLIENT_POLICY_PATH";
+ /**
+ * Name of environment variable containing Consul host name.
+ *
+ * @deprecated CBS lookup in Consul service should not be needed,
+ * instead {@link #ENV_CBS_HOSTNAME} should be used directly.
+ */
+ @Deprecated
+ String ENV_CONSUL_HOST = "CONSUL_HOST";
+
+ /**
+ * Name of environment variable containing Config Binding Service <em>service name</em> as registered in Consul
+ * services API.
+ *
+ * @deprecated CBS lookup in Consul service should not be needed,
+ * instead {@link #ENV_CBS_HOSTNAME} should be used directly.
+ */
+ @Deprecated
+ String ENV_CBS_NAME = "CONFIG_BINDING_SERVICE";
+
+ @Value.Parameter
+ @Nullable
+ String hostname();
+
+ @Value.Parameter
+ @Nullable
+ Integer port();
@Value.Parameter
String appName();
+ @Value.Parameter
+ @Nullable
+ String protocol();
+
@Value.Default
default @Nullable TrustStoreKeys trustStoreKeys() {
return null;
}
@Value.Default
+ @Deprecated
+ default String consulHost() {
+ return "consul-server";
+ }
+ @Value.Default
+ @Deprecated
+ default Integer consulPort() {
+ return 8500;
+ }
+ @Value.Default
+ @Deprecated
+ default String cbsName() {
+ return "config-binding-service";
+ }
+ @Value.Default
default String configMapFilePath() {
return "/app-config/application_config.yaml";
}
@@ -91,7 +145,6 @@ public interface CbsClientConfiguration {
return "/etc/policies/policies.json";
}
-
/**
* Creates CbsClientConfiguration from system environment variables.
*
@@ -102,6 +155,7 @@ public interface CbsClientConfiguration {
String pathToCaCert = System.getenv(DCAE_CA_CERT_PATH);
ImmutableCbsClientConfiguration.Builder configBuilder = ImmutableCbsClientConfiguration.builder()
+ .hostname(getEnv(ENV_CBS_HOSTNAME))
.appName(getEnv(ENV_APP_NAME));
Optional.ofNullable(System.getenv(ENV_CBS_CLIENT_CONFIG_PATH))
@@ -109,7 +163,41 @@ public interface CbsClientConfiguration {
Optional.ofNullable(System.getenv(ENV_CBS_CLIENT_POLICY_PATH))
.ifPresent(configBuilder::policySyncFilePath);
- return configBuilder.build();
+
+ return Optional.ofNullable(pathToCaCert).filter(certPath -> !"".equals(certPath))
+ .map(certPath -> createSslHttpConfig(configBuilder, certPath))
+ .orElseGet(() -> createPlainHttpConfig(configBuilder));
+ }
+
+ static CbsClientConfiguration createPlainHttpConfig(ImmutableCbsClientConfiguration.Builder configBuilder) {
+ LOGGER.info("CBS client will use plain http protocol.");
+ return configBuilder
+ .protocol("http")
+ .port(Integer.valueOf(getEnv(ENV_CBS_PORT)))
+ .build();
+ }
+
+ static CbsClientConfiguration createSslHttpConfig(ImmutableCbsClientConfiguration.Builder configBuilder,
+ String pathToCaCert) {
+ LOGGER.info("CBS client will use http over TLS.");
+ return configBuilder
+ .trustStoreKeys(crateSecurityKeysFromEnvironment(createPathToJksFile(pathToCaCert)))
+ .port(PORT_FOR_CBS_OVER_TLS)
+ .protocol("https")
+ .build();
+ }
+
+ static TrustStoreKeys crateSecurityKeysFromEnvironment(String pathToCerts) {
+ LOGGER.info("Path to cert files: {}", pathToCerts + "/");
+ validateIfFilesExist(pathToCerts);
+ return ImmutableTrustStoreKeys.builder()
+ .trustStore(SecurityKeysStore.fromPath(Paths.get(pathToCerts + "/" + TRUST_JKS)))
+ .trustStorePassword(Passwords.fromPath(Paths.get(pathToCerts + "/" + TRUST_PASS)))
+ .build();
+ }
+
+ static String createPathToJksFile(String pathToCaCertPemFile) {
+ return pathToCaCertPemFile.substring(0, pathToCaCertPemFile.lastIndexOf("/"));
}
static String getEnv(String envName) {
@@ -124,5 +212,12 @@ public interface CbsClientConfiguration {
}
}
+ static void validateIfFilesExist(String pathToFile) {
+ boolean areFilesExist = Files.exists(Paths.get(pathToFile + "/" + TRUST_JKS)) &&
+ Files.exists(Paths.get(pathToFile + "/" + TRUST_PASS));
+ if (!areFilesExist) {
+ throw new CbsClientConfigurationException("Required files do not exist in " + pathToFile + " directory.");
+ }
+ }
}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationClient.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationClient.java
new file mode 100644
index 00000000..e1dd7aff
--- /dev/null
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationClient.java
@@ -0,0 +1,114 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA 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.dcaegen2.services.sdk.rest.services.cbs.client.providers;
+
+import com.google.gson.JsonObject;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.ImmutableCbsClientConfiguration;
+import reactor.core.publisher.Mono;
+
+/**
+ * Complete CloudConfiguration HTTPClient API.
+ *
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 11/16/18
+ * @version 1.0.0
+ * @since 1.0.0
+ */
+public final class CloudConfigurationClient implements CloudConfigurationProvider {
+
+ private final CloudConfigurationProvider cloudConfigurationProvider;
+
+ /**
+ * Default constructor for CloudConfigurationClient, set CloudConfigurationProvider cloudConfigurationProvider
+ * property by calling: {@link ReactiveCloudConfigurationProvider}.
+ * Calls other constructor in this class {@link #CloudConfigurationClient(CloudConfigurationProvider)}.
+ */
+ public CloudConfigurationClient() {
+ this(new ReactiveCloudConfigurationProvider());
+ }
+
+ /**
+ * Constructor for CloudConfigurationClient, set loudConfigurationProvider cloudConfigurationProvider property
+ * by passing them in constructor {@link org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers.CloudConfigurationProvider}
+ * implementation client.
+ *
+ * @param cloudConfigurationProvider - client provider for calling ConfigBindingService
+ */
+ public CloudConfigurationClient(
+ CloudConfigurationProvider cloudConfigurationProvider) {
+ this.cloudConfigurationProvider = cloudConfigurationProvider;
+ }
+
+ /**
+ * Documentation in {@link org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers.CloudConfigurationProvider}
+ *
+ * @param consulHost - Hostname/IPAddress of consul Database
+ * @param consulPort - Port number of consul Database
+ * @param cbsName - ConfigBindingService url
+ * @param appName - ApplicationName for each config will be returned
+ */
+ @Override
+ public Mono<JsonObject> callForServiceConfigurationReactive(String consulHost, int consulPort, String cbsName,
+ String appName) {
+ return cloudConfigurationProvider.callForServiceConfigurationReactive(
+ ImmutableCbsClientConfiguration.builder().consulHost(consulHost)
+ .consulPort(consulPort).cbsName(cbsName)
+ .appName(appName).build());
+ }
+
+ /**
+ * Documentation in {@link org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers.CloudConfigurationProvider}.
+ *
+ * @param cbsClientConfiguration - Object holds consulPort, consulURL, configBindingSeriveName, applicationName which have
+ * been defined in dcaegen2 cloud environment.
+ */
+ @Override
+ public Mono<JsonObject> callForServiceConfigurationReactive(CbsClientConfiguration cbsClientConfiguration) {
+ return cloudConfigurationProvider.callForServiceConfigurationReactive(cbsClientConfiguration);
+ }
+
+ /**
+ * Documentation in {@link org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers.CloudConfigurationProvider}.
+ *
+ * @param consulHost - Hostname/IPAddress of consul Database
+ * @param consulPort - Port number of consul Database
+ * @param cbsName - ConfigBindingService url
+ * @param appName - ApplicationName for each config will be returned
+ */
+ @Override
+ public JsonObject callForServiceConfiguration(String consulHost, int consulPort, String cbsName, String appName) {
+ return cloudConfigurationProvider.callForServiceConfigurationReactive(
+ ImmutableCbsClientConfiguration.builder().consulHost(consulHost)
+ .consulPort(consulPort).cbsName(cbsName)
+ .appName(appName).build()).block();
+ }
+
+ /**
+ * Documentation in {@link org.onap.dcaegen2.services.sdk.rest.services.cbs.client.providers.CloudConfigurationProvider}.
+ *
+ * @param cbsClientConfiguration - Object holds consulPort, consulURL, configBindingSeriveName, applicationName which have
+ */
+ @Override
+ public JsonObject callForServiceConfiguration(CbsClientConfiguration cbsClientConfiguration) {
+ return cloudConfigurationProvider.callForServiceConfigurationReactive(cbsClientConfiguration).block();
+ }
+}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationProvider.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationProvider.java
index 37e59ca5..c0dbd5f9 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationProvider.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/CloudConfigurationProvider.java
@@ -1,9 +1,8 @@
/*
-* ============LICENSE_START=======================================================
+ * ============LICENSE_START=======================================================
* DCAEGEN2-SERVICES-SDK
* ================================================================================
* Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
- * Copyright (C) 2022 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.
@@ -65,6 +64,27 @@ public interface CloudConfigurationProvider {
String appName);
+ /*callForServiceConfiguration*/
+ /**
+ * Getting configuration for appName from ConfigBindingService.
+ *
+ * @param consulHost - Hostname/IPAddress of consul Database
+ * @param consulPort - Port number of consul Database
+ * @param cbsName - ConfigBindingService url
+ * @param appName - ApplicationName for each config will be returned
+ * @return configuration for specified application in dcaegen2 cloud infrastructure.
+ */
+ JsonObject callForServiceConfiguration(String consulHost, int consulPort, String cbsName, String appName);
+
+ /*callForServiceConfiguration*/
+
+ /**
+ * Getting configuration for appName from ConfigBindingService.
+ *
+ * @param cbsClientConfiguration - Object holds consulPort, consulURL, configBindingSeriveName, applicationName which have
+ * @return configuration for specified application in dcaegen2 cloud infrastructure.
+ */
+ JsonObject callForServiceConfiguration(CbsClientConfiguration cbsClientConfiguration);
}
diff --git a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
new file mode 100644
index 00000000..a50edd38
--- /dev/null
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/providers/ReactiveCloudConfigurationProvider.java
@@ -0,0 +1,139 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2018-2019 NOKIA 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.dcaegen2.services.sdk.rest.services.cbs.client.providers;
+
+import com.google.gson.JsonArray;
+import com.google.gson.JsonObject;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpMethod;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.HttpRequest;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.ImmutableHttpRequest;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClient;
+import org.onap.dcaegen2.services.sdk.rest.services.adapters.http.RxHttpClientFactory;
+import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
+import org.onap.dcaegen2.services.sdk.rest.services.uri.URI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import reactor.core.publisher.Mono;
+
+/**
+ * @author <a href="mailto:przemyslaw.wasala@nokia.com">Przemysław Wąsala</a> on 11/15/18
+ */
+public final class ReactiveCloudConfigurationProvider implements CloudConfigurationProvider {
+
+ private static final Logger LOGGER = LoggerFactory.getLogger(ReactiveCloudConfigurationProvider.class);
+ private static final String EXCEPTION_MESSAGE = "Unsupported method call: ";
+
+ private final RxHttpClient rxHttpClient;
+
+ public ReactiveCloudConfigurationProvider() {
+ this(RxHttpClientFactory.create());
+ }
+
+ ReactiveCloudConfigurationProvider(RxHttpClient rxHttpClient) {
+ this.rxHttpClient = rxHttpClient;
+ }
+
+ @Override
+ public Mono<JsonObject> callForServiceConfigurationReactive(CbsClientConfiguration configuration) {
+ return callConsulForConfigBindingServiceEndpoint(configuration)
+ .flatMap(this::callConfigBindingServiceForConfiguration);
+ }
+
+ @Override
+ public Mono<JsonObject> callForServiceConfigurationReactive(String consulHost, int consulPort, String cbsName,
+ String appName) {
+ throw new UnsupportedOperationException(EXCEPTION_MESSAGE + this);
+ }
+
+ @Override
+ public JsonObject callForServiceConfiguration(String consulHost, int consulPort, String cbsName, String appName) {
+ throw new UnsupportedOperationException(EXCEPTION_MESSAGE + this);
+ }
+
+ @Override
+ public JsonObject callForServiceConfiguration(CbsClientConfiguration configuration) {
+ throw new UnsupportedOperationException(EXCEPTION_MESSAGE + this);
+ }
+
+ private Mono<String> callConsulForConfigBindingServiceEndpoint(CbsClientConfiguration configuration) {
+ LOGGER.info("Retrieving Config Binding Service endpoint from Consul");
+
+ HttpRequest httpRequest = ImmutableHttpRequest.builder()
+ .url(getConsulUrl(configuration)).method(HttpMethod.GET).build();
+
+ return rxHttpClient.call(httpRequest)
+ .map(resp -> resp.bodyAsJson(JsonArray.class))
+ .flatMap(jsonArray ->
+ this.createConfigBindingServiceUrl(
+ jsonArray,
+ configuration.appName())
+ );
+ }
+
+ private String getConsulUrl(CbsClientConfiguration configuration) {
+ return getUri(configuration.consulHost(), configuration.consulPort(), "/v1/catalog/service",
+ configuration.cbsName());
+ }
+
+ private Mono<JsonObject> callConfigBindingServiceForConfiguration(String configBindingServiceUri) {
+ LOGGER.info("Retrieving configuration");
+ HttpRequest httpRequest = ImmutableHttpRequest.builder()
+ .url(configBindingServiceUri).method(HttpMethod.GET).build();
+
+ return rxHttpClient.call(httpRequest)
+ .map(httpResponse -> httpResponse.bodyAsJson(JsonObject.class));
+ }
+
+
+ private Mono<String> createConfigBindingServiceUrl(JsonArray jsonArray, String appName) {
+ return getConfigBindingObject(jsonArray)
+ .flatMap(jsonObject -> buildConfigBindingServiceUrl(jsonObject, appName));
+ }
+
+ private Mono<String> buildConfigBindingServiceUrl(JsonObject jsonObject, String appName) {
+ return Mono.just(getUri(jsonObject.get("ServiceAddress").getAsString(),
+ jsonObject.get("ServicePort").getAsInt(), "/service_component", appName));
+ }
+
+ private Mono<JsonObject> getConfigBindingObject(JsonArray jsonArray) {
+ try {
+ if (jsonArray.size() > 0) {
+ return Mono.just(jsonArray.get(0).getAsJsonObject());
+ } else {
+ throw new IllegalStateException("JSON Array was empty");
+ }
+ } catch (IllegalStateException e) {
+ LOGGER.warn("Failed to retrieve JSON Object from array", e);
+ return Mono.error(e);
+ }
+ }
+
+ private String getUri(String host, Integer port, String... paths) {
+ return new URI.URIBuilder()
+ .scheme("http")
+ .host(host)
+ .port(port)
+ .path(String.join("/", paths))
+ .build().toString();
+ }
+
+} \ No newline at end of file