summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2022-03-29 21:03:59 +0000
committerGerrit Code Review <gerrit@onap.org>2022-03-29 21:03:59 +0000
commit8bac5aa914270399462e48aac19852523a25ba39 (patch)
treef9e9872381525fe1a039a66cc7da7648fd8b4bd6
parent8e08680b7371ce9b6dfd80ba4d0810c54f55c1f6 (diff)
parente78a901ef86740ec3a5ad9d831831eede3fa0a93 (diff)
Merge "VESMapper relying on CBS interface"1.4.0
-rw-r--r--Changelog.md3
-rw-r--r--UniversalVesAdapter/pom.xml4
-rw-r--r--UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java12
-rw-r--r--UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java225
-rw-r--r--pom.xml2
-rw-r--r--version.properties4
6 files changed, 10 insertions, 240 deletions
diff --git a/Changelog.md b/Changelog.md
index 65b0204..7a91e5e 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [1.4.0] - 2022/03/29
+ - [DCAEGEN2-3097] - Remove VESMapper reliance on CBS/Consul
+
## [1.3.3] - 2022/02/23
- [DCAEGEN2-3048] - Vulnerability fixes for J release (xstream,jackson-core,jackson-databind,gson)
diff --git a/UniversalVesAdapter/pom.xml b/UniversalVesAdapter/pom.xml
index c08155c..ad34a6f 100644
--- a/UniversalVesAdapter/pom.xml
+++ b/UniversalVesAdapter/pom.xml
@@ -28,11 +28,11 @@
<groupId>org.onap.dcaegen2.services.mapper.vesadapter</groupId>
<artifactId>UniversalVesAdapter</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<parent>
<groupId>org.onap.dcaegen2.services.mapper</groupId>
<artifactId>mapper</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<properties>
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
index 01da983..e996669 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
@@ -3,6 +3,7 @@
* ONAP : DCAE
* ================================================================================
* Copyright 2018-2019 TechMahindra
+ * Copyright (C) 2022 Huawei Technologies Co., Ltd.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -41,7 +42,7 @@ import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
import org.onap.universalvesadapter.utils.CollectorConfigPropertyRetrieval;
-import org.onap.universalvesadapter.utils.FetchDynamicConfig;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -95,22 +96,13 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
// Create the client and use it to get the configuration
CbsClientFactory.createCbsClient(env).flatMapMany(cbsClient -> cbsClient.updates(request, initialDelay, period))
.subscribe(jsonObject -> {
-
- // If env details not fetched static configuration file will be used
- if (env.consulHost() != null && env.cbsName() != null && env.appName() != null) {
- debugLogger.info(">>>Dynamic configuration to be used");
- FetchDynamicConfig.cbsCall(defaultConfigFilelocation);
- }
-
readJsonToMap(defaultConfigFilelocation);
debugLogger.info("Triggering controller's start url ");
fetchResultFromDestination("http://localhost:" + serverPort + "/start");
-
}, throwable -> {
debugLogger.warn("Cannot Connect", throwable);
});
-
}
/**
diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
deleted file mode 100644
index b8fa00f..0000000
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/utils/FetchDynamicConfig.java
+++ /dev/null
@@ -1,225 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : DCAE
- * ================================================================================
- * Copyright 2019 TechMahindra
- * ================================================================================
- * 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.universalvesadapter.utils;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.PrintWriter;
-import java.nio.file.Files;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.ClientProtocolException;
-import org.apache.http.client.HttpClient;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.impl.client.HttpClientBuilder;
-import org.json.JSONArray;
-import org.json.JSONObject;
-import org.json.JSONTokener;
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsRequests;
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
-import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsClientConfiguration;
-import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.stereotype.Component;
-import org.springframework.util.ResourceUtils;
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-@Component
-public class FetchDynamicConfig {
-
- // @Value("${defaultProtocol}")
- static String defaultProtocol = "http";
-
- private static final Logger debugLogger = LoggerFactory.getLogger("debugLogger");
- private static final Logger errorLogger = LoggerFactory.getLogger("errorLogger");
-
- private static String url;
- public static String retString;
- public static String retCBSString;
-
- // Generate RequestID and InvocationID which will be used when logging and in
- // HTTP requests
- final RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
- final CbsRequest request = CbsRequests.getConfiguration(diagnosticContext);
-
- // Read necessary properties from the environment
- static final CbsClientConfiguration env = CbsClientConfiguration.fromEnvironment();
-
- public FetchDynamicConfig() {
-
- }
-
- public static void cbsCall(String configFile) {
-
- Boolean areEqual;
- // Call consul api and identify the CBS Service address and port
- getconsul();
- // Construct and invoke CBS API to get application Configuration
- getCBS();
- // Verify if data has changed
- areEqual = verifyConfigChange(configFile);
-
- if (!areEqual) {
- FetchDynamicConfig fc = new FetchDynamicConfig();
- if (retCBSString != null) {
- fc.writefile(retCBSString, configFile);
- } else {
- debugLogger.debug("No content recieved from server");
- }
- } else {
- debugLogger.info("New config pull results identical - {} NOT refreshed", configFile);
- }
- }
-
- private static void getconsul() {
- url = defaultProtocol + "://" + env.consulHost() + ":" + env.consulPort() + "/v1/catalog/service/"
- + env.cbsName();
- retString = fetchResultFromDestination(url);
- debugLogger.info("CBS details fetched from Consul");
- }
-
- public static boolean verifyConfigChange(String configFile) {
-
- boolean areEqual = false;
- // Read current data
- try {
-
- File f = new File(ClassLoader.getSystemResource(configFile.trim()).getFile());
-
- if (f.exists() && !f.isDirectory()) {
- debugLogger.info("Comparing local configuration with the configuration fethed from CBS ");
-
- String jsonData = readFile(configFile);
- JSONObject jsonObject = new JSONObject(jsonData);
-
- ObjectMapper mapper = new ObjectMapper();
-
- JsonNode tree1 = mapper.readTree(jsonObject.toString());
- JsonNode tree2 = mapper.readTree(retCBSString);
- areEqual = tree1.equals(tree2);
- debugLogger.info("Comparison value:{}", areEqual);
- } else {
- debugLogger.info("First time config file read: {}",configFile);
- }
-
- } catch (IOException e) {
- errorLogger.error("Comparison with new fetched data failed", e);
-
- }
-
- return areEqual;
-
- }
-
- public static void getCBS() {
-
- // consul return as array
- JSONTokener temp = new JSONTokener(retString);
- JSONObject cbsjobj = (JSONObject) new JSONArray(temp).get(0);
-
- String urlPart1 = null;
- if (cbsjobj.has("ServiceAddress") && cbsjobj.has("ServicePort")) {
-
- urlPart1 = cbsjobj.getString("ServiceAddress") + ":" + cbsjobj.getInt("ServicePort");
-
- }
- debugLogger.info("CONFIG_BINDING_SERVICE HOST:PORT is {}", urlPart1);
-
- if (env.appName() != null) {
- url = defaultProtocol + "://" + urlPart1 + "/service_component/" + env.appName();
- retCBSString = fetchResultFromDestination(url);
- debugLogger.info("Configuration fetched from CBS successfully..");
- } else {
- errorLogger.error("Service name environment variable - APP_NAME/SERVICE_NAME not found within container ");
- }
- }
-
- public void writefile(String retCBSString, String configFile) {
-
- String indentedretstring = (new JSONObject(retCBSString)).toString(4);
- try {
- debugLogger.info("Overwriting local configuration file {} with configuartions received from CBS",
- configFile);
-
- File file2 = ResourceUtils.getFile("classpath:" + configFile);
- try (FileWriter fstream = new FileWriter(file2, false);
- PrintWriter printWriter = new PrintWriter(fstream)) {
- printWriter.print(indentedretstring);
- }
-
- debugLogger.info("New Config successfully written to local file to {}", configFile);
- } catch (IOException e) {
- errorLogger.error(
- "Error in writing configuration into local KV file " + configFile + retString, e);
- }
- }
-
- public static String readFile(String configFileName) {
- String content = null;
- File file = null;
-
- try {
- file = ResourceUtils.getFile("classpath:" + configFileName);
- content = new String(Files.readAllBytes(file.toPath()));
- } catch (FileNotFoundException e) {
- errorLogger.error("colud not find file :{}", configFileName);
- } catch (IOException e) {
- errorLogger.error("unable to read the file , reason:", e);
- } catch (Exception e) {
- errorLogger.error("Exception occured , reason:", e);
- }
-
- return content;
- }
-
- private static String fetchResultFromDestination(String url) {
- debugLogger.debug("FetchDynamicConfig : fetchResultFromDestination : START");
-
- StringBuffer sb = new StringBuffer();
- try {
- HttpClient client = HttpClientBuilder.create().build();
- HttpGet request = new HttpGet(url);
- HttpResponse response = client.execute(request);
- BufferedReader rd = new BufferedReader(new InputStreamReader(response.getEntity().getContent()));
- String line = "";
- while ((line = rd.readLine()) != null) {
- sb.append(line);
- sb.append('\n');
- }
- } catch (ClientProtocolException e) {
- debugLogger.debug("FetchDynamicConfig : fetchResultFromDestination : ClientProtocolException thrown.", e);
- } catch (UnsupportedOperationException e) {
- debugLogger.debug("FetchDynamicConfig : fetchResultFromDestination : UnsupportedOperationException thrown.",
- e);
- } catch (IOException e) {
- debugLogger.debug("FetchDynamicConfig : fetchResultFromDestination : IOException thrown.", e);
- }
-
- debugLogger.debug("FetchDynamicConfig : fetchResultFromDestination : END");
- return sb.toString();
- }
-
-}
diff --git a/pom.xml b/pom.xml
index a94f919..38a4940 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
<groupId>org.onap.dcaegen2.services.mapper</groupId>
<artifactId>mapper</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>dcaegen2-services-mapper</name>
diff --git a/version.properties b/version.properties
index 55f24a9..3db741f 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
-minor=3
-patch=2
+minor=4
+patch=0
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT