import java.util.Vector;
import org.oransc.policyagent.clients.A1Client;
+import org.oransc.policyagent.clients.A1ClientFactory;
import org.oransc.policyagent.clients.AsyncRestClient;
import org.oransc.policyagent.exceptions.ServiceException;
import org.oransc.policyagent.repository.ImmutablePolicyType;
private static final Logger logger = LoggerFactory.getLogger(RicRecoveryTask.class);
- private final A1Client a1Client;
+ private final A1ClientFactory a1ClientFactory;
private final PolicyTypes policyTypes;
private final Policies policies;
private final Services services;
- public RicRecoveryTask(A1Client a1Client, PolicyTypes policyTypes, Policies policies, Services services) {
- this.a1Client = a1Client;
+ public RicRecoveryTask(A1ClientFactory a1ClientFactory, PolicyTypes policyTypes, Policies policies,
+ Services services) {
+ this.a1ClientFactory = a1ClientFactory;
this.policyTypes = policyTypes;
this.policies = policies;
this.services = services;
}
ric.setState(Ric.RicState.RECOVERING);
}
- Flux<PolicyType> recoverTypes = recoverPolicyTypes(ric);
- Flux<?> deletePoliciesInRic = deleteAllPoliciesInRic(ric);
- Flux<?> recreatePoliciesInRic = recreateAllPoliciesInRic(ric);
-
- Flux.concat(recoverTypes, deletePoliciesInRic, recreatePoliciesInRic) //
+ this.a1ClientFactory.createA1Client(ric)//
+ .flatMapMany(client -> startRecover(ric, client)) //
.subscribe(x -> logger.debug("Recover: " + x), //
throwable -> onRecoveryError(ric, throwable), //
() -> onRecoveryComplete(ric));
}
+ private Flux<Object> startRecover(Ric ric, A1Client a1Client) {
+ Flux<PolicyType> recoverTypes = recoverPolicyTypes(ric, a1Client);
+ Flux<?> deletePoliciesInRic = a1Client.deleteAllPolicies();
+ Flux<?> recreatePoliciesInRic = recreateAllPoliciesInRic(ric, a1Client);
+
+ return Flux.concat(recoverTypes, deletePoliciesInRic, recreatePoliciesInRic);
+ }
+
private void onRecoveryComplete(Ric ric) {
logger.debug("Recovery completed for:" + ric.name());
ric.setState(Ric.RicState.IDLE);
private void onRecoveryError(Ric ric, Throwable t) {
logger.warn("Recovery failed for: {}, reason: {}", ric.name(), t.getMessage());
-
// If recovery fails, try to remove all instances
deleteAllPolicies(ric);
- Flux<PolicyType> recoverTypes = recoverPolicyTypes(ric);
- Flux<?> deletePoliciesInRic = deleteAllPoliciesInRic(ric);
+ Flux<PolicyType> recoverTypes = this.a1ClientFactory.createA1Client(ric) //
+ .flatMapMany(a1Client -> recoverPolicyTypes(ric, a1Client));
+ Flux<?> deletePoliciesInRic = this.a1ClientFactory.createA1Client(ric) //
+ .flatMapMany(a1Client -> a1Client.deleteAllPolicies());
Flux.merge(recoverTypes, deletePoliciesInRic) //
.subscribe(x -> logger.debug("Brute recover: " + x), //
return new AsyncRestClient(url);
}
- private Flux<PolicyType> recoverPolicyTypes(Ric ric) {
+ private Flux<PolicyType> recoverPolicyTypes(Ric ric, A1Client a1Client) {
ric.clearSupportedPolicyTypes();
- return a1Client.getPolicyTypeIdentities(ric.getConfig().baseUrl()) //
+ return a1Client.getPolicyTypeIdentities() //
.flatMapMany(types -> Flux.fromIterable(types)) //
.doOnNext(typeId -> logger.debug("For ric: {}, handling type: {}", ric.getConfig().name(), typeId)) //
- .flatMap((policyTypeId) -> getPolicyType(ric, policyTypeId)) //
+ .flatMap((policyTypeId) -> getPolicyType(ric, policyTypeId, a1Client)) //
.doOnNext(policyType -> ric.addSupportedPolicyType(policyType)); //
}
- private Mono<PolicyType> getPolicyType(Ric ric, String policyTypeId) {
+ private Mono<PolicyType> getPolicyType(Ric ric, String policyTypeId, A1Client a1Client) {
if (policyTypes.contains(policyTypeId)) {
try {
return Mono.just(policyTypes.getType(policyTypeId));
return Mono.error(e);
}
}
- return a1Client.getPolicyType(ric.getConfig().baseUrl(), policyTypeId) //
+ return a1Client.getPolicyTypeSchema(policyTypeId) //
.flatMap(schema -> createPolicyType(policyTypeId, schema));
}
}
}
- private Flux<String> deleteAllPoliciesInRic(Ric ric) {
- return a1Client.getPolicyIdentities(ric.getConfig().baseUrl()) //
- .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) //
- .doOnNext(policyId -> logger.debug("Deleting policy: {}, for ric: {}", policyId, ric.getConfig().name()))
- .flatMap(policyId -> a1Client.deletePolicy(ric.getConfig().baseUrl(), policyId)); //
- }
-
- private Flux<String> recreateAllPoliciesInRic(Ric ric) {
+ private Flux<String> recreateAllPoliciesInRic(Ric ric, A1Client a1Client) {
synchronized (policies) {
return Flux.fromIterable(new Vector<>(policies.getForRic(ric.name()))) //
.doOnNext(