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=084ab582af603491e0139979c99aa707628f57d7;hb=cd9e9862fa9a5898f3595b397686861749f72953;hp=3b98ef561c20aa2c92a20d1d8f4008e66b34a8c7;hpb=7adad623a64bfbb96b3c73ed7c1d0d49aabff659;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 3b98ef56..084ab582 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -17,21 +17,26 @@ * 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.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.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; @@ -41,6 +46,7 @@ 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.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; @@ -50,10 +56,10 @@ import org.springframework.boot.web.server.LocalServerPort; 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 { @@ -70,7 +76,7 @@ public class ApplicationTest { .serializeNulls() // .create(); // - static class MockApplicationConfig extends ApplicationConfig { + public static class MockApplicationConfig extends ApplicationConfig { @Override public void initialize() { URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); @@ -79,32 +85,44 @@ public class ApplicationTest { } /** - * overrides the BeanFactory + * Overrides the BeanFactory. */ @TestConfiguration - static class BeanFactory { + static class TestBeanFactory { @Bean public ApplicationConfig getApplicationConfig() { return new MockApplicationConfig(); } - } @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 { + public void testGetRics() throws Exception { 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); + // TODO this should test that the correct types are retrieved from the RIC + assertThat(rsp).isEqualTo("[]"); } @Test - public void getRic() throws Exception { + public void testGetRic() throws Exception { String url = baseUrl() + "/ric?managedElementId=kista_1"; String rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).isEqualTo("ric1"); @@ -113,7 +131,7 @@ public class ApplicationTest { // managedElmentId -> nodeName @Test - public void putPolicy() throws Exception { + public void testPutPolicy() throws Exception { putService("service1"); String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; @@ -127,6 +145,10 @@ public class ApplicationTest { 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) { @@ -139,25 +161,38 @@ public class ApplicationTest { return type; } - private Policy addPolicy(String id, String typeName, String service) throws ServiceException { + private Ric addRic(String name) { + Vector mes = new Vector<>(); + RicConfig conf = ImmutableRicConfig.builder().name(name).baseUrl("baseUrl").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(rics.getRic("ric1")) // + .ric(rics.getRic(ric)) // .type(addPolicyType(typeName)) // - .build(); + .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 { + public void testGetPolicy() throws Exception { String url = baseUrl() + "/policy?instance=id"; - Policy policy = addPolicy("id", "typeName", "service1"); + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); { String rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).isEqualTo(policy.json()); @@ -170,7 +205,43 @@ public class ApplicationTest { } @Test - public void getPolicies() throws Exception { + public void testDeletePolicy() throws Exception { + reset(); + String url = baseUrl() + "/policy?instance=id"; + addPolicy("id", "typeName", "service1", "ric1"); + 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 testGetPolicyTypes() throws Exception { + reset(); + addPolicy("id1", "type1", "service1"); + addPolicy("id2", "type2", "service2"); + + String url = baseUrl() + "/policy_types"; + String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println(rsp); + assertThat(rsp).contains("type1"); + assertThat(rsp).contains("type2"); + + List info = parseList(rsp, PolicyTypeInfo.class); + System.out.println(info.size()); + + } + + @Test + public void testGetPolicies() throws Exception { String url = baseUrl() + "/policies"; addPolicy("id1", "type1", "service1"); addPolicy("id2", "type2", "service2"); @@ -182,7 +253,7 @@ 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"); @@ -202,19 +273,22 @@ public class ApplicationTest { assertFalse(rsp.contains("id3")); } - private void putService(String name) { - String url = baseUrl() + "/service"; - + private String createServiceJson(String name) { ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() // .keepAliveInterval(1) // .name(name) // .build(); String json = gson.toJson(service); - this.restTemplate.put(url, json); + return json; + } + + private void putService(String name) { + String url = baseUrl() + "/service"; + this.restTemplate.put(url, createServiceJson(name)); } @Test - public void putAndGetService() throws Exception { + public void testPutAndGetService() throws Exception { putService("name"); String url = baseUrl() + "/service?name=name";