From 602a0243651bd2140828d274f14ea73df60be342 Mon Sep 17 00:00:00 2001 From: Maciej Malewski Date: Mon, 21 Jun 2021 09:31:58 +0200 Subject: Remove tag latest from docker image, adapt VES to the new location of file ves-dmaap-config.json Issue-ID: DCAEGEN2-1483 Signed-off-by: Maciej Malewski Change-Id: Ib6b428c974ecec17ebc0722f3e236ee2b05c5be6 --- README.md | 9 +++++++++ etc/collector.properties | 2 +- pom.xml | 1 - src/main/java/org/onap/dcae/ApplicationSettings.java | 2 +- src/test/java/org/onap/dcae/ApplicationSettingsTest.java | 6 +++--- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index a1733a23..0a2d68d9 100644 --- a/README.md +++ b/README.md @@ -154,6 +154,15 @@ To fetch configuration from Consul, VES collector uses CBS client from DCAE SDK. Sample configuration of VESCollector K-V store can be found under /dpo/data-formats/ConsulConfig.json +### How to send event locally + +1. In /etc/hosts add: 127.0.0.1 onap-dmaap +2. Go into: ./src/test/resources/dmaap-msg-router +3. Run: docker-compose -f message-router-compose.yml up -d +4. Run ves application +5. Now you can send events to ves +6. Check topics on message-router: curl http://127.0.0.1:3904/topics + ### Testing diff --git a/etc/collector.properties b/etc/collector.properties index 75ebf764..e810761a 100755 --- a/etc/collector.properties +++ b/etc/collector.properties @@ -63,7 +63,7 @@ event.externalSchema.stndDefinedDataPath=$.event.stndDefinedFields.data ## List all streamid per domain to be supported. The streamid should match to channel name on dmaapfile collector.dmaap.streamid=fault=ves-fault|syslog=ves-syslog|heartbeat=ves-heartbeat|measurementsForVfScaling=ves-measurement|mobileFlow=ves-mobileflow|other=ves-other|stateChange=ves-statechange|thresholdCrossingAlert=ves-thresholdCrossingAlert|voiceQuality=ves-voicequality|sipSignaling=ves-sipsignaling|notification=ves-notification|pnfRegistration=ves-pnfRegistration|3GPP-FaultSupervision=ves-3gpp-fault-supervision|3GPP-Heartbeat=ves-3gpp-heartbeat|3GPP-Provisioning=ves-3gpp-provisioning|3GPP-PerformanceAssurance=ves-3gpp-performance-assurance -collector.dmaapfile=./dpo/data-formats/ves-dmaap-config.json +collector.dmaapfile=./etc/ves-dmaap-config.json ## Path to the file containing description of api versions collector.description.api.version.location=etc/api_version_description.json diff --git a/pom.xml b/pom.xml index 665c5b3d..dae4fbd6 100644 --- a/pom.xml +++ b/pom.xml @@ -179,7 +179,6 @@ ${project.version}-${maven.build.timestamp}Z ${project.version} - latest openjdk:11-jre-slim vescollector diff --git a/src/main/java/org/onap/dcae/ApplicationSettings.java b/src/main/java/org/onap/dcae/ApplicationSettings.java index 7b8c3ff6..0acbbe26 100644 --- a/src/main/java/org/onap/dcae/ApplicationSettings.java +++ b/src/main/java/org/onap/dcae/ApplicationSettings.java @@ -161,7 +161,7 @@ public class ApplicationSettings { } public String dMaaPConfigurationFileLocation() { - return prependWithUserDirOnRelative(properties.getString("collector.dmaapfile", "dpo/data-formats/ves-dmaap-config.json")); + return prependWithUserDirOnRelative(properties.getString("collector.dmaapfile", "etc/ves-dmaap-config.json")); } public String certSubjectMatcher(){ diff --git a/src/test/java/org/onap/dcae/ApplicationSettingsTest.java b/src/test/java/org/onap/dcae/ApplicationSettingsTest.java index 7acfdc27..d5877619 100644 --- a/src/test/java/org/onap/dcae/ApplicationSettingsTest.java +++ b/src/test/java/org/onap/dcae/ApplicationSettingsTest.java @@ -385,11 +385,11 @@ public class ApplicationSettingsTest { public void shouldReturnConfigurationFileLocation() throws IOException { // when String configurationFileLocation = fromTemporaryConfiguration( - "collector.dmaapfile=/somewhere/data-formats/ves-dmaap-config.json") + "collector.dmaapfile=/somewhere/etc/ves-dmaap-config.json") .dMaaPConfigurationFileLocation(); // then - assertEquals(sanitizePath("/somewhere/data-formats/ves-dmaap-config.json"), configurationFileLocation); + assertEquals(sanitizePath("/somewhere/etc/ves-dmaap-config.json"), configurationFileLocation); } @Test @@ -399,7 +399,7 @@ public class ApplicationSettingsTest { .dMaaPConfigurationFileLocation(); // then - assertEquals(sanitizePath("dpo/data-formats/ves-dmaap-config.json"), configurationFileLocation); + assertEquals(sanitizePath("etc/ves-dmaap-config.json"), configurationFileLocation); } @Test -- cgit 1.2.3-korg