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=045a8c7afd8df2e3569b6c84417fe5f1dc429df7;hb=805681f9c4f555fd905af4ecd4f0beea8d657327;hp=ad9fc6978642923baf615b7fe6253074737d7e5b;hpb=296f7c083ed15a57e59ea4546eb0624bf235d29b;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 ad9fc697..045a8c7a 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,17 +20,25 @@
 
 package org.oransc.policyagent.tasks;
 
-import static org.junit.Assert.assertEquals;
+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.anyString;
-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 java.util.Vector;
 
-import org.junit.Test;
-import org.oransc.policyagent.clients.RicClient;
+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.configuration.ApplicationConfig;
 import org.oransc.policyagent.configuration.ImmutableRicConfig;
 import org.oransc.policyagent.configuration.RicConfig;
@@ -38,41 +46,102 @@ import org.oransc.policyagent.exceptions.ServiceException;
 import org.oransc.policyagent.repository.ImmutablePolicyType;
 import org.oransc.policyagent.repository.PolicyType;
 import org.oransc.policyagent.repository.PolicyTypes;
+import org.oransc.policyagent.repository.Ric;
 import org.oransc.policyagent.repository.Rics;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
+@ExtendWith(MockitoExtension.class)
+@RunWith(MockitoJUnitRunner.class)
 public class StartupServiceTest {
+    private static final String FIRST_RIC_NAME = "first";
+    private static final String FIRST_RIC_URL = "firstUrl";
+    private static final String SECOND_RIC_NAME = "second";
+    private static final String SECOND_RIC_URL = "secondUrl";
+    private static final String MANAGED_NODE_A = "nodeA";
+    private static final String MANAGED_NODE_B = "nodeB";
+    private static final String MANAGED_NODE_C = "nodeC";
+
+    private static final String POLICY_TYPE_1_NAME = "type1";
+    private static final PolicyType POLICY_TYPE_1 = ImmutablePolicyType.builder().name(POLICY_TYPE_1_NAME).build();
+    private static final String POLICY_TYPE_2_NAME = "type2";
+    private static final PolicyType POLICY_TYPE_2 = ImmutablePolicyType.builder().name(POLICY_TYPE_2_NAME).build();
+    private static final String POLICY_ID_1 = "policy1";
+    private static final String POLICY_ID_2 = "policy2";
+
+    @Mock
     ApplicationConfig appConfigMock;
 
+    @Mock
+    A1Client a1ClientMock;
+
     @Test
     public void startup_allOk() throws ServiceException {
-        ApplicationConfig appConfigMock = mock(ApplicationConfig.class);
         Vector<RicConfig> ricConfigs = new Vector<>(2);
-        Vector<String> firstNodes = new Vector<String>(1);
-        firstNodes.add("nodeA");
-        ricConfigs.add(ImmutableRicConfig.builder().name("first").managedElementIds(firstNodes).baseUrl("url").build());
+        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<String> fluxType1 = Flux.just(POLICY_TYPE_1_NAME);
+        Flux<String> fluxType2 = Flux.just(POLICY_TYPE_2_NAME);
+        when(a1ClientMock.getPolicyTypeIdentities(anyString())).thenReturn(fluxType1)
+            .thenReturn(fluxType1.concatWith(fluxType2));
+        Flux<String> 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());
+
         Rics rics = new Rics();
         PolicyTypes policyTypes = new PolicyTypes();
+        StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, a1ClientMock);
 
-        Vector<PolicyType> types = new Vector<>();
-        PolicyType type = ImmutablePolicyType.builder().name("type1").jsonSchema("{}").build();
-        types.add(type);
-        RicClient ricClientMock = mock(RicClient.class);
-        when(ricClientMock.getPolicyTypes(anyString())).thenReturn(types);
+        serviceUnderTest.startup();
 
-        StartupService serviceUnderTest = new StartupService(appConfigMock, rics, policyTypes, ricClientMock);
+        await().untilAsserted(() -> assertThat(policyTypes.size()).isEqualTo(2));
 
-        serviceUnderTest.startup();
+        verify(a1ClientMock).getPolicyTypeIdentities(FIRST_RIC_URL);
+        verify(a1ClientMock).deletePolicy(FIRST_RIC_URL, POLICY_ID_1);
+        verify(a1ClientMock).deletePolicy(FIRST_RIC_URL, POLICY_ID_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(ricClientMock).deleteAllPolicies("url");
-        verify(ricClientMock).getPolicyTypes("url");
-        verifyNoMoreInteractions(ricClientMock);
+        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");
 
-        assertEquals("Correct nymber of Rics not added to Rics", 1, rics.size());
-        assertEquals("Not correct Ric added to Rics", "first", rics.getRic("first").name());
+        Ric firstRic = rics.getRic(FIRST_RIC_NAME);
+        assertNotNull(firstRic, "Ric \"" + FIRST_RIC_NAME + "\" not added to repositpry");
+        assertEquals(FIRST_RIC_NAME, firstRic.name(), "Not correct Ric \"" + FIRST_RIC_NAME + "\" added to Rics");
+        assertEquals(ACTIVE, firstRic.state(), "Not correct state for \"" + FIRST_RIC_NAME + "\"");
+        assertEquals(1, firstRic.getSupportedPolicyTypes().size(), "Not correct no of types supported");
+        assertTrue(firstRic.isSupportingType(POLICY_TYPE_1_NAME), "Not correct type supported");
+        assertEquals(1, firstRic.getManagedNodes().size(), "Not correct no of managed nodes");
+        assertTrue(firstRic.isManaging(MANAGED_NODE_A), "Not managed by node");
+
+        Ric secondRic = rics.getRic(SECOND_RIC_NAME);
+        assertNotNull(secondRic, "Ric \"" + SECOND_RIC_NAME + "\" not added to repositpry");
+        assertEquals(SECOND_RIC_NAME, secondRic.name(), "Not correct Ric \"" + SECOND_RIC_NAME + "\" added to Rics");
+        assertEquals(ACTIVE, secondRic.state(), "Not correct state for \"" + SECOND_RIC_NAME + "\"");
+        assertEquals(2, secondRic.getSupportedPolicyTypes().size(), "Not correct no of types supported");
+        assertTrue(secondRic.isSupportingType(POLICY_TYPE_1_NAME), "Not correct type supported");
+        assertTrue(secondRic.isSupportingType(POLICY_TYPE_2_NAME), "Not correct type supported");
+        assertEquals(2, secondRic.getManagedNodes().size(), "Not correct no of managed nodes");
+        assertTrue(secondRic.isManaging(MANAGED_NODE_B), "Not correct managed node");
+        assertTrue(secondRic.isManaging(MANAGED_NODE_C), "Not correct managed node");
+    }
 
-        assertEquals("Not correct number of policy types added.", 1, policyTypes.size());
-        assertEquals("Not correct type added.", type, policyTypes.getType(type.name()));
+    private RicConfig getRicConfig(String name, String baseUrl, String... nodeNames) {
+        Vector<String> managedNodes = new Vector<String>(1);
+        for (String nodeName : nodeNames) {
+            managedNodes.add(nodeName);
+        }
+        ImmutableRicConfig ricConfig = ImmutableRicConfig.builder() //
+            .name(name) //
+            .managedElementIds(managedNodes) //
+            .baseUrl(baseUrl) //
+            .build();
+        return ricConfig;
     }
 }