X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FRepositorySupervisionTest.java;h=1330a14fbf1e190be3da7ca66ec4ebac62a367d8;hb=9a02b07f542f5fbb67b9214253a7706d304e84f8;hp=791acee24d0dd7226d75e48c1bb80d9419aaad82;hpb=637540bc28fbf337e0c4c58c051a6b4f7ceb321d;p=nonrtric.git 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 791acee2..1330a14f 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/RepositorySupervisionTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/RepositorySupervisionTest.java @@ -21,6 +21,7 @@ package org.oransc.policyagent.tasks; import static org.awaitility.Awaitility.await; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verifyNoMoreInteractions; @@ -47,6 +48,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.Services; import reactor.core.publisher.Mono; @ExtendWith(MockitoExtension.class) @@ -62,13 +64,13 @@ public class RepositorySupervisionTest { .baseUrl("baseUrl1") // .managedElementIds(new Vector(Arrays.asList("kista_1", "kista_2"))) // .build()); - ric1.setState(Ric.RicState.ACTIVE); + ric1.setState(Ric.RicState.IDLE); Ric ric2 = new Ric(ImmutableRicConfig.builder() // .name("ric2") // .baseUrl("baseUrl2") // .managedElementIds(new Vector(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") // @@ -94,20 +96,23 @@ public class RepositorySupervisionTest { 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> policyIds = Mono.just(Arrays.asList("policyId1", "policyId2")); when(a1ClientMock.getPolicyIdentities(anyString())).thenReturn(policyIds); when(a1ClientMock.deletePolicy(anyString(), anyString())).thenReturn(Mono.empty()); when(a1ClientMock.getPolicyTypeIdentities(anyString())).thenReturn(policyIds); when(a1ClientMock.getPolicyType(anyString(), anyString())).thenReturn(Mono.just("schema")); + when(a1ClientMock.putPolicy(any())).thenReturn(Mono.just("OK")); supervisorUnderTest.checkAllRics(); - await().untilAsserted(() -> RicState.ACTIVE.equals(ric1.state())); - await().untilAsserted(() -> RicState.ACTIVE.equals(ric2.state())); - await().untilAsserted(() -> RicState.ACTIVE.equals(ric3.state())); + await().untilAsserted(() -> RicState.IDLE.equals(ric1.state())); + await().untilAsserted(() -> RicState.IDLE.equals(ric2.state())); + await().untilAsserted(() -> RicState.IDLE.equals(ric3.state())); verify(a1ClientMock).deletePolicy("baseUrl1", "policyId2"); verify(a1ClientMock).deletePolicy("baseUrl2", "policyId2");