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=9d45f058c463cad86dc7bd84f52f2a90ccb6cdec;hb=b66dcce5210e25b2571036becb6f0e7b0c23e1b2;hp=8bcd99aaeaef38e31cd98d6a931959dbc7bcc1fc;hpb=3b5213d7ef998e3f76d58a767230013be0a7927f;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 8bcd99aa..9d45f058 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -21,15 +21,25 @@ package org.oransc.policyagent; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.Assert.assertFalse; - -import java.net.URL; +import static org.awaitility.Awaitility.await; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; import java.util.Vector; -import org.junit.Test; -import org.junit.runner.RunWith; +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.PolicyInfo; +import org.oransc.policyagent.controllers.ServiceRegistrationInfo; +import org.oransc.policyagent.controllers.ServiceStatus; import org.oransc.policyagent.exceptions.ServiceException; import org.oransc.policyagent.repository.ImmutablePolicy; import org.oransc.policyagent.repository.ImmutablePolicyType; @@ -38,38 +48,80 @@ 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; 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.test.context.junit4.SpringRunner; +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; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ApplicationTest { + @Autowired + ApplicationContext context; + + @Autowired + private Rics rics; + + @Autowired + private Policies policies; + + @Autowired + private PolicyTypes policyTypes; + + @Autowired + MockA1ClientFactory a1ClientFactory; + + @Autowired + RepositorySupervision supervision; @Autowired - private Beans beans; + Services services; - static class MockApplicationConfig extends ApplicationConfig { + 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()); + public String getLocalConfigurationFilePath() { + return ""; // No config file loaded for the test } } + /** + * Overrides the BeanFactory. + */ @TestConfiguration - static class Beans { + static class TestBeanFactory { + private final PolicyTypes policyTypes = new PolicyTypes(); + @Bean - public Rics getRics() { - return new Rics(); + public ApplicationConfig getApplicationConfig() { + return new MockApplicationConfig(); + } + + @Bean + MockA1ClientFactory getA1ClientFactory() { + return new MockA1ClientFactory(this.policyTypes); } @Bean @@ -79,134 +131,416 @@ public class ApplicationTest { @Bean public PolicyTypes getPolicyTypes() { - return new PolicyTypes(); + return this.policyTypes; } @Bean - public ApplicationConfig getApplicationConfig() { - return new MockApplicationConfig(); + public Rics getRics() { + return new Rics(); } } @LocalServerPort private int port; - private RestTemplate restTemplate = new RestTemplate(); + 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()); + } + } @Test - public void getRics() throws Exception { - String cmd = "/rics"; - String rsp = this.restTemplate.getForObject("http://localhost:" + port + cmd, String.class); + 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=STD_PolicyModelUnconstrained_0.2.0"; + rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp).isEqualTo("[]"); } @Test - public void getRic() throws Exception { - String cmd = "/ric?managedElementId=kista_1"; - String rsp = this.restTemplate.getForObject("http://localhost:" + port + cmd, String.class); - assertThat(rsp).isEqualTo("ric1"); + public void testRecovery() throws Exception { + reset(); + String ricName = "ric"; + Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); + + getA1Client(ricName).putPolicy(policy2); // put it in the RIC + policies.remove(policy2); // Remove it from the repo -> should be deleted in the RIC + + String policyId = "policyId"; + Policy policy = addPolicy(policyId, "typeName", "service", ricName); // This should be created in the RIC + supervision.checkAllRics(); // The created policy should be put in the RIC + await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ricName).getState())); + await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic(ricName).getState())); + + Policies ricPolicies = getA1Client(ricName).getPolicies(); + assertThat(ricPolicies.size()).isEqualTo(1); + Policy ricPolicy = ricPolicies.get(policyId); + assertThat(ricPolicy.json()).isEqualTo(policy.json()); } - // managedElmentId -> nodeName - @Test - public void putPolicy() throws Exception { - String url = "http://localhost:" + port + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; - String json = "{}"; - addPolicyType("type1"); - addRic(beans.getRics(), "ric1", url); + public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception { + reset(); + addRic("notCorrectRic1"); + addRic("notCorrectRic2"); + addRic("notCorrectRic3"); + addRic("notCorrectRic4"); + addRic("notCorrectRic5"); + addRic("notCorrectRic6"); + + String ricName = "ric1"; + Ric ric = addRic(ricName); + String managedElementId = "kista_1"; + ric.addManagedElement(managedElementId); + + String url = baseUrl() + "/ric?managedElementId=" + managedElementId; + String rsp = this.restTemplate.getForObject(url, String.class); - this.restTemplate.put(url, json); + assertThat(rsp).isEqualTo(ricName); + } - Policy policy = beans.getPolicies().get("instance1"); + @Test + public void testGetRicForManagedElementThatDoesNotExist_thenReturnEmpty() throws Exception { + reset(); + addRic("notCorrectRic1"); + addRic("notCorrectRic2"); + addRic("notCorrectRic3"); + addRic("notCorrectRic4"); + addRic("notCorrectRic5"); + addRic("notCorrectRic6"); + + String url = baseUrl() + "/ric?managedElementId=kista_1"; + String rsp = this.restTemplate.getForObject(url, String.class); - assertThat(policy).isNotNull(); - assertThat(policy.id()).isEqualTo("instance1"); - assertThat(policy.ownerServiceName()).isEqualTo("service1"); + assertThat(rsp).isNull(); } - private void addRic(Rics rics, String ric, String url) { - Vector nodeNames = new Vector<>(1); - nodeNames.add("node1"); - RicConfig ricConfig = ImmutableRicConfig.builder() // - .name(ric) // - .baseUrl(url) // - .managedElementIds(nodeNames) // - .build(); - Ric ricObj = new Ric(ricConfig); + @Test + public void testPutPolicy() throws Exception { + reset(); + String serviceName = "service1"; + String ricName = "ric1"; + String policyTypeName = "type1"; + String policyInstanceId = "instance1"; - rics.put(ricObj); - } + putService(serviceName); + addPolicyType(policyTypeName, ricName); - private PolicyType addPolicyType(String name) { - PolicyType type = ImmutablePolicyType.builder() // - .jsonSchema("") // - .name(name) // - .build(); + String url = baseUrl() + "/policy?type=" + policyTypeName + "&instance=" + policyInstanceId + "&ric=" + ricName + + "&service=" + serviceName; + final String json = jsonString(); + this.rics.getRic(ricName).setState(Ric.RicState.IDLE); + + this.restTemplate.put(url, createJsonHttpEntity(json)); + + Policy policy = policies.getPolicy(policyInstanceId); + assertThat(policy).isNotNull(); + assertThat(policy.id()).isEqualTo(policyInstanceId); + assertThat(policy.ownerServiceName()).isEqualTo(serviceName); + assertThat(policy.ric().name()).isEqualTo("ric1"); + + url = baseUrl() + "/policies"; + String rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp.contains(policyInstanceId)).isTrue(); - beans.getPolicyTypes().put(type); - return type; } - private Policy addPolicy(String id, String typeName, String service) throws ServiceException { - Policy p = ImmutablePolicy.builder().id(id) // - .json("{}") // - .ownerServiceName(service) // - .ric(beans.getRics().getRic("ric1")) // - .type(addPolicyType(typeName)) // - .build(); - beans.getPolicies().put(p); - return p; + @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 } @Test - public void getPolicy() throws Exception { - String url = "http://localhost:" + port + "/policy?instance=id"; - Policy policy = addPolicy("id", "typeName", "service1"); + public void testGetPolicy() throws Exception { + String url = baseUrl() + "/policy?instance=id"; + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); { String rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).isEqualTo(policy.json()); } { - beans.getPolicies().remove(policy); + policies.remove(policy); ResponseEntity rsp = this.restTemplate.getForEntity(url, String.class); assertThat(rsp.getStatusCodeValue()).isEqualTo(HttpStatus.NO_CONTENT.value()); } } @Test - public void getPolicies() throws Exception { - String url = "http://localhost:" + port + "/policies"; - addRic(beans.getRics(), "ric1", url); + public void testDeletePolicy() throws Exception { + reset(); + String url = baseUrl() + "/policy?instance=id"; + Policy policy = addPolicy("id", "typeName", "service1", "ric1"); + policy.ric().setState(Ric.RicState.IDLE); + assertThat(policies.size()).isEqualTo(1); + + this.restTemplate.delete(url); + + assertThat(policies.size()).isEqualTo(0); + } + + @Test + public void testGetPolicySchemas() throws Exception { + reset(); + addPolicyType("type1", "ric1"); + addPolicyType("type2", "ric2"); + + String url = baseUrl() + "/policy_schemas"; + String rsp = this.restTemplate.getForObject(url, String.class); + System.out.println("*** " + rsp); + assertThat(rsp).contains("type1"); + assertThat(rsp).contains("[{\"title\":\"type2\"}"); + + List info = parseSchemas(rsp); + assertThat(info.size()).isEqualTo(2); + + url = baseUrl() + "/policy_schemas?ric=ric1"; + rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp).contains("type1"); + info = parseSchemas(rsp); + assertThat(info.size()).isEqualTo(1); + } + + @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 { + reset(); + 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 - public void getPoliciesFilter() throws Exception { + public void testGetPoliciesFilter() throws Exception { addPolicy("id1", "type1", "service1"); addPolicy("id2", "type1", "service2"); addPolicy("id3", "type2", "service1"); - String url = "http://localhost:" + port + "/policies?type=type1"; + String url = baseUrl() + "/policies?type=type1"; String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); assertThat(rsp).contains("id1"); assertThat(rsp).contains("id2"); - assertFalse(rsp.contains("id3")); + assertThat(rsp.contains("id3")).isFalse(); - url = "http://localhost:" + port + "/policies?type=type1&service=service2"; + url = baseUrl() + "/policies?type=type1&service=service2"; rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); - assertFalse(rsp.contains("id1")); + assertThat(rsp.contains("id1")).isFalse(); assertThat(rsp).contains("id2"); - assertFalse(rsp.contains("id3")); + assertThat(rsp.contains("id3")).isFalse(); + } + + @Test + public void testPutAndGetService() throws Exception { + reset(); + // PUT + putService("name"); + + // GET + String url = baseUrl() + "/services?serviceName=name"; + String rsp = this.restTemplate.getForObject(url, String.class); + List info = parseList(rsp, ServiceStatus.class); + assertThat(info.size()).isEqualTo(1); + ServiceStatus status = info.iterator().next(); + assertThat(status.keepAliveIntervalSeconds).isEqualTo(1); + assertThat(status.serviceName).isEqualTo("name"); + + // GET (all) + url = baseUrl() + "/services"; + rsp = this.restTemplate.getForObject(url, String.class); + assertThat(rsp.contains("name")).isTrue(); + System.out.println(rsp); + + // Keep alive + url = baseUrl() + "/services/keepalive?serviceName=name"; + rsp = this.restTemplate.postForObject(url, null, String.class); + assertThat(rsp.contains("OK")).isTrue(); + + // DELETE + assertThat(services.size()).isEqualTo(1); + url = baseUrl() + "/services?serviceName=name"; + this.restTemplate.delete(url); + assertThat(services.size()).isEqualTo(0); + + // Keep alive, no registerred service + url = baseUrl() + "/services/keepalive?serviceName=nameXXX"; + ResponseEntity entity = this.restTemplate.postForEntity(url, null, String.class); + assertThat(entity.getStatusCode()).isEqualTo(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")).isTrue(); + } + + private PolicyType addPolicyType(String policyTypeName, String ricName) { + PolicyType type = ImmutablePolicyType.builder() // + .name(policyTypeName) // + .schema("{\"title\":\"" + policyTypeName + "\"}") // + .build(); + policyTypes.put(type); + addRic(ricName).addSupportedPolicyType(type); + return type; + } + + private Ric addRic(String ricName) { + if (rics.get(ricName) != null) { + return rics.get(ricName); + } + Vector mes = new Vector<>(); + RicConfig conf = ImmutableRicConfig.builder() // + .name(ricName) // + .baseUrl(ricName) // + .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(jsonString()) // + .ownerServiceName(service) // + .ric(rics.getRic(ric)) // + .type(addPolicyType(typeName, ric)) // + .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 createServiceJson(String name) { + ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, 1, "callbackUrl"); + + String json = gson.toJson(service); + return json; + } + + private void putService(String name) { + String url = baseUrl() + "/service"; + HttpEntity entity = createJsonHttpEntity(createServiceJson(name)); + this.restTemplate.put(url, entity); + } + + private String baseUrl() { + return "http://localhost:" + port; + } + + private void reset() { + rics.clear(); + policies.clear(); + policyTypes.clear(); + services.clear(); + assertThat(policies.size()).isEqualTo(0); + restTemplate.setErrorHandler(new RestTemplateResponseErrorHandler()); + } + + private String jsonString() { + return "{\n \"servingCellNrcgi\": \"1\"\n }"; + } + + private MockA1Client getA1Client(String ricName) throws ServiceException { + return a1ClientFactory.getOrCreateA1Client(ricName); + } + + private HttpEntity createJsonHttpEntity(String content) { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + return new HttpEntity(content, headers); + } + + 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; } }