X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=4270ded6902c3ce13ebc35e2a11fb3f660d7b02c;hb=95db19e2820102db0255ca57407faa333cbb4085;hp=365d418a5560bbf9e412ed4a4a9cff0cc171160f;hpb=b47a7130c10bef2bf812366ca971e4eaa938b152;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java index 365d418a..4270ded6 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -28,14 +28,11 @@ import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; -import java.net.URL; -import java.util.Collection; import java.util.List; import java.util.Vector; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; @@ -52,6 +49,9 @@ 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 org.oransc.policyagent.tasks.RepositorySupervision; +import org.oransc.policyagent.utils.MockA1Client; +import org.oransc.policyagent.utils.MockA1ClientFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -63,7 +63,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.client.RestTemplate; -import reactor.core.publisher.Mono; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @@ -80,58 +79,20 @@ public class ApplicationTest { @Autowired private PolicyTypes policyTypes; + @Autowired + MockA1ClientFactory a1ClientFactory; + + @Autowired + RepositorySupervision supervision; + private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // public static class MockApplicationConfig extends ApplicationConfig { @Override - public void initialize() { - URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); - loadConfigurationFromFile(url.getFile()); - } - } - - static class A1ClientMock implements A1Client { - private final Policies policies; - private final PolicyTypes policyTypes; - - A1ClientMock(Policies policies, PolicyTypes policyTypes) { - this.policies = policies; - this.policyTypes = policyTypes; - } - - @Override - public Mono> getPolicyTypeIdentities(String nearRtRicUrl) { - Vector result = new Vector<>(); - for (PolicyType p : this.policyTypes.getAll()) { - result.add(p.name()); - } - return Mono.just(result); - } - - @Override - public Mono getPolicyType(String nearRtRicUrl, String policyTypeId) { - try { - return Mono.just(this.policies.get(policyTypeId).json()); - } catch (Exception e) { - return Mono.error(e); - } - } - - @Override - public Mono putPolicy(String nearRtRicUrl, String policyId, String policyString) { - return Mono.just("OK"); - } - - @Override - public Mono deletePolicy(String nearRtRicUrl, String policyId) { - return Mono.just("OK"); - } - - @Override - public Mono> getPolicyIdentities(String nearRtRicUrl) { - return Mono.empty(); // problem is that a recovery will start + public String getLocalConfigurationFilePath() { + return ""; // No config file loaded for the test } } @@ -140,8 +101,6 @@ public class ApplicationTest { */ @TestConfiguration static class TestBeanFactory { - private final Rics rics = new Rics(); - private final Policies policies = new Policies(); private final PolicyTypes policyTypes = new PolicyTypes(); @Bean @@ -150,13 +109,13 @@ public class ApplicationTest { } @Bean - A1Client getA1Client() { - return new A1ClientMock(this.policies, this.policyTypes); + MockA1ClientFactory getA1ClientFactory() { + return new MockA1ClientFactory(this.policyTypes); } @Bean public Policies getPolicies() { - return this.policies; + return new Policies(); } @Bean @@ -166,7 +125,7 @@ public class ApplicationTest { @Bean public Rics getRics() { - return this.rics; + return new Rics(); } } @@ -196,12 +155,36 @@ public class ApplicationTest { assertThat(rsp).isEqualTo("[]"); } + @Test + public void testRecovery() throws Exception { + reset(); + Policy policy = addPolicy("policyId", "typeName", "service", "ric"); // This should be created in the RIC + Policy policy2 = addPolicy("policyId2", "typeName", "service", "ric"); + + getA1Client("ric").putPolicy(policy2); // put it in the RIC + policies.remove(policy2); // Remove it from the repo -> should be deleted in the RIC + + supervision.checkAllRics(); // The created policy should be put in the RIC + Policies ricPolicies = getA1Client("ric").getPolicies(); + assertThat(ricPolicies.size()).isEqualTo(1); + Policy ricPolicy = ricPolicies.get("policyId"); + assertThat(ricPolicy.json()).isEqualTo(policy.json()); + } + + MockA1Client getA1Client(String ricName) throws ServiceException { + return a1ClientFactory.getOrCreateA1Client(ricName); + } + @Test public void testGetRic() throws Exception { reset(); + Ric ric = addRic("ric1"); + ric.addManagedElement("kista_1"); String url = baseUrl() + "/ric?managedElementId=kista_1"; + String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); + assertThat(rsp).isEqualTo("ric1"); } @@ -212,7 +195,7 @@ public class ApplicationTest { String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; String json = "{}"; addPolicyType("type1", "ric1"); - this.rics.getRic("ric1").setState(Ric.RicState.ACTIVE); + this.rics.getRic("ric1").setState(Ric.RicState.IDLE); this.restTemplate.put(url, json); @@ -245,7 +228,7 @@ public class ApplicationTest { Vector mes = new Vector<>(); RicConfig conf = ImmutableRicConfig.builder() // .name(ricName) // - .baseUrl("baseUrl") // + .baseUrl(ricName) // .managedElementIds(mes) // .build(); Ric ric = new Ric(conf); @@ -293,7 +276,7 @@ public class ApplicationTest { reset(); String url = baseUrl() + "/policy?instance=id"; Policy policy = addPolicy("id", "typeName", "service1", "ric1"); - policy.ric().setState(Ric.RicState.ACTIVE); + policy.ric().setState(Ric.RicState.IDLE); assertThat(policies.size()).isEqualTo(1); this.restTemplate.delete(url); @@ -397,6 +380,7 @@ public class ApplicationTest { ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() // .keepAliveInterval(1) // .name(name) // + .callbackUrl("callbackUrl") // .build(); String json = gson.toJson(service); return json;