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=365d418a5560bbf9e412ed4a4a9cff0cc171160f;hb=b47a7130c10bef2bf812366ca971e4eaa938b152;hp=0d00daa4069bd91c57e86528e9e0d37a0f6b5ade;hpb=bca519150103ccd308dd492e07744bc494a4a4ec;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..365d418a 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -29,17 +29,18 @@ 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; 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; @@ -62,6 +63,7 @@ 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) @@ -90,25 +92,81 @@ public class ApplicationTest { } } + 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 + } + } + /** * Overrides the BeanFactory. */ @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 A1ClientMock(this.policies, 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 +184,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 +198,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 +212,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.restTemplate.put(url, json); @@ -169,6 +230,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 +243,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 +292,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.ACTIVE); assertThat(policies.size()).isEqualTo(1); this.restTemplate.delete(url); @@ -243,26 +310,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";