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=091915415d299eb663b0cfc5dcfe8f21c046b13f;hb=636b5946ed5f9475d13cf4c942a2d9d35d1a5cbd;hp=df26ba4f6bae76997a8c1381428401ccfb61e8eb;hpb=9de32bd6e23b01413d1319e668235568068b3699;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 df26ba4f..09191541 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -17,10 +17,12 @@ * limitations under the License. * ========================LICENSE_END=================================== */ + package org.oransc.policyagent; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -30,15 +32,14 @@ import java.net.URL; import java.util.List; import java.util.Vector; -import org.junit.Test; -import org.junit.jupiter.api.BeforeEach; -import org.junit.runner.RunWith; +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; import org.oransc.policyagent.controllers.ImmutableServiceRegistrationInfo; import org.oransc.policyagent.controllers.ImmutableServiceStatus; -import org.oransc.policyagent.controllers.PolicyTypeInfo; import org.oransc.policyagent.controllers.ServiceRegistrationInfo; import org.oransc.policyagent.controllers.ServiceStatus; import org.oransc.policyagent.exceptions.ServiceException; @@ -50,20 +51,25 @@ 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.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.context.TestConfiguration; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.client.RestTemplate; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ApplicationTest { + @Autowired + ApplicationContext context; @Autowired private Rics rics; @@ -74,28 +80,55 @@ public class ApplicationTest { @Autowired private PolicyTypes policyTypes; + @Autowired + MockA1Client a1Client; + + @Autowired + RepositorySupervision supervision; + private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // public static class MockApplicationConfig extends ApplicationConfig { @Override - public void initialize() { + public String getLocalConfigurationFilePath() { URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); - loadConfigurationFromFile(url.getFile()); + return url.getFile(); } } /** - * overrides the BeanFactory + * Overrides the BeanFactory. */ @TestConfiguration static class TestBeanFactory { + private final PolicyTypes policyTypes = new PolicyTypes(); @Bean public ApplicationConfig getApplicationConfig() { return new MockApplicationConfig(); } + + @Bean + A1Client getA1Client() { + return new MockA1Client(this.policyTypes); + } + + @Bean + public Policies getPolicies() { + return new Policies(); + } + + @Bean + public PolicyTypes getPolicyTypes() { + return this.policyTypes; + } + + @Bean + public Rics getRics() { + return new Rics(); + } } @LocalServerPort @@ -103,8 +136,7 @@ public class ApplicationTest { private final RestTemplate restTemplate = new RestTemplate(); - @BeforeEach - public void reset() { + private void reset() { rics.clear(); policies.clear(); policyTypes.clear(); @@ -113,31 +145,55 @@ public class ApplicationTest { @Test public void testGetRics() throws Exception { + reset(); + addRic("kista_1"); String url = baseUrl() + "/rics"; String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println(rsp); assertThat(rsp).contains("kista_1"); + + url = baseUrl() + "/rics?policyType=ANR"; + rsp = this.restTemplate.getForObject(url, String.class); + 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"); + a1Client.putPolicy("ric", 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 = a1Client.getPolicies("ric"); + assertThat(ricPolicies.size()).isEqualTo(1); + Policy ricPolicy = ricPolicies.get("policyId"); + assertThat(ricPolicy.json()).isEqualTo(policy.json()); } @Test public void testGetRic() throws Exception { + reset(); String url = baseUrl() + "/ric?managedElementId=kista_1"; String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println(rsp); assertThat(rsp).isEqualTo("ric1"); } - // managedElmentId -> nodeName - @Test public void testPutPolicy() throws Exception { putService("service1"); String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; String json = "{}"; - addPolicyType("type1"); + addPolicyType("type1", "ric1"); + this.rics.getRic("ric1").setState(Ric.RicState.IDLE); this.restTemplate.put(url, json); - Policy policy = policies.get("instance1"); + Policy policy = policies.getPolicy("instance1"); assertThat(policy).isNotNull(); assertThat(policy.id()).isEqualTo("instance1"); @@ -148,19 +204,27 @@ public class ApplicationTest { System.out.println(rsp); } - private PolicyType addPolicyType(String name) { + private PolicyType addPolicyType(String policyTypeName, String ricName) { PolicyType type = ImmutablePolicyType.builder() // - .jsonSchema("") // - .name(name) // + .name(policyTypeName) // + .schema("{\"title\":\"" + policyTypeName + "\"}") // .build(); policyTypes.put(type); + addRic(ricName).addSupportedPolicyType(type); return type; } - private Ric addRic(String name) { + private Ric addRic(String ricName) { + if (rics.get(ricName) != null) { + return rics.get(ricName); + } Vector mes = new Vector<>(); - RicConfig conf = ImmutableRicConfig.builder().name(name).baseUrl("baseUrl").managedElementIds(mes).build(); + RicConfig conf = ImmutableRicConfig.builder() // + .name(ricName) // + .baseUrl(ricName) // + .managedElementIds(mes) // + .build(); Ric ric = new Ric(conf); this.rics.put(ric); return ric; @@ -172,7 +236,7 @@ public class ApplicationTest { .json("{}") // .ownerServiceName(service) // .ric(rics.getRic(ric)) // - .type(addPolicyType(typeName)) // + .type(addPolicyType(typeName, ric)) // .lastModified("lastModified").build(); policies.put(p); return p; @@ -205,7 +269,8 @@ public class ApplicationTest { public void testDeletePolicy() throws Exception { reset(); String url = baseUrl() + "/policy?instance=id"; - addPolicy("id", "typeName", "service1", "ric1"); + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); + policy.ric().setState(Ric.RicState.IDLE); assertThat(policies.size()).isEqualTo(1); this.restTemplate.delete(url); @@ -213,28 +278,63 @@ public class ApplicationTest { assertThat(policies.size()).isEqualTo(0); } - public static List parseList(String json, Class clazz) { + private static List parseList(String json, Class clazz) { if (null == json) { return null; } return gson.fromJson(json, new TypeToken() {}.getType()); + } @Test - public void testGetPolicyTypes() throws Exception { - String url = baseUrl() + "/policy_types"; + public void testGetPolicySchemas() throws Exception { reset(); - addPolicy("id1", "type1", "service1"); - addPolicy("id2", "type2", "service2"); + addPolicyType("type1", "ric1"); + addPolicyType("type2", "ric2"); + String url = baseUrl() + "/policy_schemas"; String rsp = this.restTemplate.getForObject(url, String.class); - System.out.println(rsp); + System.out.println("*** " + rsp); assertThat(rsp).contains("type1"); assertThat(rsp).contains("type2"); + assertThat(rsp).contains("title"); + + List info = parseList(rsp, String.class); + assertEquals(2, info.size()); + + url = baseUrl() + "/policy_schemas?ric=ric1"; + rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp).contains("type1"); + info = parseList(rsp, String.class); + assertEquals(1, info.size()); + } - List info = parseList(rsp, PolicyTypeInfo.class); - System.out.println(info.size()); + @Test + public void testGetPolicySchema() throws Exception { + reset(); + addPolicyType("type1", "ric1"); + addPolicyType("type2", "ric2"); + + String url = baseUrl() + "/policy_schema?id=type1"; + String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println(rsp); + assertThat(rsp).contains("type1"); + assertThat(rsp).contains("title"); + } + @Test + public void testGetPolicyTypes() throws Exception { + reset(); + addPolicyType("type1", "ric1"); + addPolicyType("type2", "ric2"); + + String url = baseUrl() + "/policy_types"; + String rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp).isEqualTo("[\"type2\",\"type1\"]"); + + url = baseUrl() + "/policy_types?ric=ric1"; + rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp).isEqualTo("[\"type1\"]"); } @Test @@ -274,6 +374,7 @@ public class ApplicationTest { ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() // .keepAliveInterval(1) // .name(name) // + .callbackUrl("callbackUrl") // .build(); String json = gson.toJson(service); return json;