X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRicSynchronizationTask.java;h=6ae55c46a771ff162f603800e65b2ff733edb53a;hb=refs%2Fchanges%2F95%2F4495%2F1;hp=42d9ab6ee96279e796dc7918e4bd2d77b4bf8b0a;hpb=a088a2bab47b729e91bf2155bfa4e979d023ce27;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java index 42d9ab6e..6ae55c46 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RicSynchronizationTask.java @@ -134,7 +134,7 @@ public class RicSynchronizationTask { private void notifyAllServices(String body) { for (Service service : services.getAll()) { String url = service.getCallbackUrl(); - if (service.getCallbackUrl().length() > 0) { + if (url.length() > 0) { createNotificationClient(url) // .put("", body) // .subscribe( // @@ -160,7 +160,7 @@ public class RicSynchronizationTask { } AsyncRestClient createNotificationClient(final String url) { - return new AsyncRestClient(url); + return new AsyncRestClient(url, this.a1ClientFactory.getAppConfig().getWebClientConfig()); } private Flux synchronizePolicyTypes(Ric ric, A1Client a1Client) { @@ -198,8 +198,16 @@ public class RicSynchronizationTask { .flatMapMany(notUsed -> Flux.just(policy)); } + private boolean checkTransient(Policy policy) { + if (policy.isTransient()) { + this.policies.remove(policy); + } + return policy.isTransient(); + } + private Flux recreateAllPoliciesInRic(Ric ric, A1Client a1Client) { return Flux.fromIterable(policies.getForRic(ric.name())) // + .filter(policy -> !checkTransient(policy)) // .flatMap(policy -> putPolicy(policy, ric, a1Client), CONCURRENCY_RIC); }