Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix year in licenses
[nonrtric.git]
/
policy-agent
/
src
/
main
/
java
/
org
/
oransc
/
policyagent
/
tasks
/
RepositorySupervision.java
diff --git
a/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
b/policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
index
022ca0f
..
ce318dd
100644
(file)
--- a/
policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
+++ b/
policy-agent/src/main/java/org/oransc/policyagent/tasks/RepositorySupervision.java
@@
-2,7
+2,7
@@
* ========================LICENSE_START=================================
* O-RAN-SC
* %%
* ========================LICENSE_START=================================
* O-RAN-SC
* %%
- * Copyright (C) 20
19
Nordix Foundation
+ * Copyright (C) 20
20
Nordix Foundation
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* %%
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-41,7
+41,7
@@
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
/**
import reactor.core.publisher.Mono;
/**
- * Regularly checks the exis
i
ting rics towards the local repository to keep it consistent.
+ * Regularly checks the existing rics towards the local repository to keep it consistent.
*/
@Component
@EnableScheduling
*/
@Component
@EnableScheduling
@@
-65,21
+65,21
@@
public class RepositorySupervision {
}
/**
}
/**
- * 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");
*/
@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<RicData> createTask() {
synchronized (this.rics) {
return Flux.fromIterable(rics.getRics()) //
}
private Flux<RicData> createTask() {
synchronized (this.rics) {
return Flux.fromIterable(rics.getRics()) //
- .flatMap(
ric -> createRicData(ric)
) //
- .flatMap(
ricData -> checkRicState(ricData)
) //
- .flatMap(
ricData -> checkRicPolicies(ricData)
) //
- .flatMap(
ricData -> checkRicPolicyTypes(ricData)
);
+ .flatMap(
this::createRicData
) //
+ .flatMap(
this::checkRicState
) //
+ .flatMap(
this::checkRicPolicies
) //
+ .flatMap(
this::checkRicPolicyTypes
);
}
}
}
}
@@
-100,9
+100,9
@@
public class RepositorySupervision {
}
private Mono<RicData> checkRicState(RicData ric) {
}
private Mono<RicData> checkRicState(RicData ric) {
- if (ric.ric.
s
tate() == RicState.UNDEFINED) {
- return start
Recovery
(ric);
- } else if (ric.ric.
state() == RicState.RECOVER
ING) {
+ if (ric.ric.
getS
tate() == RicState.UNDEFINED) {
+ return start
Synchronization
(ric);
+ } else if (ric.ric.
getState() == RicState.SYNCHRONIZ
ING) {
return Mono.empty();
} else {
return Mono.just(ric);
return Mono.empty();
} else {
return Mono.just(ric);
@@
-118,12
+118,12
@@
public class RepositorySupervision {
private Mono<RicData> validateInstances(Collection<String> ricPolicies, RicData ric) {
synchronized (this.policies) {
if (ricPolicies.size() != policies.getForRic(ric.ric.name()).size()) {
private Mono<RicData> validateInstances(Collection<String> ricPolicies, RicData ric) {
synchronized (this.policies) {
if (ricPolicies.size() != policies.getForRic(ric.ric.name()).size()) {
- return start
Recovery
(ric);
+ return start
Synchronization
(ric);
}
}
for (String policyId : ricPolicies) {
if (!policies.containsPolicy(policyId)) {
}
}
for (String policyId : ricPolicies) {
if (!policies.containsPolicy(policyId)) {
- return start
Recovery
(ric);
+ return start
Synchronization
(ric);
}
}
return Mono.just(ric);
}
}
return Mono.just(ric);
@@
-131,40
+131,38
@@
public class RepositorySupervision {
private Mono<RicData> checkRicPolicyTypes(RicData ric) {
return ric.a1Client.getPolicyTypeIdentities() //
private Mono<RicData> checkRicPolicyTypes(RicData ric) {
return ric.a1Client.getPolicyTypeIdentities() //
- .onErrorResume(t -> {
- return Mono.empty();
- }) //
+ .onErrorResume(notUsed -> Mono.empty()) //
.flatMap(ricTypes -> validateTypes(ricTypes, ric));
}
private Mono<RicData> validateTypes(Collection<String> ricTypes, RicData ric) {
if (ricTypes.size() != ric.ric.getSupportedPolicyTypes().size()) {
.flatMap(ricTypes -> validateTypes(ricTypes, ric));
}
private Mono<RicData> validateTypes(Collection<String> ricTypes, RicData ric) {
if (ricTypes.size() != ric.ric.getSupportedPolicyTypes().size()) {
- return start
Recovery
(ric);
+ return start
Synchronization
(ric);
}
for (String typeName : ricTypes) {
if (!ric.ric.isSupportingType(typeName)) {
}
for (String typeName : ricTypes) {
if (!ric.ric.isSupportingType(typeName)) {
- return start
Recovery
(ric);
+ return start
Synchronization
(ric);
}
}
return Mono.just(ric);
}
}
}
return Mono.just(ric);
}
- private Mono<RicData> start
Recovery
(RicData ric) {
- Ric
RecoveryTask recovery = new RicRecoveryTask(a1ClientFactory, policyTypes, policies, services
);
+ private Mono<RicData> start
Synchronization
(RicData ric) {
+ Ric
SynchronizationTask recovery = createSynchronizationTask(
);
recovery.run(ric.ric);
return Mono.empty();
}
recovery.run(ric.ric);
return Mono.empty();
}
+ @SuppressWarnings("squid:S2629")
private void onRicChecked(RicData ric) {
private void onRicChecked(RicData ric) {
- logger.info("Ric: " + ric.ric.name() + " checked");
- }
-
- private void onError(Throwable t) {
- logger.error("Rics supervision failed", t);
+ logger.debug("Ric: {} checked", ric.ric.name());
}
private void onComplete() {
logger.debug("Checking Rics completed");
}
}
private void onComplete() {
logger.debug("Checking Rics completed");
}
-}
+ RicSynchronizationTask createSynchronizationTask() {
+ return new RicSynchronizationTask(a1ClientFactory, policyTypes, policies, services);
+ }
+}
\ No newline at end of file