Skip to content

Commit 9b0df5f

Browse files
Heng CuiHeng Cui
authored andcommitted
update application conf file name
1 parent 2d80276 commit 9b0df5f

4 files changed

Lines changed: 6 additions & 6 deletions

File tree

candyfloss/src/main/resources/application.dev.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ kafka {
2121
}
2222
kstream {
2323
input.topic.pattern = "dev\\.device-yang(-[^-]+)?-raw"
24-
input.topic.name = null
24+
input.topic.name = "null"
2525
discard.topic.name = dev.candyfloss-processing-discard # All messages that didn't match any step in the pipeline
2626
dlq.topic.name = dev.candyfloss-processing--dlq # Messages that encountered a Java exception during the processing
2727
normalization.statestore.cutoff.time.ms = 1800000 # 30 minutes

candyfloss/src/main/resources/application.itm.dev.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ kstream {
3131
state.store.long.counter.wrap.limit = 10000000
3232
state.store.long.counter.time.ms = 300000 # allow max 5 min for counter wrap around otherwise it's a reset
3333
state.store.delete.scan.frequency.days = 7 # how often to trigger scanning for old unused counters and delete them
34-
pre.transform = pre-transform.ietf.dev.json
34+
pre.transform = pre-transform.itm.dev.json
3535
pipeline = {
3636
# todo: customize ietf-telemetry-message pipeline here
3737
fano-interfaces {

candyfloss/src/main/resources/pre-transform.ietf.dev.json renamed to candyfloss/src/main/resources/pre-transform.itm.dev.json

File renamed without changes.

candyfloss/src/test/java/com/swisscom/daisy/cosmos/candyfloss/DeploymentTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ protected void test(String applicationConfigFileName, String env, String name, P
2525
protected static Stream<Arguments> providerForAllYangModels()
2626
throws IOException, URISyntaxException {
2727
var outLegacy = providerForYangModels("legacy");
28-
var outIetf = providerForYangModels("ietf");
28+
var outItm = providerForYangModels("itm");
2929

30-
return Stream.concat(outLegacy, outIetf);
30+
return Stream.concat(outLegacy, outItm);
3131
}
3232

3333
/*** Discover YANG model test cases and provide them as arguments to the parametrized test */
@@ -38,7 +38,7 @@ protected static Stream<Arguments> providerForYangModels(String profile)
3838
// Create a map from the discovered folders in the `test/resources/deployment` folder
3939
// The key is the sub-folder name and the value is a full path to the sub folder
4040
String deploymentFolder =
41-
profile.equals("ietf") ? "deployment-ietf-telemetry-message" : "deployment";
41+
profile.equals("itm") ? "deployment-ietf-telemetry-message" : "deployment";
4242
var yangModels =
4343
Files.list(Path.of(Objects.requireNonNull(loader.getResource(deploymentFolder)).toURI()))
4444
.filter(Files::isDirectory)
@@ -57,7 +57,7 @@ protected static Stream<Arguments> providerForYangModels(String profile)
5757
var testFixtures = Files.list(path).filter(Files::isDirectory).toList();
5858
for (var testPath : testFixtures) {
5959
for (var env : List.of("dev", "test", "prod")) {
60-
String fileNamePrefix = profile.equals("ietf") ? "application.ietf." : "application.";
60+
String fileNamePrefix = profile.equals("itm") ? "application.itm." : "application.";
6161

6262
String applicationConfig = fileNamePrefix + env + ".conf";
6363
if (loader.getResource(applicationConfig) != null)

0 commit comments

Comments
 (0)