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=b7e9a4b26a49aa384c47bc72d336063fbed5d1b6;hb=254eab2d525ad00ac092d6859d21cbab8e42746a;hp=377ca79ea4d76e6ac5178e4650a81971fbd1d5bd;hpb=6a8a0d5350a77b6d1e4a8f95c0fe8fbfeef77339;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 377ca79e..b7e9a4b2 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -22,7 +22,10 @@ package org.oransc.policyagent; import static org.assertj.core.api.Assertions.assertThat; import static org.awaitility.Awaitility.await; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doReturn; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -30,11 +33,11 @@ import com.google.gson.JsonArray; import com.google.gson.JsonElement; import com.google.gson.JsonParser; +import java.nio.charset.StandardCharsets; import java.time.Duration; import java.time.Instant; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.atomic.AtomicInteger; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; @@ -59,9 +62,12 @@ 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.tasks.RicSupervision; +import org.oransc.policyagent.tasks.ServiceSupervision; import org.oransc.policyagent.utils.MockA1Client; import org.oransc.policyagent.utils.MockA1ClientFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -69,21 +75,20 @@ 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.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.test.context.junit.jupiter.SpringExtension; -import org.springframework.web.client.RestTemplate; import org.springframework.web.reactive.function.client.WebClientResponseException; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; +import reactor.util.annotation.Nullable; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public class ApplicationTest { + private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); + @Autowired ApplicationContext context; @@ -100,7 +105,7 @@ public class ApplicationTest { MockA1ClientFactory a1ClientFactory; @Autowired - RepositorySupervision supervision; + RicSupervision supervision; @Autowired Services services; @@ -122,6 +127,9 @@ public class ApplicationTest { @TestConfiguration static class TestBeanFactory { private final PolicyTypes policyTypes = new PolicyTypes(); + private final Services services = new Services(); + private final Policies policies = new Policies(); + MockA1ClientFactory a1ClientFactory = null; @Bean public ApplicationConfig getApplicationConfig() { @@ -130,13 +138,32 @@ public class ApplicationTest { @Bean MockA1ClientFactory getA1ClientFactory() { - return new MockA1ClientFactory(this.policyTypes); + if (a1ClientFactory == null) { + this.a1ClientFactory = new MockA1ClientFactory(this.policyTypes); + } + return this.a1ClientFactory; } @Bean public PolicyTypes getPolicyTypes() { return this.policyTypes; } + + @Bean + Policies getPolicies() { + return this.policies; + } + + @Bean + Services getServices() { + return this.services; + } + + @Bean + public ServiceSupervision getServiceSupervision() { + Duration checkInterval = Duration.ofMillis(1); + return new ServiceSupervision(this.services, this.policies, this.getA1ClientFactory(), checkInterval); + } } @LocalServerPort @@ -148,6 +175,7 @@ public class ApplicationTest { policies.clear(); policyTypes.clear(); services.clear(); + a1ClientFactory.reset(); } @AfterEach @@ -162,11 +190,19 @@ public class ApplicationTest { @Test public void testGetRics() throws Exception { - addRic("kista_1"); - this.addPolicyType("type1", "kista_1"); + addRic("ric1"); + this.addPolicyType("type1", "ric1"); String url = "/rics?policyType=type1"; String rsp = restClient().get(url).block(); - assertThat(rsp).contains("kista_1"); + assertThat(rsp).contains("ric1"); + + // nameless type for ORAN A1 1.1 + addRic("ric2"); + this.addPolicyType("", "ric2"); + url = "/rics?policyType="; + rsp = restClient().get(url).block(); + assertThat(rsp).contains("ric2"); + assertThat(rsp).doesNotContain("ric1"); // Non existing policy type url = "/rics?policyType=XXXX"; @@ -174,7 +210,7 @@ public class ApplicationTest { } @Test - public void testRecovery() throws Exception { + public void testSynchronization() throws Exception { addRic("ric").setState(Ric.RicState.UNDEFINED); String ricName = "ric"; Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); @@ -210,9 +246,12 @@ public class ApplicationTest { } private String putPolicyUrl(String serviceName, String ricName, String policyTypeName, String policyInstanceId) { - String url = "/policy?type=" + policyTypeName + "&instance=" + policyInstanceId + "&ric=" + ricName - + "&service=" + serviceName; - return url; + if (policyTypeName.isEmpty()) { + return "/policy?instance=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; + } else { + return "/policy?instance=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + + policyTypeName; + } } @Test @@ -254,6 +293,61 @@ public class ApplicationTest { this.rics.getRic(ricName).setState(Ric.RicState.IDLE); } + @Test + /** + * Test that HttpStatus and body from failing REST call to A1 is passed on to + * the caller. + * + * @throws ServiceException + */ + public void testErrorFromRIC() throws ServiceException { + putService("service1"); + addPolicyType("type1", "ric1"); + + String url = putPolicyUrl("service1", "ric1", "type1", "id1"); + MockA1Client a1Client = a1ClientFactory.getOrCreateA1Client("ric1"); + HttpStatus httpStatus = HttpStatus.INTERNAL_SERVER_ERROR; + String responseBody = "Refused"; + byte[] responseBodyBytes = responseBody.getBytes(StandardCharsets.UTF_8); + + WebClientResponseException a1Exception = new WebClientResponseException(httpStatus.value(), "statusText", null, + responseBodyBytes, StandardCharsets.UTF_8, null); + doReturn(Mono.error(a1Exception)).when(a1Client).putPolicy(any()); + + // PUT Policy + testErrorCode(restClient().put(url, "{}"), httpStatus, responseBody); + + // DELETE POLICY + this.addPolicy("instance1", "type1", "service1", "ric1"); + doReturn(Mono.error(a1Exception)).when(a1Client).deletePolicy(any()); + testErrorCode(restClient().delete("/policy?instance=instance1"), httpStatus, responseBody); + + // GET STATUS + this.addPolicy("instance1", "type1", "service1", "ric1"); + doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any()); + testErrorCode(restClient().get("/policy_status?instance=instance1"), httpStatus, responseBody); + + // Check that empty response body is OK + a1Exception = new WebClientResponseException(httpStatus.value(), "", null, null, null, null); + doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any()); + testErrorCode(restClient().get("/policy_status?instance=instance1"), httpStatus); + } + + @Test + public void testPutTypelessPolicy() throws Exception { + putService("service1"); + addPolicyType("", "ric1"); + String url = putPolicyUrl("service1", "ric1", "", "id1"); + restClient().put(url, jsonString()).block(); + + String rsp = restClient().get("/policies").block(); + List info = parseList(rsp, PolicyInfo.class); + assertThat(info).size().isEqualTo(1); + PolicyInfo policyInfo = info.get(0); + assertThat(policyInfo.id.equals("id1")).isTrue(); + assertThat(policyInfo.type.equals("")).isTrue(); + } + @Test public void testRefuseToUpdatePolicy() throws Exception { // Test that only the json can be changed for a already created policy @@ -264,7 +358,7 @@ public class ApplicationTest { // Try change ric1 -> ricXXX String urlWrongRic = putPolicyUrl("service1", "ricXXX", "type1", "instance1"); - testErrorCode(restClient().put(urlWrongRic, jsonString()), HttpStatus.METHOD_NOT_ALLOWED); + testErrorCode(restClient().put(urlWrongRic, jsonString()), HttpStatus.CONFLICT); } @Test @@ -327,7 +421,7 @@ public class ApplicationTest { String url = "/policy_schema?id=type1"; String rsp = restClient().get(url).block(); - System.out.println(rsp); + logger.info(rsp); assertThat(rsp).contains("type1"); assertThat(rsp).contains("title"); @@ -356,12 +450,11 @@ public class ApplicationTest { @Test public void testGetPolicies() throws Exception { - reset(); addPolicy("id1", "type1", "service1"); String url = "/policies"; String rsp = restClient().get(url).block(); - System.out.println(rsp); + logger.info(rsp); List info = parseList(rsp, PolicyInfo.class); assertThat(info).size().isEqualTo(1); PolicyInfo policyInfo = info.get(0); @@ -379,14 +472,14 @@ public class ApplicationTest { String url = "/policies?type=type1"; String rsp = restClient().get(url).block(); - System.out.println(rsp); + logger.info(rsp); assertThat(rsp).contains("id1"); assertThat(rsp).contains("id2"); assertThat(rsp.contains("id3")).isFalse(); url = "/policies?type=type1&service=service2"; rsp = restClient().get(url).block(); - System.out.println(rsp); + logger.info(rsp); assertThat(rsp.contains("id1")).isFalse(); assertThat(rsp).contains("id2"); assertThat(rsp.contains("id3")).isFalse(); @@ -400,10 +493,37 @@ public class ApplicationTest { testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); } + @Test + public void testGetPolicyIdsFilter() throws Exception { + addPolicy("id1", "type1", "service1", "ric1"); + addPolicy("id2", "type1", "service2", "ric1"); + addPolicy("id3", "type2", "service1", "ric1"); + + String url = "/policy_ids?type=type1"; + String rsp = restClient().get(url).block(); + logger.info(rsp); + assertThat(rsp).contains("id1"); + assertThat(rsp).contains("id2"); + assertThat(rsp.contains("id3")).isFalse(); + + url = "/policy_ids?type=type1&service=service1&ric=ric1"; + rsp = restClient().get(url).block(); + assertThat(rsp).isEqualTo("[\"id1\"]"); + + // Test get policy ids for non existing type + url = "/policy_ids?type=type1XXX"; + testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); + + // Test get policy ids for non existing RIC + url = "/policy_ids?ric=XXX"; + testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); + } + @Test public void testPutAndGetService() throws Exception { // PUT - putService("name"); + putService("name", 0, HttpStatus.CREATED); + putService("name", 0, HttpStatus.OK); // GET one service String url = "/services?name=name"; @@ -411,14 +531,14 @@ public class ApplicationTest { List info = parseList(rsp, ServiceStatus.class); assertThat(info.size()).isEqualTo(1); ServiceStatus status = info.iterator().next(); - assertThat(status.keepAliveIntervalSeconds).isEqualTo(1); + assertThat(status.keepAliveIntervalSeconds).isEqualTo(0); assertThat(status.serviceName).isEqualTo("name"); // GET (all) url = "/services"; rsp = restClient().get(url).block(); assertThat(rsp.contains("name")).isTrue(); - System.out.println(rsp); + logger.info(rsp); // Keep alive url = "/services/keepalive?name=name"; @@ -435,12 +555,30 @@ public class ApplicationTest { testErrorCode(restClient().post("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); // PUT servive with crap payload - testErrorCode(restClient().put("/service", "junk"), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", "crap"), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", "{}"), HttpStatus.BAD_REQUEST); // GET non existing servive testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND); } + @Test + public void testServiceSupervision() throws Exception { + putService("service1", 1, HttpStatus.CREATED); + addPolicyType("type1", "ric1"); + + String url = putPolicyUrl("service1", "ric1", "type1", "instance1"); + final String policyBody = jsonString(); + restClient().put(url, policyBody).block(); + + assertThat(policies.size()).isEqualTo(1); + assertThat(services.size()).isEqualTo(1); + + // Timeout after ~1 second + await().untilAsserted(() -> assertThat(policies.size()).isEqualTo(0)); + assertThat(services.size()).isEqualTo(0); + } + @Test public void testGetPolicyStatus() throws Exception { addPolicy("id", "typeName", "service1", "ric1"); @@ -471,16 +609,24 @@ public class ApplicationTest { return addPolicy(id, typeName, service, "ric"); } - private String createServiceJson(String name) { - ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, 1, "callbackUrl"); + private String createServiceJson(String name, long keepAliveIntervalSeconds) { + ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, "callbackUrl"); String json = gson.toJson(service); return json; } private void putService(String name) { + putService(name, 0, null); + } + + private void putService(String name, long keepAliveIntervalSeconds, @Nullable HttpStatus expectedStatus) { String url = "/service"; - restClient().put(url, createServiceJson(name)).block(); + String body = createServiceJson(name, keepAliveIntervalSeconds); + ResponseEntity resp = restClient().putForEntity(url, body).block(); + if (expectedStatus != null) { + assertEquals(expectedStatus, resp.getStatusCode(), ""); + } } private String baseUrl() { @@ -491,51 +637,19 @@ public class ApplicationTest { return "{\n \"servingCellNrcgi\": \"1\"\n }"; } - private static class ConcurrencyTestRunnable implements Runnable { - private final RestTemplate restTemplate = new RestTemplate(); - private final String baseUrl; - static AtomicInteger nextCount = new AtomicInteger(0); - private final int count; - private final RepositorySupervision supervision; - - ConcurrencyTestRunnable(String baseUrl, RepositorySupervision supervision) { - this.baseUrl = baseUrl; - this.count = nextCount.incrementAndGet(); - this.supervision = supervision; - } - - @Override - public void run() { - for (int i = 0; i < 100; ++i) { - if (i % 10 == 0) { - this.supervision.checkAllRics(); - } - String name = "policy:" + count + ":" + i; - putPolicy(name); - deletePolicy(name); - } - } - - private void putPolicy(String name) { - String putUrl = baseUrl + "/policy?type=type1&instance=" + name + "&ric=ric1&service=service1"; - restTemplate.put(putUrl, createJsonHttpEntity("{}")); - } - - private void deletePolicy(String name) { - String deleteUrl = baseUrl + "/policy?instance=" + name; - restTemplate.delete(deleteUrl); - } - } - @Test public void testConcurrency() throws Exception { final Instant startTime = Instant.now(); List threads = new ArrayList<>(); - addRic("ric1"); - addPolicyType("type1", "ric1"); + a1ClientFactory.setResponseDelay(Duration.ofMillis(1)); + addRic("ric"); + addPolicyType("type1", "ric"); + addPolicyType("type2", "ric"); for (int i = 0; i < 100; ++i) { - Thread t = new Thread(new ConcurrencyTestRunnable(baseUrl(), this.supervision), "TestThread_" + i); + Thread t = + new Thread(new ConcurrencyTestRunnable(baseUrl(), supervision, a1ClientFactory, rics, policyTypes), + "TestThread_" + i); t.start(); threads.add(t); } @@ -543,7 +657,7 @@ public class ApplicationTest { t.join(); } assertThat(policies.size()).isEqualTo(0); - System.out.println("Concurrency test took " + Duration.between(startTime, Instant.now())); + logger.info("Concurrency test took " + Duration.between(startTime, Instant.now())); } private AsyncRestClient restClient() { @@ -551,16 +665,21 @@ public class ApplicationTest { } private void testErrorCode(Mono request, HttpStatus expStatus) { + testErrorCode(request, expStatus, ""); + } + + private void testErrorCode(Mono request, HttpStatus expStatus, String responseContains) { StepVerifier.create(request) // .expectSubscription() // - .expectErrorMatches(t -> checkWebClientError(t, expStatus)) // + .expectErrorMatches(t -> checkWebClientError(t, expStatus, responseContains)) // .verify(); } - private boolean checkWebClientError(Throwable t, HttpStatus expStatus) { + private boolean checkWebClientError(Throwable t, HttpStatus expStatus, String responseContains) { assertTrue(t instanceof WebClientResponseException); WebClientResponseException e = (WebClientResponseException) t; assertThat(e.getStatusCode()).isEqualTo(expStatus); + assertThat(e.getResponseBodyAsString()).contains(responseContains); return true; } @@ -595,6 +714,7 @@ public class ApplicationTest { .name(ricName) // .baseUrl(ricName) // .managedElementIds(mes) // + .controllerName("") // .build(); Ric ric = new Ric(conf); ric.setState(Ric.RicState.IDLE); @@ -602,12 +722,6 @@ public class ApplicationTest { return ric; } - private static 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();