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=b3e2c983ab87c1e7f361c531f576a5ecfe089eb2;hpb=dfbd081159b02601a48162a647848223a9303ebf;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 b3e2c983..365d418a 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -21,6 +21,7 @@ package org.oransc.policyagent; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.Assert.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import com.google.gson.Gson; @@ -28,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; @@ -55,15 +57,19 @@ 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.junit.jupiter.SpringExtension; import org.springframework.web.client.RestTemplate; +import reactor.core.publisher.Mono; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ApplicationTest { + @Autowired + ApplicationContext context; @Autowired private Rics rics; @@ -86,16 +92,82 @@ 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() { + return this.rics; + } } @LocalServerPort @@ -112,31 +184,39 @@ 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 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.ACTIVE); this.restTemplate.put(url, json); - Policy policy = policies.get("instance1"); + Policy policy = policies.getPolicy("instance1"); assertThat(policy).isNotNull(); assertThat(policy.id()).isEqualTo("instance1"); @@ -147,19 +227,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("baseUrl") // + .managedElementIds(mes) // + .build(); Ric ric = new Ric(conf); this.rics.put(ric); return ric; @@ -171,7 +259,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; @@ -204,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); @@ -217,23 +306,58 @@ public class ApplicationTest { return null; } return gson.fromJson(json, new TypeToken() {}.getType()); + } @Test - public void testGetPolicyTypes() throws Exception { + public void testGetPolicySchemas() throws Exception { reset(); - addPolicy("id1", "type1", "service1"); - addPolicy("id2", "type2", "service2"); + 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); + 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"); - List info = parseList(rsp, PolicyTypeInfo.class); - System.out.println(info.size()); + 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