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=fc4030f50b3d150e91703c8ed0497b766dcd8ef8;hb=8936c783ff4f362fbc9b96b658b5defb0701da54;hp=365d418a5560bbf9e412ed4a4a9cff0cc171160f;hpb=637540bc28fbf337e0c4c58c051a6b4f7ceb321d;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 365d418a..fc4030f5 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -21,26 +21,27 @@ package org.oransc.policyagent; import static org.assertj.core.api.Assertions.assertThat; +import static org.awaitility.Awaitility.await; 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 com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; -import java.net.URL; -import java.util.Collection; +import java.io.IOException; +import java.util.ArrayList; 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.PolicyInfo; import org.oransc.policyagent.controllers.ServiceRegistrationInfo; import org.oransc.policyagent.controllers.ServiceStatus; import org.oransc.policyagent.exceptions.ServiceException; @@ -51,7 +52,12 @@ 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.Ric.RicState; import org.oransc.policyagent.repository.Rics; +import org.oransc.policyagent.repository.Services; +import org.oransc.policyagent.tasks.RepositorySupervision; +import org.oransc.policyagent.utils.MockA1Client; +import org.oransc.policyagent.utils.MockA1ClientFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -59,11 +65,16 @@ 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.HttpEntity; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatus.Series; +import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; +import org.springframework.http.client.ClientHttpResponse; import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; -import reactor.core.publisher.Mono; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @@ -80,58 +91,23 @@ public class ApplicationTest { @Autowired private PolicyTypes policyTypes; + @Autowired + MockA1ClientFactory a1ClientFactory; + + @Autowired + RepositorySupervision supervision; + + @Autowired + Services services; + private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // public static class MockApplicationConfig extends ApplicationConfig { @Override - public void initialize() { - URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); - loadConfigurationFromFile(url.getFile()); - } - } - - 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 + public String getLocalConfigurationFilePath() { + return ""; // No config file loaded for the test } } @@ -140,8 +116,6 @@ 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 @@ -150,13 +124,13 @@ public class ApplicationTest { } @Bean - A1Client getA1Client() { - return new A1ClientMock(this.policies, this.policyTypes); + MockA1ClientFactory getA1ClientFactory() { + return new MockA1ClientFactory(this.policyTypes); } @Bean public Policies getPolicies() { - return this.policies; + return new Policies(); } @Bean @@ -166,7 +140,7 @@ public class ApplicationTest { @Bean public Rics getRics() { - return this.rics; + return new Rics(); } } @@ -175,11 +149,26 @@ public class ApplicationTest { private final RestTemplate restTemplate = new RestTemplate(); + public class RestTemplateResponseErrorHandler implements ResponseErrorHandler { + + @Override + public boolean hasError(ClientHttpResponse httpResponse) throws IOException { + return (httpResponse.getStatusCode().series() == Series.CLIENT_ERROR + || httpResponse.getStatusCode().series() == Series.SERVER_ERROR); + } + + @Override + public void handleError(ClientHttpResponse httpResponse) throws IOException { + System.out.println("Error " + httpResponse.toString()); + } + } + private void reset() { rics.clear(); policies.clear(); policyTypes.clear(); assertThat(policies.size()).isEqualTo(0); + restTemplate.setErrorHandler(new RestTemplateResponseErrorHandler()); } @Test @@ -191,15 +180,41 @@ public class ApplicationTest { System.out.println(rsp); assertThat(rsp).contains("kista_1"); - url = baseUrl() + "/rics?policyType=ANR"; + url = baseUrl() + "/rics?policyType=STD_PolicyModelUnconstrained_0.2.0"; rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).isEqualTo("[]"); } + @Test + public void testRecovery() throws Exception { + reset(); + Policy policy2 = addPolicy("policyId2", "typeName", "service", "ric"); + + getA1Client("ric").putPolicy(policy2); // put it in the RIC + policies.remove(policy2); // Remove it from the repo -> should be deleted in the RIC + + Policy policy = addPolicy("policyId", "typeName", "service", "ric"); // This should be created in the RIC + supervision.checkAllRics(); // The created policy should be put in the RIC + await().untilAsserted(() -> RicState.RECOVERING.equals(rics.getRic("ric").getState())); + await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic("ric").getState())); + + Policies ricPolicies = getA1Client("ric").getPolicies(); + assertThat(ricPolicies.size()).isEqualTo(1); + Policy ricPolicy = ricPolicies.get("policyId"); + assertThat(ricPolicy.json()).isEqualTo(policy.json()); + } + + MockA1Client getA1Client(String ricName) throws ServiceException { + return a1ClientFactory.getOrCreateA1Client(ricName); + } + @Test public void testGetRic() throws Exception { reset(); + Ric ric = addRic("ric1"); + ric.addManagedElement("kista_1"); String url = baseUrl() + "/ric?managedElementId=kista_1"; + String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); assertThat(rsp).isEqualTo("ric1"); @@ -207,24 +222,40 @@ public class ApplicationTest { @Test public void testPutPolicy() throws Exception { + reset(); putService("service1"); - - String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; - String json = "{}"; + this.addRic("ric1").setState(Ric.RicState.IDLE); addPolicyType("type1", "ric1"); - this.rics.getRic("ric1").setState(Ric.RicState.ACTIVE); - - this.restTemplate.put(url, json); + final String json = jsonString(); + String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; + this.restTemplate.put(url, createJsonHttpEntity(json)); Policy policy = policies.getPolicy("instance1"); assertThat(policy).isNotNull(); assertThat(policy.id()).isEqualTo("instance1"); assertThat(policy.ownerServiceName()).isEqualTo("service1"); + assertThat(policy.ric().name()).isEqualTo("ric1"); url = baseUrl() + "/policies"; String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); + + } + + @Test + public void testRefuseToUpdatePolicy() throws Exception { + // Test that only the json can be changed for a already created policy + // In this case service is attempted to be changed + reset(); + this.addRic("ric1").setState(Ric.RicState.IDLE); + this.addRic("ricXXX").setState(Ric.RicState.IDLE); + + this.addPolicy("instance1", "type1", "service1", "ric1"); + String urlWrongRic = baseUrl() + "/policy?type=type1&instance=instance1&ric=ricXXX&service=service1"; + this.restTemplate.put(urlWrongRic, createJsonHttpEntity(jsonString())); + Policy policy = policies.getPolicy("instance1"); + assertThat(policy.ric().name()).isEqualTo("ric1"); // Not changed } private PolicyType addPolicyType(String policyTypeName, String ricName) { @@ -245,7 +276,7 @@ public class ApplicationTest { Vector mes = new Vector<>(); RicConfig conf = ImmutableRicConfig.builder() // .name(ricName) // - .baseUrl("baseUrl") // + .baseUrl(ricName) // .managedElementIds(mes) // .build(); Ric ric = new Ric(conf); @@ -253,10 +284,33 @@ public class ApplicationTest { return ric; } + private String createServiceJson(String name) { + ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, 1, "callbackUrl"); + + String json = gson.toJson(service); + return json; + } + + HttpEntity createJsonHttpEntity(String content) { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + return new HttpEntity(content, headers); + } + + private void putService(String name) { + String url = baseUrl() + "/service"; + HttpEntity entity = createJsonHttpEntity(createServiceJson(name)); + this.restTemplate.put(url, entity); + } + + private String jsonString() { + return "{\n \"servingCellNrcgi\": \"1\"\n }"; + } + private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException { addRic(ric); Policy p = ImmutablePolicy.builder().id(id) // - .json("{}") // + .json(jsonString()) // .ownerServiceName(service) // .ric(rics.getRic(ric)) // .type(addPolicyType(typeName, ric)) // @@ -293,7 +347,7 @@ public class ApplicationTest { reset(); String url = baseUrl() + "/policy?instance=id"; Policy policy = addPolicy("id", "typeName", "service1", "ric1"); - policy.ric().setState(Ric.RicState.ACTIVE); + policy.ric().setState(Ric.RicState.IDLE); assertThat(policies.size()).isEqualTo(1); this.restTemplate.delete(url); @@ -301,14 +355,6 @@ public class ApplicationTest { 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(); @@ -319,16 +365,15 @@ public class ApplicationTest { String rsp = this.restTemplate.getForObject(url, String.class); System.out.println("*** " + rsp); assertThat(rsp).contains("type1"); - assertThat(rsp).contains("type2"); - assertThat(rsp).contains("title"); + assertThat(rsp).contains("[{\"title\":\"type2\"}"); - List info = parseList(rsp, String.class); + List info = parseSchemas(rsp); 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); + info = parseSchemas(rsp); assertEquals(1, info.size()); } @@ -364,12 +409,16 @@ public class ApplicationTest { public void testGetPolicies() throws Exception { String url = baseUrl() + "/policies"; addPolicy("id1", "type1", "service1"); - addPolicy("id2", "type2", "service2"); String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); - assertThat(rsp).contains("id1"); - assertThat(rsp).contains("id2"); + List info = parseList(rsp, PolicyInfo.class); + assertThat(info).size().isEqualTo(1); + PolicyInfo policyInfo = info.get(0); + assert (policyInfo.validate()); + assertThat(policyInfo.id).isEqualTo("id1"); + assertThat(policyInfo.type).isEqualTo("type1"); + assertThat(policyInfo.service).isEqualTo("service1"); } @Test @@ -393,37 +442,73 @@ public class ApplicationTest { assertFalse(rsp.contains("id3")); } - private String createServiceJson(String name) { - ServiceRegistrationInfo service = ImmutableServiceRegistrationInfo.builder() // - .keepAliveInterval(1) // - .name(name) // - .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 { + reset(); + // PUT putService("name"); - String url = baseUrl() + "/service?name=name"; + // GET + String url = baseUrl() + "/services?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")); + List info = parseList(rsp, ServiceStatus.class); + assertThat(info.size() == 1); + ServiceStatus status = info.iterator().next(); + assertThat(status.keepAliveIntervalSeconds == 1); + assertThat(status.serviceName.equals("name")); + // GET (all) 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"); + // Keep alive + url = baseUrl() + "/services/keepalive?name=name"; + rsp = this.restTemplate.postForObject(url, null, String.class); + assertThat(rsp.contains("OK")); + + // DELETE + assertThat(services.size() == 1); + url = baseUrl() + "/services?name=name"; + this.restTemplate.delete(url); + assertThat(services.size() == 0); + + // Keep alive, no registerred service + url = baseUrl() + "/services/keepalive?name=nameXXX"; + ResponseEntity entity = this.restTemplate.postForEntity(url, null, String.class); + assertThat(entity.getStatusCode().equals(HttpStatus.NOT_FOUND)); + } + + @Test + public void testGetPolicyStatus() throws Exception { + reset(); + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); + policy.ric().setState(Ric.RicState.IDLE); + assertThat(policies.size()).isEqualTo(1); + + String url = baseUrl() + "/policy_status?instance=id"; + String rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp.equals("OK")); + } + + private static List parseList(String jsonString, Class clazz) { + List result = new ArrayList<>(); + JsonArray jsonArr = JsonParser.parseString(jsonString).getAsJsonArray(); + for (JsonElement jsonElement : jsonArr) { + T o = gson.fromJson(jsonElement.toString(), clazz); + result.add(o); + } + return result; + } + + private static List parseSchemas(String jsonString) { + JsonArray arrayOfSchema = JsonParser.parseString(jsonString).getAsJsonArray(); + List result = new ArrayList<>(); + for (JsonElement schemaObject : arrayOfSchema) { + result.add(schemaObject.toString()); + } + return result; } }