X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRefreshConfigTaskTest.java;h=1c4b21d192f0e28da7d96f508b00560a52be7f9e;hb=254eab2d525ad00ac092d6859d21cbab8e42746a;hp=f81962dbcc0523f235e55631f0c80e346af0b9e8;hpb=ae4206bbd7437adda91fc429efef03a13da2b702;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RefreshConfigTaskTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RefreshConfigTaskTest.java index f81962db..1c4b21d1 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RefreshConfigTaskTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RefreshConfigTaskTest.java @@ -50,6 +50,7 @@ import java.nio.charset.StandardCharsets; import java.time.Duration; import java.util.Arrays; import java.util.Collections; +import java.util.HashMap; import java.util.Properties; import java.util.Vector; @@ -65,6 +66,8 @@ import org.oransc.policyagent.clients.A1ClientFactory; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ApplicationConfig.RicConfigUpdate.Type; import org.oransc.policyagent.configuration.ApplicationConfigParser; +import org.oransc.policyagent.configuration.ApplicationConfigParser.ConfigParserResult; +import org.oransc.policyagent.configuration.ImmutableConfigParserResult; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; import org.oransc.policyagent.repository.ImmutablePolicy; @@ -100,6 +103,7 @@ public class RefreshConfigTaskTest { .name(RIC_1_NAME) // .baseUrl("http://localhost:8080/") // .managedElementIds(new Vector(Arrays.asList("kista_1", "kista_2"))) // + .controllerName("") // .build(); private static EnvProperties properties() { @@ -246,7 +250,7 @@ public class RefreshConfigTaskTest { RicConfig removedRicConfig = getRicConfig("removed"); Ric removedRic = new Ric(removedRicConfig); rics.put(removedRic); - appConfig.setConfiguration(Arrays.asList(changedRicConfig, removedRicConfig), null, null); + appConfig.setConfiguration(configParserResult(changedRicConfig, removedRicConfig)); Policy policy = getPolicy(removedRic); policies.put(policy); @@ -289,6 +293,7 @@ public class RefreshConfigTaskTest { .name(name) // .baseUrl("url") // .managedElementIds(Collections.emptyList()) // + .controllerName("controllerName") // .build(); return ricConfig; } @@ -309,9 +314,19 @@ public class RefreshConfigTaskTest { return policy; } + ConfigParserResult configParserResult(RicConfig... rics) { + return ImmutableConfigParserResult.builder() // + .ricConfigs(Arrays.asList(rics)) // + .dmaapConsumerConfig(new Properties()) // + .dmaapPublisherConfig(new Properties()) // + .controllerConfigs(new HashMap<>()) // + .build(); + } + private void modifyTheRicConfiguration(JsonObject configAsJson, String newBaseUrl) { - ((JsonObject) configAsJson.getAsJsonObject("config").getAsJsonArray("ric").get(0)).addProperty("baseUrl", - newBaseUrl); + ((JsonObject) configAsJson.getAsJsonObject("config") // + .getAsJsonArray("ric").get(0)) // + .addProperty("baseUrl", newBaseUrl); } private JsonObject getJsonRootObject() throws JsonIOException, JsonSyntaxException, IOException {