aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMaciej Malewski <maciej.malewski@nokia.com>2021-06-21 09:31:58 +0200
committerMaciej Malewski <maciej.malewski@nokia.com>2021-06-21 09:31:58 +0200
commit602a0243651bd2140828d274f14ea73df60be342 (patch)
tree98b8ce0cdf13a7145cb595aec924a3d32c06cbe6 /src
parent430cf11bbcb447316f831e1dd1b8760abeaa9171 (diff)
Remove tag latest from docker image, adapt VES to the new location of file ves-dmaap-config.jsonves_synchronous
Issue-ID: DCAEGEN2-1483 Signed-off-by: Maciej Malewski <maciej.malewski@nokia.com> Change-Id: Ib6b428c974ecec17ebc0722f3e236ee2b05c5be6
Diffstat (limited to 'src')
-rw-r--r--src/main/java/org/onap/dcae/ApplicationSettings.java2
-rw-r--r--src/test/java/org/onap/dcae/ApplicationSettingsTest.java6
2 files changed, 4 insertions, 4 deletions
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