X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=d78155d4481160ff9d64582ffe2f0cd97218ea8e;hb=cc53bb179ee61d77290c3831fc75dc5f3e972aac;hp=0d00daa4069bd91c57e86528e9e0d37a0f6b5ade;hpb=3e827b5c2bc00500577af25e9cb559b6243e1abd;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 0d00daa4..d78155d4 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -34,12 +34,12 @@ 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.PolicyTypeInfo; import org.oransc.policyagent.controllers.ServiceRegistrationInfo; import org.oransc.policyagent.controllers.ServiceStatus; import org.oransc.policyagent.exceptions.ServiceException; @@ -51,6 +51,7 @@ 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.utils.MockA1Client; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -84,9 +85,9 @@ public class ApplicationTest { public static class MockApplicationConfig extends ApplicationConfig { @Override - public void initialize() { + protected String getLocalConfigurationFilePath() { URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); - loadConfigurationFromFile(url.getFile()); + return url.getFile(); } } @@ -95,20 +96,33 @@ 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 public ApplicationConfig getApplicationConfig() { return new MockApplicationConfig(); } + @Bean + A1Client getA1Client() { + return new MockA1Client(this.policyTypes); + } + + @Bean + public Policies getPolicies() { + return this.policies; + } + + @Bean + public PolicyTypes getPolicyTypes() { + return this.policyTypes; + } + @Bean public Rics getRics() { - Rics rics = new Rics(); - rics.put(new Ric(ImmutableRicConfig.builder().name("kista_1").baseUrl("kista_url") - .managedElementIds(new Vector<>()).build())); - rics.put(new Ric(ImmutableRicConfig.builder().name("ric1").baseUrl("ric_url") - .managedElementIds(new Vector<>()).build())); - return rics; + return this.rics; } } @@ -126,6 +140,8 @@ 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); @@ -138,13 +154,13 @@ public class ApplicationTest { @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"); @@ -152,6 +168,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.IDLE); this.restTemplate.put(url, json); @@ -169,6 +186,7 @@ public class ApplicationTest { private PolicyType addPolicyType(String policyTypeName, String ricName) { PolicyType type = ImmutablePolicyType.builder() // .name(policyTypeName) // + .schema("{\"title\":\"" + policyTypeName + "\"}") // .build(); policyTypes.put(type); @@ -181,7 +199,11 @@ public class ApplicationTest { return rics.get(ricName); } Vector mes = new Vector<>(); - RicConfig conf = ImmutableRicConfig.builder().name(ricName).baseUrl("baseUrl").managedElementIds(mes).build(); + RicConfig conf = ImmutableRicConfig.builder() // + .name(ricName) // + .baseUrl("baseUrl") // + .managedElementIds(mes) // + .build(); Ric ric = new Ric(conf); this.rics.put(ric); return ric; @@ -226,7 +248,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); @@ -243,26 +266,56 @@ public class ApplicationTest { } @Test - public void testGetPolicyTypes() throws Exception { + public void testGetPolicySchemas() throws Exception { reset(); addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); - String url = baseUrl() + "/policy_types"; + 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, PolicyTypeInfo.class); + List info = parseList(rsp, String.class); assertEquals(2, info.size()); - url = baseUrl() + "/policy_types?ric=ric1"; + url = baseUrl() + "/policy_schemas?ric=ric1"; rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).contains("type1"); - info = parseList(rsp, PolicyTypeInfo.class); + 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"; @@ -300,6 +353,7 @@ public class ApplicationTest { ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() // .keepAliveInterval(1) // .name(name) // + .callbackUrl("callbackUrl") // .build(); String json = gson.toJson(service); return json;