* ========================LICENSE_START=================================
* O-RAN-SC
* %%
- * Copyright (C) 2019 Nordix Foundation
+ * Copyright (C) 2020 Nordix Foundation
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
import java.util.Collection;
import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1ClientFactory;
import org.oransc.policyagent.repository.Policies;
import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Ric;
import reactor.core.publisher.Mono;
/**
- * Regularly checks the exisiting rics towards the local repository to keep it consistent.
+ * Regularly checks the existing rics towards the local repository to keep it consistent.
*/
@Component
@EnableScheduling
private final Rics rics;
private final Policies policies;
private final PolicyTypes policyTypes;
- private final A1Client a1Client;
+ private final A1ClientFactory a1ClientFactory;
private final Services services;
@Autowired
- public RepositorySupervision(Rics rics, Policies policies, A1Client a1Client, PolicyTypes policyTypes,
+ public RepositorySupervision(Rics rics, Policies policies, A1ClientFactory a1ClientFactory, PolicyTypes policyTypes,
Services services) {
this.rics = rics;
this.policies = policies;
- this.a1Client = a1Client;
+ this.a1ClientFactory = a1ClientFactory;
this.policyTypes = policyTypes;
this.services = services;
}
/**
- * Regularly contacts all Rics to check if they are alive.
+ * Regularly contacts all Rics to check if they are alive and synchronized.
*/
@Scheduled(fixedRate = 1000 * 60)
public void checkAllRics() {
logger.debug("Checking Rics starting");
- createTask().subscribe(this::onRicChecked, this::onError, this::onComplete);
+ createTask().subscribe(this::onRicChecked, null, this::onComplete);
}
- private Flux<Ric> createTask() {
+ private Flux<RicData> createTask() {
synchronized (this.rics) {
return Flux.fromIterable(rics.getRics()) //
- .flatMap(ric -> checkRicState(ric)) //
- .flatMap(ric -> checkRicPolicies(ric)) //
- .flatMap(ric -> checkRicPolicyTypes(ric));
+ .flatMap(this::createRicData) //
+ .flatMap(this::checkRicState) //
+ .flatMap(this::checkRicPolicies) //
+ .flatMap(this::checkRicPolicyTypes);
}
}
- private Mono<Ric> checkRicState(Ric ric) {
- if (ric.state() == RicState.UNDEFINED) {
- return startRecovery(ric);
- } else if (ric.state() == RicState.RECOVERING) {
+ private static class RicData {
+ RicData(Ric ric, A1Client a1Client) {
+ this.ric = ric;
+ this.a1Client = a1Client;
+ }
+
+ final Ric ric;
+ final A1Client a1Client;
+ }
+
+ private Mono<RicData> createRicData(Ric ric) {
+ return Mono.just(ric) //
+ .flatMap(aRic -> this.a1ClientFactory.createA1Client(ric)) //
+ .flatMap(a1Client -> Mono.just(new RicData(ric, a1Client)));
+ }
+
+ private Mono<RicData> checkRicState(RicData ric) {
+ if (ric.ric.getState() == RicState.UNDEFINED) {
+ return startSynchronization(ric);
+ } else if (ric.ric.getState() == RicState.SYNCHRONIZING) {
return Mono.empty();
} else {
return Mono.just(ric);
}
}
- private Mono<Ric> checkRicPolicies(Ric ric) {
- return a1Client.getPolicyIdentities(ric.getConfig().baseUrl()) //
+ private Mono<RicData> checkRicPolicies(RicData ric) {
+ return ric.a1Client.getPolicyIdentities() //
.onErrorResume(t -> Mono.empty()) //
.flatMap(ricP -> validateInstances(ricP, ric));
}
- private Mono<Ric> validateInstances(Collection<String> ricPolicies, Ric ric) {
+ private Mono<RicData> validateInstances(Collection<String> ricPolicies, RicData ric) {
synchronized (this.policies) {
- if (ricPolicies.size() != policies.getForRic(ric.name()).size()) {
- return startRecovery(ric);
+ if (ricPolicies.size() != policies.getForRic(ric.ric.name()).size()) {
+ return startSynchronization(ric);
}
}
for (String policyId : ricPolicies) {
if (!policies.containsPolicy(policyId)) {
- return startRecovery(ric);
+ return startSynchronization(ric);
}
}
return Mono.just(ric);
}
- private Mono<Ric> checkRicPolicyTypes(Ric ric) {
- return a1Client.getPolicyTypeIdentities(ric.getConfig().baseUrl()) //
- .onErrorResume(t -> {
- return Mono.empty();
- }) //
+ private Mono<RicData> checkRicPolicyTypes(RicData ric) {
+ return ric.a1Client.getPolicyTypeIdentities() //
+ .onErrorResume(notUsed -> Mono.empty()) //
.flatMap(ricTypes -> validateTypes(ricTypes, ric));
}
- private Mono<Ric> validateTypes(Collection<String> ricTypes, Ric ric) {
- if (ricTypes.size() != ric.getSupportedPolicyTypes().size()) {
- return startRecovery(ric);
+ private Mono<RicData> validateTypes(Collection<String> ricTypes, RicData ric) {
+ if (ricTypes.size() != ric.ric.getSupportedPolicyTypes().size()) {
+ return startSynchronization(ric);
}
for (String typeName : ricTypes) {
- if (!ric.isSupportingType(typeName)) {
- return startRecovery(ric);
+ if (!ric.ric.isSupportingType(typeName)) {
+ return startSynchronization(ric);
}
}
return Mono.just(ric);
}
- private Mono<Ric> startRecovery(Ric ric) {
- RicRecoveryTask recovery = new RicRecoveryTask(a1Client, policyTypes, policies, services);
- recovery.run(ric);
+ private Mono<RicData> startSynchronization(RicData ric) {
+ RicSynchronizationTask recovery = createSynchronizationTask();
+ recovery.run(ric.ric);
return Mono.empty();
}
- private void onRicChecked(Ric ric) {
- logger.info("Ric: " + ric.name() + " checked");
- }
-
- private void onError(Throwable t) {
- logger.error("Rics supervision failed", t);
+ @SuppressWarnings("squid:S2629")
+ private void onRicChecked(RicData ric) {
+ logger.debug("Ric: {} checked", ric.ric.name());
}
private void onComplete() {
logger.debug("Checking Rics completed");
}
-}
+ RicSynchronizationTask createSynchronizationTask() {
+ return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services);
+ }
+}
\ No newline at end of file
Code Review / nonrtric.git / blobdiff