X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Ftasks%2FStartupServiceTest.java;h=bd1b05858582c561a28480d66228abfedfd3f593;hb=f3461cb776023b950d62edd25eca148b6d354c9c;hp=f15a3ab3ee1452cd4872fc71e91bf3513d1fd4af;hpb=ecd2e057eb3df580433df224060c9d755146f834;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java index f15a3ab3..bd1b0585 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/tasks/StartupServiceTest.java @@ -25,27 +25,36 @@ import static org.awaitility.Awaitility.await; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import static org.oransc.policyagent.repository.Ric.RicState.ACTIVE; +import static org.oransc.policyagent.repository.Ric.RicState.IDLE; +import java.util.Arrays; +import java.util.List; import java.util.Vector; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.runner.RunWith; -import org.mockito.Mock; import org.mockito.junit.MockitoJUnitRunner; import org.mockito.junit.jupiter.MockitoExtension; import org.oransc.policyagent.clients.A1Client; +import org.oransc.policyagent.clients.A1ClientFactory; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; -import org.oransc.policyagent.exceptions.ServiceException; +import org.oransc.policyagent.repository.Policies; 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.Flux; import reactor.core.publisher.Mono; @@ -66,82 +75,128 @@ public class StartupServiceTest { private static final String POLICY_ID_1 = "policy1"; private static final String POLICY_ID_2 = "policy2"; - @Mock ApplicationConfig appConfigMock; + RefreshConfigTask refreshTaskMock; - @Mock A1Client a1ClientMock; + A1ClientFactory a1ClientFactory; + + @BeforeEach + public void init() throws Exception { + a1ClientMock = mock(A1Client.class); + a1ClientFactory = mock(A1ClientFactory.class); + appConfigMock = mock(ApplicationConfig.class); + refreshTaskMock = mock(RefreshConfigTask.class); + doReturn(Mono.just(a1ClientMock)).when(a1ClientFactory).createA1Client(any()); + } @Test - public void startup_allOk() throws ServiceException { - Vector ricConfigs = new Vector<>(2); - ricConfigs.add(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A)); - ricConfigs.add(getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C)); - when(appConfigMock.getRicConfigs()).thenReturn(ricConfigs); - - Flux fluxType1 = Flux.just(POLICY_TYPE_1_NAME); - Flux fluxType2 = Flux.just(POLICY_TYPE_2_NAME); - when(a1ClientMock.getPolicyTypeIdentities(anyString())).thenReturn(fluxType1) - .thenReturn(fluxType1.concatWith(fluxType2)); - Flux policies = Flux.just(new String[] {POLICY_ID_1, POLICY_ID_2}); - when(a1ClientMock.getPolicyIdentities(anyString())).thenReturn(policies); - when(a1ClientMock.deletePolicy(anyString(), anyString())).thenReturn(Mono.empty()); + public void startup_allOk() { + Mono> policyTypes1 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); + Mono> policyTypes2 = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME, POLICY_TYPE_2_NAME)); + doReturn(policyTypes1, policyTypes2).when(a1ClientMock).getPolicyTypeIdentities(); + doReturn(Mono.just("Schema")).when(a1ClientMock).getPolicyTypeSchema(anyString()); + doReturn(Flux.just("OK")).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); - StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, a1ClientMock); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, policyTypes, + a1ClientFactory, new Policies(), new Services()); serviceUnderTest.startup(); - await().untilAsserted(() -> assertThat(policyTypes.size()).isEqualTo(2)); + serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), + ApplicationConfig.RicConfigUpdate.ADDED); + serviceUnderTest.onRicConfigUpdate( + getRicConfig(SECOND_RIC_NAME, SECOND_RIC_URL, MANAGED_NODE_B, MANAGED_NODE_C), + ApplicationConfig.RicConfigUpdate.ADDED); - verify(a1ClientMock).getPolicyTypeIdentities(FIRST_RIC_URL); - verify(a1ClientMock).deletePolicy(FIRST_RIC_URL, POLICY_ID_1); - verify(a1ClientMock).deletePolicy(FIRST_RIC_URL, POLICY_ID_2); + await().untilAsserted(() -> assertThat(policyTypes.size()).isEqualTo(2)); - verify(a1ClientMock).getPolicyTypeIdentities(SECOND_RIC_URL); - verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_1); - verify(a1ClientMock).deletePolicy(SECOND_RIC_URL, POLICY_ID_2); + verify(a1ClientMock, times(2)).deleteAllPolicies(); assertTrue(policyTypes.contains(POLICY_TYPE_1_NAME), POLICY_TYPE_1_NAME + " not added to PolicyTypes."); assertTrue(policyTypes.contains(POLICY_TYPE_2_NAME), POLICY_TYPE_2_NAME + " not added to PolicyTypes."); assertEquals(2, rics.size(), "Correct number of Rics not added to Rics"); - Ric firstRic = rics.getRic(FIRST_RIC_NAME); + Ric firstRic = rics.get(FIRST_RIC_NAME); assertNotNull(firstRic, "Ric " + FIRST_RIC_NAME + " not added to repository"); assertEquals(FIRST_RIC_NAME, firstRic.name(), FIRST_RIC_NAME + " not added to Rics"); - assertEquals(ACTIVE, firstRic.state(), "Not correct state for ric " + FIRST_RIC_NAME); + assertEquals(IDLE, firstRic.state(), "Not correct state for ric " + FIRST_RIC_NAME); assertEquals(1, firstRic.getSupportedPolicyTypes().size(), "Not correct no of types supported for ric " + FIRST_RIC_NAME); assertTrue(firstRic.isSupportingType(POLICY_TYPE_1_NAME), POLICY_TYPE_1_NAME + " not supported by ric " + FIRST_RIC_NAME); - assertEquals(1, firstRic.getManagedNodes().size(), "Not correct no of managed nodes for ric " + FIRST_RIC_NAME); + assertEquals(1, firstRic.getManagedElementIds().size(), + "Not correct no of managed nodes for ric " + FIRST_RIC_NAME); assertTrue(firstRic.isManaging(MANAGED_NODE_A), MANAGED_NODE_A + " not managed by ric " + FIRST_RIC_NAME); - Ric secondRic = rics.getRic(SECOND_RIC_NAME); - assertNotNull(secondRic, "Ric " + SECOND_RIC_NAME + " not added to repositpry"); + Ric secondRic = rics.get(SECOND_RIC_NAME); + assertNotNull(secondRic, "Ric " + SECOND_RIC_NAME + " not added to repository"); assertEquals(SECOND_RIC_NAME, secondRic.name(), SECOND_RIC_NAME + " not added to Rics"); - assertEquals(ACTIVE, secondRic.state(), "Not correct state for " + SECOND_RIC_NAME); + assertEquals(IDLE, secondRic.state(), "Not correct state for " + SECOND_RIC_NAME); assertEquals(2, secondRic.getSupportedPolicyTypes().size(), "Not correct no of types supported for ric " + SECOND_RIC_NAME); assertTrue(secondRic.isSupportingType(POLICY_TYPE_1_NAME), POLICY_TYPE_1_NAME + " not supported by ric " + SECOND_RIC_NAME); assertTrue(secondRic.isSupportingType(POLICY_TYPE_2_NAME), POLICY_TYPE_2_NAME + " not supported by ric " + SECOND_RIC_NAME); - assertEquals(2, secondRic.getManagedNodes().size(), + assertEquals(2, secondRic.getManagedElementIds().size(), "Not correct no of managed nodes for ric " + SECOND_RIC_NAME); assertTrue(secondRic.isManaging(MANAGED_NODE_B), MANAGED_NODE_B + " not managed by ric " + SECOND_RIC_NAME); assertTrue(secondRic.isManaging(MANAGED_NODE_C), MANAGED_NODE_C + " not managed by ric " + SECOND_RIC_NAME); } - private RicConfig getRicConfig(String name, String baseUrl, String... nodeNames) { - Vector managedNodes = new Vector(1); - for (String nodeName : nodeNames) { - managedNodes.add(nodeName); + @Test + public void startup_unableToConnectToGetTypes() { + Mono error = Mono.error(new Exception("Unable to contact ric.")); + doReturn(error, error).when(a1ClientMock).getPolicyTypeIdentities(); + + Rics rics = new Rics(); + PolicyTypes policyTypes = new PolicyTypes(); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, policyTypes, + a1ClientFactory, new Policies(), new Services()); + + serviceUnderTest.startup(); + serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), + ApplicationConfig.RicConfigUpdate.ADDED); + + assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).state(), "Not correct state for " + FIRST_RIC_NAME); + } + + @Test + public void startup_unableToConnectToDeleteAllPolicies() { + + Mono> policyTypes = Mono.just(Arrays.asList(POLICY_TYPE_1_NAME)); + when(a1ClientMock.getPolicyTypeIdentities()).thenReturn(policyTypes); + when(a1ClientMock.getPolicyTypeSchema(anyString())).thenReturn(Mono.just("Schema")); + Flux error = Flux.error(new Exception("Unable to contact ric.")); + doReturn(error).when(a1ClientMock).deleteAllPolicies(); + + Rics rics = new Rics(); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, new PolicyTypes(), + a1ClientFactory, new Policies(), new Services()); + + serviceUnderTest.startup(); + serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), + ApplicationConfig.RicConfigUpdate.ADDED); + + assertEquals(RicState.UNDEFINED, rics.get(FIRST_RIC_NAME).state(), "Not correct state for " + FIRST_RIC_NAME); + } + + @SafeVarargs + private Vector toVector(T... objs) { + Vector result = new Vector<>(); + for (T o : objs) { + result.add(o); } + return result; + } + + private RicConfig getRicConfig(String name, String baseUrl, String... managedElementIds) { ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() // .name(name) // - .managedElementIds(managedNodes) // + .managedElementIds(toVector(managedElementIds)) // .baseUrl(baseUrl) // .build(); return ricConfig;