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=18ea22bcb34063bf548654c99ed91869bddd2e01;hpb=6fe1880bfac3daa86c05461da80147325f5f47a2;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 18ea22bc..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,14 +17,31 @@ * 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; +import com.google.gson.reflect.TypeToken; + import java.net.URL; -import org.junit.Test; -import org.junit.runner.RunWith; +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; +import org.oransc.policyagent.controllers.ImmutableServiceRegistrationInfo; +import org.oransc.policyagent.controllers.ImmutableServiceStatus; +import org.oransc.policyagent.controllers.ServiceRegistrationInfo; +import org.oransc.policyagent.controllers.ServiceStatus; import org.oransc.policyagent.exceptions.ServiceException; import org.oransc.policyagent.repository.ImmutablePolicy; import org.oransc.policyagent.repository.ImmutablePolicyType; @@ -32,40 +49,70 @@ 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.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 Beans beans; + private Rics rics; - static class MockApplicationConfig extends ApplicationConfig { + @Autowired + private Policies policies; + + @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. + */ @TestConfiguration - static class Beans { + static class TestBeanFactory { + private final PolicyTypes policyTypes = new PolicyTypes(); + @Bean - public Rics getRics() { - return new Rics(); + public ApplicationConfig getApplicationConfig() { + return new MockApplicationConfig(); + } + + @Bean + A1Client getA1Client() { + return new MockA1Client(this.policyTypes); } @Bean @@ -75,90 +122,224 @@ public class ApplicationTest { @Bean public PolicyTypes getPolicyTypes() { - return new PolicyTypes(); + return this.policyTypes; } @Bean - public ApplicationConfig getApplicationConfig() { - return new MockApplicationConfig(); + public Rics getRics() { + return new Rics(); } } @LocalServerPort private int port; - private RestTemplate restTemplate = new RestTemplate(); + private final RestTemplate restTemplate = new RestTemplate(); + + private void reset() { + rics.clear(); + policies.clear(); + policyTypes.clear(); + assertThat(policies.size()).isEqualTo(0); + } @Test - public void getRics() throws Exception { - String cmd = "/rics"; - String rsp = this.restTemplate.getForObject("http://localhost:" + port + cmd, String.class); + 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 getRic() throws Exception { - String cmd = "/ric?managedElementId=kista_1"; - String rsp = this.restTemplate.getForObject("http://localhost:" + port + cmd, String.class); - assertThat(rsp).isEqualTo("ric1"); + 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()); } - // managedElmentId -> nodeName + @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"); + } @Test - public void putPolicy() throws Exception { - String url = "http://localhost:" + port + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; + 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 = beans.getPolicies().get("instance1"); + Policy policy = policies.getPolicy("instance1"); assertThat(policy).isNotNull(); assertThat(policy.id()).isEqualTo("instance1"); assertThat(policy.ownerServiceName()).isEqualTo("service1"); + + url = baseUrl() + "/policies"; + String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println(rsp); } - private PolicyType addPolicyType(String name) { + private PolicyType addPolicyType(String policyTypeName, String ricName) { PolicyType type = ImmutablePolicyType.builder() // - .jsonSchema("") // - .name(name) // - .build(); + .name(policyTypeName) // + .schema("{\"title\":\"" + policyTypeName + "\"}") // + .build(); - beans.getPolicyTypes().put(type); + policyTypes.put(type); + addRic(ricName).addSupportedPolicyType(type); return type; } - private Policy addPolicy(String id, String typeName, String service) throws ServiceException { + private Ric addRic(String ricName) { + if (rics.get(ricName) != null) { + return rics.get(ricName); + } + Vector mes = new Vector<>(); + RicConfig conf = ImmutableRicConfig.builder() // + .name(ricName) // + .baseUrl(ricName) // + .managedElementIds(mes) // + .build(); + Ric ric = new Ric(conf); + this.rics.put(ric); + return ric; + } + + private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException { + addRic(ric); Policy p = ImmutablePolicy.builder().id(id) // - .json("{}") // - .ownerServiceName(service) // - .ric(beans.getRics().getRic("ric1")) // - .type(addPolicyType(typeName)) // - .build(); - beans.getPolicies().put(p); + .json("{}") // + .ownerServiceName(service) // + .ric(rics.getRic(ric)) // + .type(addPolicyType(typeName, ric)) // + .lastModified("lastModified").build(); + policies.put(p); return p; } + private Policy addPolicy(String id, String typeName, String service) throws ServiceException { + return addPolicy(id, typeName, service, "ric"); + } + + private String baseUrl() { + return "http://localhost:" + port; + } + @Test - public void getPolicy() throws Exception { - String url = "http://localhost:" + port + "/policy?instance=id"; - Policy policy = addPolicy("id", "typeName", "service1"); + public void testGetPolicy() throws Exception { + String url = baseUrl() + "/policy?instance=id"; + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); { String rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).isEqualTo(policy.json()); } { - beans.getPolicies().remove(policy); + policies.remove(policy); ResponseEntity rsp = this.restTemplate.getForEntity(url, String.class); assertThat(rsp.getStatusCodeValue()).isEqualTo(HttpStatus.NO_CONTENT.value()); } } @Test - public void getPolicies() throws Exception { - String url = "http://localhost:" + port + "/policies"; + public void testDeletePolicy() throws Exception { + reset(); + String url = baseUrl() + "/policy?instance=id"; + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); + policy.ric().setState(Ric.RicState.IDLE); + assertThat(policies.size()).isEqualTo(1); + + this.restTemplate.delete(url); + + assertThat(policies.size()).isEqualTo(0); + } + + private static List parseList(String json, Class clazz) { + if (null == json) { + return null; + } + return gson.fromJson(json, new TypeToken() {}.getType()); + + } + + @Test + public void testGetPolicySchemas() throws Exception { + reset(); + addPolicyType("type1", "ric1"); + addPolicyType("type2", "ric2"); + + String url = baseUrl() + "/policy_schemas"; + String rsp = this.restTemplate.getForObject(url, String.class); + 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()); + } + + @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 + public void testGetPolicies() throws Exception { + String url = baseUrl() + "/policies"; addPolicy("id1", "type1", "service1"); addPolicy("id2", "type2", "service2"); @@ -169,25 +350,58 @@ public class ApplicationTest { } @Test - public void getPoliciesFilter() throws Exception { + public void testGetPoliciesFilter() throws Exception { addPolicy("id1", "type1", "service1"); addPolicy("id2", "type1", "service2"); addPolicy("id3", "type2", "service1"); - String url = "http://localhost:" + port + "/policies?type=type1"; + String url = baseUrl() + "/policies?type=type1"; String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); assertThat(rsp).contains("id1"); assertThat(rsp).contains("id2"); assertFalse(rsp.contains("id3")); - url = "http://localhost:" + port + "/policies?type=type1&service=service2"; + url = baseUrl() + "/policies?type=type1&service=service2"; rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); assertFalse(rsp.contains("id1")); assertThat(rsp).contains("id2"); assertFalse(rsp.contains("id3")); + } + + private String createServiceJson(String name) { + ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() // + .keepAliveInterval(1) // + .name(name) // + .callbackUrl("callbackUrl") // + .build(); + String json = gson.toJson(service); + return json; + } + + private void putService(String name) { + String url = baseUrl() + "/service"; + this.restTemplate.put(url, createServiceJson(name)); + } + + @Test + public void testPutAndGetService() throws Exception { + putService("name"); + + String url = baseUrl() + "/service?name=name"; + String rsp = this.restTemplate.getForObject(url, String.class); + ServiceStatus status = gson.fromJson(rsp, ImmutableServiceStatus.class); + assertThat(status.keepAliveInterval() == 1); + assertThat(status.name().equals("name")); + + url = baseUrl() + "/services"; + rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp.contains("name")); + System.out.println(rsp); + url = baseUrl() + "/service/ping"; + this.restTemplate.put(url, "name"); } }