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=d274d5a30782fd7dda771f81b49fcfc401383ea0;hb=73a8d2b71f8b683865d96ad78576d0f7ab654ba6;hp=a5bf3cb71f74db8af16171f9cb9b9c7cf2d4a784;hpb=136e826cabebb7e4188c68ec118bb11632f8139a;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 a5bf3cb7..d274d5a3 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; @@ -69,20 +72,19 @@ 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.embedded.tomcat.TomcatServletWebServerFactory; import org.springframework.boot.web.server.LocalServerPort; +import org.springframework.boot.web.servlet.server.ServletWebServerFactory; 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) @@ -164,6 +166,12 @@ public class ApplicationTest { Duration checkInterval = Duration.ofMillis(1); return new ServiceSupervision(this.services, this.policies, this.getA1ClientFactory(), checkInterval); } + + @Bean + public ServletWebServerFactory servletContainer() { + return new TomcatServletWebServerFactory(); + } + } @LocalServerPort @@ -175,6 +183,7 @@ public class ApplicationTest { policies.clear(); policyTypes.clear(); services.clear(); + a1ClientFactory.reset(); } @AfterEach @@ -183,17 +192,31 @@ public class ApplicationTest { ric.getLock().lockBlocking(LockType.EXCLUSIVE); ric.getLock().unlockBlocking(); assertThat(ric.getLock().getLockCounter()).isEqualTo(0); - assertThat(ric.getState()).isEqualTo(Ric.RicState.IDLE); + assertThat(ric.getState()).isEqualTo(Ric.RicState.AVAILABLE); } } @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"); + assertThat(rsp).contains("AVAILABLE"); + + // All RICs + rsp = restClient().get("/rics").block(); + assertThat(rsp).contains("ric2"); + assertThat(rsp).contains("ric1"); // Non existing policy type url = "/rics?policyType=XXXX"; @@ -201,24 +224,39 @@ public class ApplicationTest { } @Test - public void testRecovery() throws Exception { - addRic("ric").setState(Ric.RicState.UNDEFINED); - String ricName = "ric"; - Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); - - getA1Client(ricName).putPolicy(policy2); // put it in the RIC + public void testSynchronization() throws Exception { + // Two polictypes will be put in the NearRT RICs + PolicyTypes nearRtRicPolicyTypes = new PolicyTypes(); + nearRtRicPolicyTypes.put(createPolicyType("typeName")); + nearRtRicPolicyTypes.put(createPolicyType("typeName2")); + this.a1ClientFactory.setPolicyTypes(nearRtRicPolicyTypes); + + // One type and one instance added to the agent storage + final String ric1Name = "ric1"; + Ric ric1 = addRic(ric1Name); + Policy policy2 = addPolicy("policyId2", "typeName", "service", ric1Name); + Ric ric2 = addRic("ric2"); + + getA1Client(ric1Name).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 + Policy policy = addPolicy(policyId, "typeName", "service", ric1Name); // 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(); + // Wait until synch is completed + await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ric1Name).getState())); + await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ric1Name).getState())); + await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic("ric2").getState())); + + Policies ricPolicies = getA1Client(ric1Name).getPolicies(); assertThat(ricPolicies.size()).isEqualTo(1); Policy ricPolicy = ricPolicies.get(policyId); assertThat(ricPolicy.json()).isEqualTo(policy.json()); + + // Both types should be in the agent storage after the synch + assertThat(ric1.getSupportedPolicyTypes().size()).isEqualTo(2); + assertThat(ric2.getSupportedPolicyTypes().size()).isEqualTo(2); } @Test @@ -237,9 +275,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?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; + } else { + return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + + policyTypeName; + } } @Test @@ -254,7 +295,7 @@ public class ApplicationTest { String url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); final String policyBody = jsonString(); - this.rics.getRic(ricName).setState(Ric.RicState.IDLE); + this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE); restClient().put(url, policyBody).block(); @@ -268,6 +309,10 @@ public class ApplicationTest { String rsp = restClient().get(url).block(); assertThat(rsp.contains(policyInstanceId)).isTrue(); + url = "/policy?id=" + policyInstanceId; + rsp = restClient().get(url).block(); + assertThat(rsp).isEqualTo(policyBody); + // Test of error codes url = putPolicyUrl(serviceName, ricName + "XX", policyTypeName, policyInstanceId); testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND); @@ -278,7 +323,62 @@ public class ApplicationTest { url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); this.rics.getRic(ricName).setState(Ric.RicState.SYNCHRONIZING); testErrorCode(restClient().put(url, policyBody), HttpStatus.LOCKED); - this.rics.getRic(ricName).setState(Ric.RicState.IDLE); + this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE); + } + + @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?id=instance1"), httpStatus, responseBody); + + // GET STATUS + this.addPolicy("instance1", "type1", "service1", "ric1"); + doReturn(Mono.error(a1Exception)).when(a1Client).getPolicyStatus(any()); + testErrorCode(restClient().get("/policy_status?id=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?id=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 @@ -288,15 +388,16 @@ public class ApplicationTest { this.addRic("ric1"); this.addRic("ricXXX"); this.addPolicy("instance1", "type1", "service1", "ric1"); + this.addPolicy("instance2", "type1", "service1", "ricXXX"); // 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 public void testGetPolicy() throws Exception { - String url = "/policy?instance=id"; + String url = "/policy?id=id"; Policy policy = addPolicy("id", "typeName", "service1", "ric1"); { String rsp = restClient().get(url).block(); @@ -313,7 +414,7 @@ public class ApplicationTest { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); - String url = "/policy?instance=id"; + String url = "/policy?id=id"; ResponseEntity entity = restClient().deleteForEntity(url).block(); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.NO_CONTENT); @@ -383,7 +484,6 @@ public class ApplicationTest { @Test public void testGetPolicies() throws Exception { - reset(); addPolicy("id1", "type1", "service1"); String url = "/policies"; @@ -427,10 +527,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", 0); + putService("name", 0, HttpStatus.CREATED); + putService("name", 0, HttpStatus.OK); // GET one service String url = "/services?name=name"; @@ -449,7 +576,7 @@ public class ApplicationTest { // Keep alive url = "/services/keepalive?name=name"; - ResponseEntity entity = restClient().postForEntity(url, null).block(); + ResponseEntity entity = restClient().putForEntity(url).block(); assertThat(entity.getStatusCode()).isEqualTo(HttpStatus.OK); // DELETE service @@ -459,11 +586,14 @@ public class ApplicationTest { assertThat(services.size()).isEqualTo(0); // Keep alive, no registerred service - testErrorCode(restClient().post("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); + testErrorCode(restClient().put("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); - // PUT servive with crap payload + // PUT servive with bad payload testErrorCode(restClient().put("/service", "crap"), HttpStatus.BAD_REQUEST); testErrorCode(restClient().put("/service", "{}"), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", createServiceJson("name", -123)), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", createServiceJson("name", 0, "missing.portandprotocol.com")), + HttpStatus.BAD_REQUEST); // GET non existing servive testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND); @@ -471,7 +601,7 @@ public class ApplicationTest { @Test public void testServiceSupervision() throws Exception { - putService("service1", 1); + putService("service1", 1, HttpStatus.CREATED); addPolicyType("type1", "ric1"); String url = putPolicyUrl("service1", "ric1", "type1", "instance1"); @@ -491,12 +621,12 @@ public class ApplicationTest { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); - String url = "/policy_status?instance=id"; + String url = "/policy_status?id=id"; String rsp = restClient().get(url).block(); assertThat(rsp.equals("OK")).isTrue(); // GET non existing policy status - url = "/policy_status?instance=XXX"; + url = "/policy_status?id=XXX"; testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); } @@ -517,75 +647,50 @@ public class ApplicationTest { } private String createServiceJson(String name, long keepAliveIntervalSeconds) { - ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, "callbackUrl"); + return createServiceJson(name, keepAliveIntervalSeconds, "https://examples.javacodegeeks.com/core-java/"); + } + + private String createServiceJson(String name, long keepAliveIntervalSeconds, String url) { + ServiceRegistrationInfo service = new ServiceRegistrationInfo(name, keepAliveIntervalSeconds, url); String json = gson.toJson(service); return json; } private void putService(String name) { - putService(name, 0); + putService(name, 0, null); } - private void putService(String name, long keepAliveIntervalSeconds) { + private void putService(String name, long keepAliveIntervalSeconds, @Nullable HttpStatus expectedStatus) { String url = "/service"; String body = createServiceJson(name, keepAliveIntervalSeconds); - restClient().put(url, body).block(); + ResponseEntity resp = restClient().putForEntity(url, body).block(); + if (expectedStatus != null) { + assertEquals(expectedStatus, resp.getStatusCode(), ""); + } } private String baseUrl() { - return "http://localhost:" + port; + return "https://localhost:" + port; } private String jsonString() { - 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 RicSupervision supervision; - - ConcurrencyTestRunnable(String baseUrl, RicSupervision 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); - } + return "{\"servingCellNrcgi\":\"1\"}"; } @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); } @@ -601,16 +706,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; } @@ -618,12 +728,15 @@ public class ApplicationTest { return a1ClientFactory.getOrCreateA1Client(ricName); } - private PolicyType addPolicyType(String policyTypeName, String ricName) { - PolicyType type = ImmutablePolicyType.builder() // + private PolicyType createPolicyType(String policyTypeName) { + return ImmutablePolicyType.builder() // .name(policyTypeName) // .schema("{\"title\":\"" + policyTypeName + "\"}") // .build(); + } + private PolicyType addPolicyType(String policyTypeName, String ricName) { + PolicyType type = createPolicyType(policyTypeName); policyTypes.put(type); addRic(ricName).addSupportedPolicyType(type); return type; @@ -645,19 +758,14 @@ public class ApplicationTest { .name(ricName) // .baseUrl(ricName) // .managedElementIds(mes) // + .controllerName("") // .build(); Ric ric = new Ric(conf); - ric.setState(Ric.RicState.IDLE); + ric.setState(Ric.RicState.AVAILABLE); this.rics.put(ric); 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();