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=7ad2dc864c22d0c793c2d16776d8cced4ff239cf;hb=6f609c727d66ad20b5b31eae472fcde5e4acd569;hp=71bd9a5eed4ba42240d830449492a4ec53b6247c;hpb=61fcee9bad6d96005c403fdfd3f273430d4f8641;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 71bd9a5e..7ad2dc86 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -38,7 +38,6 @@ 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; @@ -76,13 +75,9 @@ 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; @@ -180,6 +175,7 @@ public class ApplicationTest { policies.clear(); policyTypes.clear(); services.clear(); + a1ClientFactory.reset(); } @AfterEach @@ -188,7 +184,7 @@ 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); } } @@ -215,7 +211,7 @@ public class ApplicationTest { @Test public void testSynchronization() throws Exception { - addRic("ric").setState(Ric.RicState.UNDEFINED); + addRic("ric").setState(Ric.RicState.UNAVAILABLE); String ricName = "ric"; Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); @@ -226,7 +222,7 @@ public class ApplicationTest { 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())); + await().untilAsserted(() -> RicState.AVAILABLE.equals(rics.getRic(ricName).getState())); Policies ricPolicies = getA1Client(ricName).getPolicies(); assertThat(ricPolicies.size()).isEqualTo(1); @@ -251,9 +247,9 @@ public class ApplicationTest { private String putPolicyUrl(String serviceName, String ricName, String policyTypeName, String policyInstanceId) { if (policyTypeName.isEmpty()) { - return "/policy?instance=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; + return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; } else { - return "/policy?instance=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + policyTypeName; } } @@ -270,7 +266,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(); @@ -294,7 +290,7 @@ 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 @@ -324,17 +320,17 @@ public class ApplicationTest { // DELETE POLICY this.addPolicy("instance1", "type1", "service1", "ric1"); doReturn(Mono.error(a1Exception)).when(a1Client).deletePolicy(any()); - testErrorCode(restClient().delete("/policy?instance=instance1"), httpStatus, responseBody); + 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?instance=instance1"), httpStatus, responseBody); + 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?instance=instance1"), httpStatus); + testErrorCode(restClient().get("/policy_status?id=instance1"), httpStatus); } @Test @@ -359,6 +355,7 @@ 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"); @@ -367,7 +364,7 @@ public class ApplicationTest { @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(); @@ -384,7 +381,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); @@ -454,7 +451,6 @@ public class ApplicationTest { @Test public void testGetPolicies() throws Exception { - reset(); addPolicy("id1", "type1", "service1"); String url = "/policies"; @@ -547,7 +543,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 @@ -557,11 +553,12 @@ 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); // GET non existing servive testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND); @@ -589,12 +586,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); } @@ -642,51 +639,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 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); - } - } - @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); } @@ -751,19 +716,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();