aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md4
-rw-r--r--pom.xml2
-rw-r--r--rest-services/cbs-client/pom.xml2
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/api/CbsClientFactory.java6
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java71
-rw-r--r--rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/model/CbsClientConfiguration.java5
-rw-r--r--rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMapTest.java58
-rw-r--r--rest-services/cbs-client/src/test/resources/policies.json58
-rw-r--r--rest-services/cbs-client/src/test/resources/sample_expected_all_config.json54
-rw-r--r--rest-services/cbs-client/src/test/resources/sample_expected_policy_config.json117
-rw-r--r--rest-services/dmaap-client/pom.xml2
-rw-r--r--rest-services/http-client/pom.xml2
-rw-r--r--rest-services/model/pom.xml2
-rw-r--r--rest-services/pom.xml2
-rw-r--r--security/crypt-password/pom.xml2
-rw-r--r--security/pom.xml2
-rw-r--r--security/ssl/pom.xml2
-rw-r--r--services/common/pom.xml2
-rw-r--r--services/external-schema-manager/pom.xml2
-rw-r--r--services/hv-ves-client/pom.xml2
-rw-r--r--services/hv-ves-client/producer/api/pom.xml2
-rw-r--r--services/hv-ves-client/producer/ct/pom.xml2
-rw-r--r--services/hv-ves-client/producer/impl/pom.xml2
-rw-r--r--services/hv-ves-client/producer/pom.xml2
-rw-r--r--services/hv-ves-client/protobuf/pom.xml2
-rw-r--r--services/pom.xml2
-rw-r--r--standardization/api-custom-header/pom.xml2
-rw-r--r--standardization/moher-api/healthstate/pom.xml2
-rw-r--r--standardization/moher-api/metrics/pom.xml2
-rw-r--r--standardization/moher-api/pom.xml2
-rw-r--r--standardization/moher-api/server-adapters/pom.xml2
-rw-r--r--standardization/moher-api/server-adapters/reactor-netty/pom.xml2
-rw-r--r--standardization/moher-api/server-adapters/spring-webflux/pom.xml2
-rw-r--r--standardization/pom.xml2
-rw-r--r--version.properties2
35 files changed, 385 insertions, 42 deletions
diff --git a/Changelog.md b/Changelog.md
index 8c256593..14a885d2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@ 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.8.5] - 02/06/2021
+### Added
+ - [DCAEGEN2-2752] (https://jira.onap.org/browse/DCAEGEN2-2752) - Update CBS-Client to read policy configuration from a file exposed by policy-sidecar container
+
## [1.8.4] - 14/05/2021
### Added
- [DCAEGEN2-2716] (https://jira.onap.org/browse/DCAEGEN2-2716) - Add to Java CBS-Client ability to resolve evns in app-config.yaml loaded from ConfigMap
diff --git a/pom.xml b/pom.xml
index a56558be..9b866ec7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>sdk</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
<name>dcaegen2-services-sdk</name>
<description>Common SDK repo for all DCAE Services</description>
diff --git a/rest-services/cbs-client/pom.xml b/rest-services/cbs-client/pom.xml
index 02bfb75e..071763c5 100644
--- a/rest-services/cbs-client/pom.xml
+++ b/rest-services/cbs-client/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-rest-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
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 f1e49bb7..00dbf8a0 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
@@ -3,6 +3,7 @@
* DCAEGEN2-SERVICES-SDK
* ================================================================================
* Copyright (C) 2019-2021 Nokia. All rights reserved.
+ * Copyright (C) 2021 Wipro Limited.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -67,7 +68,8 @@ public class CbsClientFactory {
private static Mono<CbsClient> createCbsClientMono(RxHttpClient httpClient,
CbsClientConfiguration configuration) {
- CbsClientConfigMap cbsClientConfigMap = new CbsClientConfigMap(configuration.configMapFilePath());
+ CbsClientConfigMap cbsClientConfigMap = new CbsClientConfigMap(configuration.configMapFilePath(),
+ configuration.policySyncFilePath(), configuration.appName());
return cbsClientConfigMap.verifyConfigMapFile() ? Mono.just(cbsClientConfigMap) :
getConfigFromCBS(httpClient, configuration);
}
@@ -76,4 +78,4 @@ public class CbsClientFactory {
return new CbsLookup().lookup(configuration)
.map(addr ->new CbsClientRest(httpClient, configuration.appName(), addr, configuration.protocol()));
}
-} \ 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/CbsClientConfigMap.java b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java
index 42f53616..75577318 100644
--- a/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java
+++ b/rest-services/cbs-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMap.java
@@ -3,6 +3,7 @@
* DCAEGEN2-SERVICES-SDK
* ================================================================================
* Copyright (C) 2021 Nokia. All rights reserved.
+ * Copyright (C) 2021 Wipro Limited.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,11 +18,15 @@
* limitations under the License.
* ============LICENSE_END=========================================================
*/
+
package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
+
+import java.util.LinkedHashMap;
+
import org.jetbrains.annotations.NotNull;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.model.CbsRequest;
@@ -30,23 +35,33 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.yaml.snakeyaml.Yaml;
import reactor.core.publisher.Mono;
-import java.util.LinkedHashMap;
public class CbsClientConfigMap implements CbsClient {
private static final Logger LOGGER = LoggerFactory.getLogger(CbsClientConfigMap.class);
private final String configMapFilePath;
+ private String policySyncFilePath = "";
+ private String appName = "";
+ public CbsClientConfigMap(String configMapFilePath) {
+ this.configMapFilePath = configMapFilePath;
+ }
- public CbsClientConfigMap (String configMapFilePath) {
+ public CbsClientConfigMap(String configMapFilePath, String policySyncFilePath, String appName) {
this.configMapFilePath = configMapFilePath;
+ this.policySyncFilePath = policySyncFilePath;
+ this.appName = appName;
}
@Override
public @NotNull Mono<JsonObject> get(CbsRequest request) {
- return Mono.just(this.loadConfigMapFile())
- .map(CbsClientEnvironmentParsing::processEnvironmentVariables)
- .doOnNext(this::logConfigMapOutput);
+ Mono<JsonObject> configJsonMono =
+ Mono.just(this.loadConfigMapFile()).map(CbsClientEnvironmentParsing::processEnvironmentVariables);
+ if (this.shouldReadPolicySyncFile(request)) {
+
+ return configJsonMono.map(this::loadPolicySyncFile).doOnNext(this::logConfigMapOutput);
+ }
+ return configJsonMono.doOnNext(this::logConfigMapOutput);
}
public boolean verifyConfigMapFile() {
@@ -54,7 +69,7 @@ public class CbsClientConfigMap implements CbsClient {
LOGGER.info("Trying to load configuration from configMap file: {}", configMapFilePath);
this.loadConfigMapFile().isJsonObject();
return true;
- } catch(Exception ex) {
+ } catch (Exception ex) {
this.logConfigMapError(ex);
return false;
}
@@ -69,8 +84,6 @@ public class CbsClientConfigMap implements CbsClient {
return new Yaml().load(new FileReader(configMapFilePath).getContent());
}
-
-
private void logConfigMapOutput(JsonObject jsonObject) {
LOGGER.info("Got successful output from ConfigMap file");
LOGGER.debug("ConfigMap output: {}", jsonObject);
@@ -79,4 +92,44 @@ public class CbsClientConfigMap implements CbsClient {
private void logConfigMapError(Exception ex) {
LOGGER.error("Error loading configuration from configMap file: {}", ex.getMessage());
}
-} \ No newline at end of file
+
+ private boolean shouldReadPolicySyncFile(CbsRequest request) {
+ try {
+ return request.requestPath()
+ .getForService(appName)
+ .contains("service_component_all");
+ } catch (Exception ex) {
+ LOGGER.error("Error finding requestPath", ex.getMessage());
+ return false;
+ }
+ }
+
+ private JsonObject loadPolicySyncFile(JsonObject configJsonObject) {
+
+ try {
+
+ if (new FileReader(policySyncFilePath).doesFileExists()) {
+ LOGGER.info("PolicySync file is present");
+ Gson gson = new GsonBuilder().create();
+ JsonObject policyJsonObject = gson.fromJson(this.loadJsonStringPolicySyncFile(), JsonObject.class);
+ policyJsonObject.add("config", configJsonObject);
+ return policyJsonObject;
+ }
+ LOGGER.info("PolicySync file does not exist");
+ JsonObject policyJsonObject = new JsonObject();
+ policyJsonObject.add("config", configJsonObject);
+ return policyJsonObject;
+
+ } catch (Exception ex) {
+ LOGGER.error("PolicySync file does not contain a valid json");
+ JsonObject policyJsonObject = new JsonObject();
+ policyJsonObject.add("config", configJsonObject);
+ return policyJsonObject;
+ }
+
+ }
+
+ private String loadJsonStringPolicySyncFile() {
+ return new FileReader(policySyncFilePath).getContent();
+ }
+}
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 0a3b9657..41848855 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
@@ -3,6 +3,7 @@
* DCAEGEN2-SERVICES-SDK
* =========================================================
* Copyright (C) 2019-2021 Nokia. All rights reserved.
+ * Copyright (C) 2021 Wipro Limited.
* =========================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -130,6 +131,10 @@ public interface CbsClientConfiguration {
default String configMapFilePath() {
return "/app-config/application_config.yaml";
}
+ @Value.Default
+ default String policySyncFilePath() {
+ return "/etc/policies/policies.json";
+ }
/**
* Creates CbsClientConfiguration from system environment variables.
diff --git a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMapTest.java b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMapTest.java
index a9d8407b..aa5655fc 100644
--- a/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMapTest.java
+++ b/rest-services/cbs-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/cbs/client/impl/CbsClientConfigMapTest.java
@@ -3,6 +3,7 @@
* DCAEGEN2-SERVICES-SDK
* =========================================================
* Copyright (C) 2021 Nokia. All rights reserved.
+ * Copyright (C) 2021 Wipro Limited.
* =========================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,25 +18,31 @@
* limitations under the License.
* ============LICENSE_END=====================================
*/
+
package org.onap.dcaegen2.services.sdk.rest.services.cbs.client.impl;
+import static org.assertj.core.api.Assertions.assertThat;
+
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject;
import com.google.gson.stream.JsonReader;
+
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+
import org.junit.Rule;
import org.junit.contrib.java.lang.system.EnvironmentVariables;
import org.junit.jupiter.api.Test;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsClient;
import org.onap.dcaegen2.services.sdk.rest.services.cbs.client.api.CbsRequests;
import org.onap.dcaegen2.services.sdk.rest.services.model.logging.RequestDiagnosticContext;
-import java.io.FileNotFoundException;
-import java.io.FileReader;
-import static org.assertj.core.api.Assertions.assertThat;
public class CbsClientConfigMapTest {
private static final String SAMPLE_EXPECTED_CONFIG = "src/test/resources/sample_expected_service_config.json";
+ private static final String SAMPLE_EXPECTED_POLICY_CONFIG = "src/test/resources/sample_expected_policy_config.json";
+ private static final String SAMPLE_EXPECTED_ALL_CONFIG = "src/test/resources/sample_expected_all_config.json";
@Rule
public final EnvironmentVariables envs = new EnvironmentVariables();
@@ -45,7 +52,9 @@ public class CbsClientConfigMapTest {
envs.set("AAF_USER", "admin");
envs.set("AAF_PASSWORD", "admin_secret");
String configMapFilePath = "src/test/resources/application_config.yaml";
- final CbsClient cut = new CbsClientConfigMap(configMapFilePath);
+ String policySyncFilePath = "src/test/resources/policies.json";
+ String requestPath = "/service_component/app-name";
+ final CbsClient cut = new CbsClientConfigMap(configMapFilePath, policySyncFilePath, requestPath);
RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
@@ -57,8 +66,49 @@ public class CbsClientConfigMapTest {
assertThat(result).isEqualTo(convertToJson(new JsonReader(new FileReader(SAMPLE_EXPECTED_CONFIG))));
}
+ @Test
+ void shouldFetchUsingConfigMapFileAndPolicySyncFile() throws FileNotFoundException {
+ // given
+ envs.set("AAF_USER", "admin");
+ envs.set("AAF_PASSWORD", "admin_secret");
+ String configMapFilePath = "src/test/resources/application_config.yaml";
+ String policySyncFilePath = "src/test/resources/policies.json";
+ String requestPath = "/service_component_all/app-name";
+ final CbsClient cut = new CbsClientConfigMap(configMapFilePath, policySyncFilePath, requestPath);
+
+ RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
+
+ // when
+ final JsonObject result = cut.get(CbsRequests.getConfiguration(diagnosticContext)).block();
+
+ // then
+ assertThat(result).isNotNull();
+ assertThat(result).isEqualTo(convertToJson(new JsonReader(new FileReader(SAMPLE_EXPECTED_POLICY_CONFIG))));
+ }
+
+ @Test
+ void shouldFetchUsingConfigMapFileWhenPolicySyncFileAbsent() throws FileNotFoundException {
+ // given
+ envs.set("AAF_USER", "admin");
+ envs.set("AAF_PASSWORD", "admin_secret");
+ String configMapFilePath = "src/test/resources/application_config.yaml";
+ String policySyncFilePath = "";
+ String requestPath = "/service_component_all/app-name";
+ final CbsClient cut = new CbsClientConfigMap(configMapFilePath, policySyncFilePath, requestPath);
+
+ RequestDiagnosticContext diagnosticContext = RequestDiagnosticContext.create();
+
+ // when
+ final JsonObject result = cut.get(CbsRequests.getConfiguration(diagnosticContext)).block();
+
+ // then
+ assertThat(result).isNotNull();
+ assertThat(result).isEqualTo(convertToJson(new JsonReader(new FileReader(SAMPLE_EXPECTED_ALL_CONFIG))));
+ }
+
private JsonObject convertToJson(JsonReader jsonReader) {
Gson gson = new GsonBuilder().create();
return gson.fromJson(jsonReader, JsonObject.class);
}
}
+
diff --git a/rest-services/cbs-client/src/test/resources/policies.json b/rest-services/cbs-client/src/test/resources/policies.json
new file mode 100644
index 00000000..657cdbe9
--- /dev/null
+++ b/rest-services/cbs-client/src/test/resources/policies.json
@@ -0,0 +1,58 @@
+{
+ "policies":{
+ "items":[
+ {
+ "type":"onap.policies.monitoring.tcagen2",
+ "type_version":"1.0.0",
+ "name":"onap.vfirewall.tca",
+ "version":"1.0.0",
+ "metadata":{
+ "policy-id":"onap.vfirewall.tca",
+ "policy-version":"1.0.0"
+ },
+ "policyName":"onap.vfirewall.tca.1-0-0.xml",
+ "policyVersion":"1.0.0",
+ "config":{
+ "tca.policy":{
+ "domain":"measurementsForVfScaling",
+ "metricsPerEventName":[
+ {
+ "eventName":"vFirewallBroadcastPackets",
+ "controlLoopSchemaType":"VM",
+ "policyScope":"DCAE",
+ "policyName":"DCAE.Config_tca-hi-lo",
+ "policyVersion":"v0.0.1",
+ "thresholds":[
+ {
+ "closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
+ "version":"1.0.2",
+ "fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+ "thresholdValue":300,
+ "direction":"LESS_OR_EQUAL",
+ "severity":"MAJOR",
+ "closedLoopEventStatus":"ONSET"
+ },
+ {
+ "closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
+ "version":"1.0.2",
+ "fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+ "thresholdValue":700,
+ "direction":"GREATER_OR_EQUAL",
+ "severity":"CRITICAL",
+ "closedLoopEventStatus":"ONSET"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ ]
+ },
+ "event":{
+ "action":"gathered",
+ "timestamp":"2021-04-19T23:37:19.709Z",
+ "update_id":"379fb01a-cfe2-4c06-8f6b-d51f3c8504af",
+ "policies_count":1
+ }
+}
diff --git a/rest-services/cbs-client/src/test/resources/sample_expected_all_config.json b/rest-services/cbs-client/src/test/resources/sample_expected_all_config.json
new file mode 100644
index 00000000..641c4817
--- /dev/null
+++ b/rest-services/cbs-client/src/test/resources/sample_expected_all_config.json
@@ -0,0 +1,54 @@
+{
+ "config": {
+ "keystore.path": "/var/run/security/keystore.p12",
+ "streams_publishes": {
+ "perf3gpp": {
+ "testArray": [
+ {
+ "testPrimitiveArray": ["admin", "admin_secret", {"nestedArray": ["admin"]}],
+ "testPrimitive": "admin",
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ }
+ }
+ ],
+ "type": "kafka",
+ "kafka_info": {
+ "bootstrap_servers": "dmaap-mr-kafka:6060",
+ "topic_name": "HVVES_PERF3GPP"
+ }
+ },
+ "pnf_ready": {
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://message-router:3904/events/VES_PNF_READY"
+ }
+ },
+ "call_trace": {
+ "aaf_credentials": {
+ "username": "admin",
+ "password": "admin_secret"
+ },
+ "type": "kafka",
+ "kafka_info": {
+ "bootstrap_servers": "dmaap-mr-kafka:6060",
+ "topic_name": "HVVES_TRACE"
+ }
+ }
+ },
+ "streams_subscribes": {
+ "measurements": {
+ "type": "message_router",
+ "dmaap_info": {
+ "topic_url": "http://message-router:3904/events/VES_MEASUREMENT"
+ }
+ }
+ }
+ }
+}
+
diff --git a/rest-services/cbs-client/src/test/resources/sample_expected_policy_config.json b/rest-services/cbs-client/src/test/resources/sample_expected_policy_config.json
new file mode 100644
index 00000000..aeb3ca32
--- /dev/null
+++ b/rest-services/cbs-client/src/test/resources/sample_expected_policy_config.json
@@ -0,0 +1,117 @@
+{
+ "policies":{
+ "items":[
+ {
+ "type":"onap.policies.monitoring.tcagen2",
+ "type_version":"1.0.0",
+ "name":"onap.vfirewall.tca",
+ "version":"1.0.0",
+ "metadata":{
+ "policy-id":"onap.vfirewall.tca",
+ "policy-version":"1.0.0"
+ },
+ "policyName":"onap.vfirewall.tca.1-0-0.xml",
+ "policyVersion":"1.0.0",
+ "config":{
+ "tca.policy":{
+ "domain":"measurementsForVfScaling",
+ "metricsPerEventName":[
+ {
+ "eventName":"vFirewallBroadcastPackets",
+ "controlLoopSchemaType":"VM",
+ "policyScope":"DCAE",
+ "policyName":"DCAE.Config_tca-hi-lo",
+ "policyVersion":"v0.0.1",
+ "thresholds":[
+ {
+ "closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
+ "version":"1.0.2",
+ "fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+ "thresholdValue":300,
+ "direction":"LESS_OR_EQUAL",
+ "severity":"MAJOR",
+ "closedLoopEventStatus":"ONSET"
+ },
+ {
+ "closedLoopControlName":"ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
+ "version":"1.0.2",
+ "fieldPath":"$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta",
+ "thresholdValue":700,
+ "direction":"GREATER_OR_EQUAL",
+ "severity":"CRITICAL",
+ "closedLoopEventStatus":"ONSET"
+ }
+ ]
+ }
+ ]
+ }
+ }
+ }
+ ]
+ },
+ "event":{
+ "action":"gathered",
+ "timestamp":"2021-04-19T23:37:19.709Z",
+ "update_id":"379fb01a-cfe2-4c06-8f6b-d51f3c8504af",
+ "policies_count":1
+ },
+ "config":{
+ "keystore.path":"/var/run/security/keystore.p12",
+ "streams_publishes":{
+ "perf3gpp":{
+ "testArray":[
+ {
+ "testPrimitiveArray":[
+ "admin",
+ "admin_secret",
+ {
+ "nestedArray":[
+ "admin"
+ ]
+ }
+ ],
+ "testPrimitive":"admin",
+ "aaf_credentials":{
+ "username":"admin",
+ "password":"admin_secret"
+ }
+ }
+ ],
+ "type":"kafka",
+ "kafka_info":{
+ "bootstrap_servers":"dmaap-mr-kafka:6060",
+ "topic_name":"HVVES_PERF3GPP"
+ }
+ },
+ "pnf_ready":{
+ "aaf_credentials":{
+ "username":"admin",
+ "password":"admin_secret"
+ },
+ "type":"message_router",
+ "dmaap_info":{
+ "topic_url":"http://message-router:3904/events/VES_PNF_READY"
+ }
+ },
+ "call_trace":{
+ "aaf_credentials":{
+ "username":"admin",
+ "password":"admin_secret"
+ },
+ "type":"kafka",
+ "kafka_info":{
+ "bootstrap_servers":"dmaap-mr-kafka:6060",
+ "topic_name":"HVVES_TRACE"
+ }
+ }
+ },
+ "streams_subscribes":{
+ "measurements":{
+ "type":"message_router",
+ "dmaap_info":{
+ "topic_url":"http://message-router:3904/events/VES_MEASUREMENT"
+ }
+ }
+ }
+ }
+}
diff --git a/rest-services/dmaap-client/pom.xml b/rest-services/dmaap-client/pom.xml
index cb1d811f..f3a612a6 100644
--- a/rest-services/dmaap-client/pom.xml
+++ b/rest-services/dmaap-client/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-rest-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/http-client/pom.xml b/rest-services/http-client/pom.xml
index ffb93b3c..3669aabe 100644
--- a/rest-services/http-client/pom.xml
+++ b/rest-services/http-client/pom.xml
@@ -28,7 +28,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-rest-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/model/pom.xml b/rest-services/model/pom.xml
index 0c009030..ea018c1f 100644
--- a/rest-services/model/pom.xml
+++ b/rest-services/model/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-rest-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk.rest.services</groupId>
diff --git a/rest-services/pom.xml b/rest-services/pom.xml
index ddc6c25e..e4190868 100644
--- a/rest-services/pom.xml
+++ b/rest-services/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>sdk</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
diff --git a/security/crypt-password/pom.xml b/security/crypt-password/pom.xml
index d5fbb3b1..e72800b9 100644
--- a/security/crypt-password/pom.xml
+++ b/security/crypt-password/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk.security</groupId>
<artifactId>dcaegen2-services-sdk-security</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/security/pom.xml b/security/pom.xml
index f2c92c1c..a5405179 100644
--- a/security/pom.xml
+++ b/security/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>sdk</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk.security</groupId>
diff --git a/security/ssl/pom.xml b/security/ssl/pom.xml
index ff6f61b1..17c294fd 100644
--- a/security/ssl/pom.xml
+++ b/security/ssl/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk.security</groupId>
<artifactId>dcaegen2-services-sdk-security</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>ssl</artifactId>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index 10b0358c..c16a234c 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>dcaegen2-services-sdk-services-common</artifactId>
diff --git a/services/external-schema-manager/pom.xml b/services/external-schema-manager/pom.xml
index 5cec95d7..33dd7c0b 100644
--- a/services/external-schema-manager/pom.xml
+++ b/services/external-schema-manager/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>dcaegen2-services-sdk-services-external-schema-manager</artifactId>
diff --git a/services/hv-ves-client/pom.xml b/services/hv-ves-client/pom.xml
index a7dbae89..4394d9e4 100644
--- a/services/hv-ves-client/pom.xml
+++ b/services/hv-ves-client/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-services</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId>
diff --git a/services/hv-ves-client/producer/api/pom.xml b/services/hv-ves-client/producer/api/pom.xml
index 1d49ff8b..734a33ce 100644
--- a/services/hv-ves-client/producer/api/pom.xml
+++ b/services/hv-ves-client/producer/api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>hvvesclient-producer</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>hvvesclient-producer-api</artifactId>
diff --git a/services/hv-ves-client/producer/ct/pom.xml b/services/hv-ves-client/producer/ct/pom.xml
index cccd3c35..488aec75 100644
--- a/services/hv-ves-client/producer/ct/pom.xml
+++ b/services/hv-ves-client/producer/ct/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>hvvesclient-producer</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>hvvesclient-producer-ct</artifactId>
diff --git a/services/hv-ves-client/producer/impl/pom.xml b/services/hv-ves-client/producer/impl/pom.xml
index daa8fa18..d9c18851 100644
--- a/services/hv-ves-client/producer/impl/pom.xml
+++ b/services/hv-ves-client/producer/impl/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>hvvesclient-producer</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>hvvesclient-producer-impl</artifactId>
diff --git a/services/hv-ves-client/producer/pom.xml b/services/hv-ves-client/producer/pom.xml
index f82f5491..1beed9d3 100644
--- a/services/hv-ves-client/producer/pom.xml
+++ b/services/hv-ves-client/producer/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<artifactId>hvvesclient-producer</artifactId>
diff --git a/services/hv-ves-client/protobuf/pom.xml b/services/hv-ves-client/protobuf/pom.xml
index 6cffdba9..60267315 100644
--- a/services/hv-ves-client/protobuf/pom.xml
+++ b/services/hv-ves-client/protobuf/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>dcaegen2-services-sdk-services-hvvesclient</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>High Volume VES Collector Client :: Protobuf</name>
diff --git a/services/pom.xml b/services/pom.xml
index 43376c95..6c2ed3f3 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -26,7 +26,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>sdk</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
diff --git a/standardization/api-custom-header/pom.xml b/standardization/api-custom-header/pom.xml
index 733796fa..d4834b01 100644
--- a/standardization/api-custom-header/pom.xml
+++ b/standardization/api-custom-header/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
<artifactId>dcaegen2-services-sdk-standardization</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/standardization/moher-api/healthstate/pom.xml b/standardization/moher-api/healthstate/pom.xml
index e0707749..c257e3d6 100644
--- a/standardization/moher-api/healthstate/pom.xml
+++ b/standardization/moher-api/healthstate/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>dcaegen2-sdk-moher-api</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>Monitoring and Healthcheck :: Health state</name>
diff --git a/standardization/moher-api/metrics/pom.xml b/standardization/moher-api/metrics/pom.xml
index 90ca0ace..1e337e04 100644
--- a/standardization/moher-api/metrics/pom.xml
+++ b/standardization/moher-api/metrics/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>dcaegen2-sdk-moher-api</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>Monitoring and Healthcheck :: Metrics</name>
diff --git a/standardization/moher-api/pom.xml b/standardization/moher-api/pom.xml
index 93728f5d..fbece46d 100644
--- a/standardization/moher-api/pom.xml
+++ b/standardization/moher-api/pom.xml
@@ -26,7 +26,7 @@
<parent>
<artifactId>dcaegen2-services-sdk-standardization</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>Monitoring and Healthcheck</name>
diff --git a/standardization/moher-api/server-adapters/pom.xml b/standardization/moher-api/server-adapters/pom.xml
index 23f7fe50..7be8167a 100644
--- a/standardization/moher-api/server-adapters/pom.xml
+++ b/standardization/moher-api/server-adapters/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>dcaegen2-sdk-moher-api</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>Monitoring and Healthcheck :: Server Adapters</name>
diff --git a/standardization/moher-api/server-adapters/reactor-netty/pom.xml b/standardization/moher-api/server-adapters/reactor-netty/pom.xml
index 65b92fdb..2b31827c 100644
--- a/standardization/moher-api/server-adapters/reactor-netty/pom.xml
+++ b/standardization/moher-api/server-adapters/reactor-netty/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>dcaegen2-sdk-moher-server-adapters</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>Monitoring and Healthcheck :: Server Adapters :: Reactor Netty</name>
diff --git a/standardization/moher-api/server-adapters/spring-webflux/pom.xml b/standardization/moher-api/server-adapters/spring-webflux/pom.xml
index 05bc402d..e72a2a6c 100644
--- a/standardization/moher-api/server-adapters/spring-webflux/pom.xml
+++ b/standardization/moher-api/server-adapters/spring-webflux/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>dcaegen2-sdk-moher-server-adapters</artifactId>
<groupId>org.onap.dcaegen2.services.sdk</groupId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
</parent>
<name>Monitoring and Healthcheck :: Server Adapters :: Spring Webflux</name>
diff --git a/standardization/pom.xml b/standardization/pom.xml
index de0f2b7e..19dd0a15 100644
--- a/standardization/pom.xml
+++ b/standardization/pom.xml
@@ -8,7 +8,7 @@
<parent>
<groupId>org.onap.dcaegen2.services</groupId>
<artifactId>sdk</artifactId>
- <version>1.8.4-SNAPSHOT</version>
+ <version>1.8.5-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
diff --git a/version.properties b/version.properties
index 7014c959..c5caaca6 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=1
minor=8
-patch=4
+patch=5
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT