Code Review
/
nonrtric.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "New version of NearRT-RIC simulator"
[nonrtric.git]
/
policy-agent
/
src
/
test
/
java
/
org
/
oransc
/
policyagent
/
tasks
/
RepositorySupervisionTest.java
diff --git
a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RepositorySupervisionTest.java
b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RepositorySupervisionTest.java
index
791acee
..
b1f397a
100644
(file)
--- a/
policy-agent/src/test/java/org/oransc/policyagent/tasks/RepositorySupervisionTest.java
+++ b/
policy-agent/src/test/java/org/oransc/policyagent/tasks/RepositorySupervisionTest.java
@@
-47,6
+47,7
@@
import org.oransc.policyagent.repository.PolicyTypes;
import org.oransc.policyagent.repository.Ric;
import org.oransc.policyagent.repository.Ric.RicState;
import org.oransc.policyagent.repository.Rics;
import org.oransc.policyagent.repository.Ric;
import org.oransc.policyagent.repository.Ric.RicState;
import org.oransc.policyagent.repository.Rics;
+import org.oransc.policyagent.repository.Services;
import reactor.core.publisher.Mono;
@ExtendWith(MockitoExtension.class)
import reactor.core.publisher.Mono;
@ExtendWith(MockitoExtension.class)
@@
-62,13
+63,13
@@
public class RepositorySupervisionTest {
.baseUrl("baseUrl1") //
.managedElementIds(new Vector<String>(Arrays.asList("kista_1", "kista_2"))) //
.build());
.baseUrl("baseUrl1") //
.managedElementIds(new Vector<String>(Arrays.asList("kista_1", "kista_2"))) //
.build());
- ric1.setState(Ric.RicState.
ACTIV
E);
+ ric1.setState(Ric.RicState.
IDL
E);
Ric ric2 = new Ric(ImmutableRicConfig.builder() //
.name("ric2") //
.baseUrl("baseUrl2") //
.managedElementIds(new Vector<String>(Arrays.asList("kista_3", "kista_4"))) //
.build());
Ric ric2 = new Ric(ImmutableRicConfig.builder() //
.name("ric2") //
.baseUrl("baseUrl2") //
.managedElementIds(new Vector<String>(Arrays.asList("kista_3", "kista_4"))) //
.build());
- ric2.setState(Ric.RicState.
NOT_REACHABLE
);
+ ric2.setState(Ric.RicState.
UNDEFINED
);
Ric ric3 = new Ric(ImmutableRicConfig.builder() //
.name("ric3") //
.baseUrl("baseUrl3") //
Ric ric3 = new Ric(ImmutableRicConfig.builder() //
.name("ric3") //
.baseUrl("baseUrl3") //
@@
-94,8
+95,10
@@
public class RepositorySupervisionTest {
Policies policies = new Policies();
policies.put(policy1);
PolicyTypes types = new PolicyTypes();
Policies policies = new Policies();
policies.put(policy1);
PolicyTypes types = new PolicyTypes();
+ Services services = new Services();
- RepositorySupervision supervisorUnderTest = new RepositorySupervision(rics, policies, a1ClientMock, types);
+ RepositorySupervision supervisorUnderTest =
+ new RepositorySupervision(rics, policies, a1ClientMock, types, services);
Mono<Collection<String>> policyIds = Mono.just(Arrays.asList("policyId1", "policyId2"));
when(a1ClientMock.getPolicyIdentities(anyString())).thenReturn(policyIds);
Mono<Collection<String>> policyIds = Mono.just(Arrays.asList("policyId1", "policyId2"));
when(a1ClientMock.getPolicyIdentities(anyString())).thenReturn(policyIds);
@@
-105,9
+108,9
@@
public class RepositorySupervisionTest {
supervisorUnderTest.checkAllRics();
supervisorUnderTest.checkAllRics();
- await().untilAsserted(() -> RicState.
ACTIV
E.equals(ric1.state()));
- await().untilAsserted(() -> RicState.
ACTIV
E.equals(ric2.state()));
- await().untilAsserted(() -> RicState.
ACTIV
E.equals(ric3.state()));
+ await().untilAsserted(() -> RicState.
IDL
E.equals(ric1.state()));
+ await().untilAsserted(() -> RicState.
IDL
E.equals(ric2.state()));
+ await().untilAsserted(() -> RicState.
IDL
E.equals(ric3.state()));
verify(a1ClientMock).deletePolicy("baseUrl1", "policyId2");
verify(a1ClientMock).deletePolicy("baseUrl2", "policyId2");
verify(a1ClientMock).deletePolicy("baseUrl1", "policyId2");
verify(a1ClientMock).deletePolicy("baseUrl2", "policyId2");