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=eeecc1c9fb3ff92a620c0694806a226e633a7852;hb=9013ed7ad46ce6927fbf69890487e8df61b7d7ee;hp=d08077f1bb651e124c84421acbbf73c1a5828b53;hpb=01cf1b466e7eebf51789b83fbab5139880c20107;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 d08077f1..eeecc1c9 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 @@ -20,28 +20,47 @@ package org.oransc.policyagent.tasks; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; +import static org.assertj.core.api.Assertions.assertThat; +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.verify; -import static org.mockito.Mockito.verifyNoMoreInteractions; 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 com.google.common.collect.ImmutableList; + +import java.util.Arrays; +import java.util.Collections; +import java.util.List; import java.util.Vector; + +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.oransc.policyagent.clients.RicClient; +import org.junit.jupiter.api.extension.ExtendWith; +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.ImmutablePolicyType; +import org.oransc.policyagent.repository.Policies; +import org.oransc.policyagent.repository.Policy; import org.oransc.policyagent.repository.PolicyType; 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; +@ExtendWith(MockitoExtension.class) public class StartupServiceTest { private static final String FIRST_RIC_NAME = "first"; private static final String FIRST_RIC_URL = "firstUrl"; @@ -55,72 +74,139 @@ public class StartupServiceTest { private static final String POLICY_TYPE_2_NAME = "type2"; ApplicationConfig appConfigMock; + RefreshConfigTask refreshTaskMock; + + 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 { - ApplicationConfig appConfigMock = mock(ApplicationConfig.class); - 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); - - Vector firstTypes = new Vector<>(); - PolicyType type1 = ImmutablePolicyType.builder().name(POLICY_TYPE_1_NAME).jsonSchema("{}").build(); - firstTypes.add(type1); - Vector secondTypes = new Vector<>(); - secondTypes.add(type1); - PolicyType type2 = ImmutablePolicyType.builder().name(POLICY_TYPE_2_NAME).jsonSchema("{}").build(); - secondTypes.add(type2); - RicClient ricClientMock = mock(RicClient.class); - when(ricClientMock.getPolicyTypes(FIRST_RIC_URL)).thenReturn(firstTypes); - when(ricClientMock.getPolicyTypes("secondUrl")).thenReturn(secondTypes); + public void startupAndAllOk_thenRicsAreConfiguredInRepository() { + 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.empty()).when(a1ClientMock).deleteAllPolicies(); Rics rics = new Rics(); PolicyTypes policyTypes = new PolicyTypes(); - StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, ricClientMock); + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, rics, policyTypes, + a1ClientFactory, new Policies(), new Services()); serviceUnderTest.startup(); - verify(ricClientMock).deleteAllPolicies(FIRST_RIC_URL); - verify(ricClientMock).getPolicyTypes(FIRST_RIC_URL); - verify(ricClientMock).deleteAllPolicies(SECOND_RIC_URL); - verify(ricClientMock).getPolicyTypes(SECOND_RIC_URL); - verifyNoMoreInteractions(ricClientMock); - - assertEquals("Not correct number of policy types added.", 2, policyTypes.size()); - assertEquals("Not correct type added.", type1, policyTypes.getType(POLICY_TYPE_1_NAME)); - assertEquals("Not correct type added.", type2, policyTypes.getType(POLICY_TYPE_2_NAME)); - assertEquals("Correct nymber of Rics not added to Rics", 2, rics.size()); - - Ric firstRic = rics.getRic(FIRST_RIC_NAME); - assertNotNull("Ric \"" + FIRST_RIC_NAME + "\" not added to repositpry", firstRic); - assertEquals("Not correct Ric \"" + FIRST_RIC_NAME + "\" added to Rics", FIRST_RIC_NAME, firstRic.name()); - assertEquals("Not correct state for \"" + FIRST_RIC_NAME + "\"", ACTIVE, firstRic.state()); - assertEquals("Not correct no of types supported", 1, firstRic.getSupportedPolicyTypes().size()); - assertTrue("Not correct type supported", firstRic.isSupportingType(type1)); - assertEquals("Not correct no of managed nodes", 1, firstRic.getManagedNodes().size()); - assertTrue("Not managed by node", firstRic.isManaging(MANAGED_NODE_A)); - - Ric secondRic = rics.getRic(SECOND_RIC_NAME); - assertNotNull("Ric \"" + SECOND_RIC_NAME + "\" not added to repositpry", secondRic); - assertEquals("Not correct Ric \"" + SECOND_RIC_NAME + "\" added to Rics", SECOND_RIC_NAME, secondRic.name()); - assertEquals("Not correct state for \"" + SECOND_RIC_NAME + "\"", ACTIVE, secondRic.state()); - assertEquals("Not correct no of types supported", 2, secondRic.getSupportedPolicyTypes().size()); - assertTrue("Not correct type supported", secondRic.isSupportingType(type1)); - assertTrue("Not correct type supported", secondRic.isSupportingType(type2)); - assertEquals("Not correct no of managed nodes", 2, secondRic.getManagedNodes().size()); - assertTrue("Not correct managed node", secondRic.isManaging(MANAGED_NODE_B)); - assertTrue("Not correct managed node", secondRic.isManaging(MANAGED_NODE_C)); + 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); + + Ric firstRic = rics.get(FIRST_RIC_NAME); + Ric secondRic = rics.get(SECOND_RIC_NAME); + await().untilAsserted(() -> assertThat(firstRic.getState()).isEqualTo(IDLE)); + await().untilAsserted(() -> assertThat(secondRic.getState()).isEqualTo(IDLE)); + + 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"); + + assertNotNull(firstRic, "Ric " + FIRST_RIC_NAME + " not added to repository"); + assertEquals(FIRST_RIC_NAME, firstRic.name(), FIRST_RIC_NAME + " not added to Rics"); + + 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.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); + + assertNotNull(secondRic, "Ric " + SECOND_RIC_NAME + " not added to repository"); + assertEquals(SECOND_RIC_NAME, secondRic.name(), SECOND_RIC_NAME + " not added to Rics"); + 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.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 startupAndUnableToConnectToGetTypes_thenRicStateSetToUndefined() { + 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).getState(), + "Not correct state for " + FIRST_RIC_NAME); + } + + @Test + public void startupAndUnableToConnectToDeleteAllPolicies_thenRicStateSetToUndefined() { + + 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(); + + RicConfig ricConfig = mock(RicConfig.class); + when(ricConfig.name()).thenReturn(FIRST_RIC_NAME); + when(ricConfig.managedElementIds()).thenReturn(ImmutableList.copyOf(Collections.emptyList())); + Ric ric = new Ric(ricConfig); + + PolicyType policyType = mock(PolicyType.class); + when(policyType.name()).thenReturn(POLICY_TYPE_1_NAME); + + Policy policy = mock(Policy.class); + when(policy.ric()).thenReturn(ric); + when(policy.type()).thenReturn(policyType); + Policies policies = new Policies(); + policies.put(policy); + + StartupService serviceUnderTest = new StartupService(appConfigMock, refreshTaskMock, new Rics(), + new PolicyTypes(), a1ClientFactory, policies, new Services()); + + serviceUnderTest.startup(); + serviceUnderTest.onRicConfigUpdate(getRicConfig(FIRST_RIC_NAME, FIRST_RIC_URL, MANAGED_NODE_A), + ApplicationConfig.RicConfigUpdate.ADDED); + + assertEquals(RicState.UNDEFINED, ric.getState(), "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;