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=4ea6ff9e42e577c4731e72d91a2aba698c15a724;hb=8f1c85c3604a0d10675cacd16a7b67dca346d478;hp=fc4030f50b3d150e91703c8ed0497b766dcd8ef8;hpb=1391d501b25e6559a76bb1ab5681429a181d358a;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 fc4030f5..4ea6ff9e 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -22,8 +22,6 @@ 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; @@ -32,10 +30,15 @@ import com.google.gson.JsonElement; import com.google.gson.JsonParser; import java.io.IOException; +import java.time.Duration; +import java.time.Instant; import java.util.ArrayList; import java.util.List; import java.util.Vector; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.oransc.policyagent.configuration.ApplicationConfig; @@ -47,6 +50,7 @@ import org.oransc.policyagent.controllers.ServiceStatus; import org.oransc.policyagent.exceptions.ServiceException; import org.oransc.policyagent.repository.ImmutablePolicy; import org.oransc.policyagent.repository.ImmutablePolicyType; +import org.oransc.policyagent.repository.Lock.LockType; import org.oransc.policyagent.repository.Policies; import org.oransc.policyagent.repository.Policy; import org.oransc.policyagent.repository.PolicyType; @@ -67,6 +71,7 @@ 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.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus.Series; import org.springframework.http.MediaType; @@ -101,8 +106,8 @@ public class ApplicationTest { Services services; private static Gson gson = new GsonBuilder() // - .serializeNulls() // - .create(); // + .serializeNulls() // + .create(); // public static class MockApplicationConfig extends ApplicationConfig { @Override @@ -128,20 +133,10 @@ public class ApplicationTest { return new MockA1ClientFactory(this.policyTypes); } - @Bean - public Policies getPolicies() { - return new Policies(); - } - @Bean public PolicyTypes getPolicyTypes() { return this.policyTypes; } - - @Bean - public Rics getRics() { - return new Rics(); - } } @LocalServerPort @@ -154,7 +149,7 @@ public class ApplicationTest { @Override public boolean hasError(ClientHttpResponse httpResponse) throws IOException { return (httpResponse.getStatusCode().series() == Series.CLIENT_ERROR - || httpResponse.getStatusCode().series() == Series.SERVER_ERROR); + || httpResponse.getStatusCode().series() == Series.SERVER_ERROR); } @Override @@ -163,17 +158,30 @@ public class ApplicationTest { } } - private void reset() { + private void setRestErrorhandler() { + restTemplate.setErrorHandler(new RestTemplateResponseErrorHandler()); + } + + @BeforeEach + public void reset() { rics.clear(); policies.clear(); policyTypes.clear(); - assertThat(policies.size()).isEqualTo(0); - restTemplate.setErrorHandler(new RestTemplateResponseErrorHandler()); + services.clear(); + } + + @AfterEach + public void verifyNoRicLocks() { + for (Ric ric : this.rics.getRics()) { + ric.getLock().lockBlocking(LockType.EXCLUSIVE); + ric.getLock().unlock(); + assertThat(ric.getLock().getLockCounter()).isEqualTo(0); + assertThat(ric.getState()).isEqualTo(Ric.RicState.IDLE); + } } @Test public void testGetRics() throws Exception { - reset(); addRic("kista_1"); String url = baseUrl() + "/rics"; String rsp = this.restTemplate.getForObject(url, String.class); @@ -187,59 +195,79 @@ public class ApplicationTest { @Test public void testRecovery() throws Exception { - reset(); - Policy policy2 = addPolicy("policyId2", "typeName", "service", "ric"); + addRic("ric").setState(Ric.RicState.UNDEFINED); + String ricName = "ric"; + Policy policy2 = addPolicy("policyId2", "typeName", "service", ricName); - getA1Client("ric").putPolicy(policy2); // put it in the RIC + getA1Client(ricName).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 + 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.RECOVERING.equals(rics.getRic("ric").getState())); - await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic("ric").getState())); + await().untilAsserted(() -> RicState.SYNCHRONIZING.equals(rics.getRic(ricName).getState())); + await().untilAsserted(() -> RicState.IDLE.equals(rics.getRic(ricName).getState())); - Policies ricPolicies = getA1Client("ric").getPolicies(); + Policies ricPolicies = getA1Client(ricName).getPolicies(); assertThat(ricPolicies.size()).isEqualTo(1); - Policy ricPolicy = ricPolicies.get("policyId"); + Policy ricPolicy = ricPolicies.get(policyId); assertThat(ricPolicy.json()).isEqualTo(policy.json()); } - MockA1Client getA1Client(String ricName) throws ServiceException { - return a1ClientFactory.getOrCreateA1Client(ricName); + @Test + public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception { + 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); + + assertThat(rsp).isEqualTo(ricName); } @Test - public void testGetRic() throws Exception { - reset(); - Ric ric = addRic("ric1"); - ric.addManagedElement("kista_1"); + public void testGetRicForManagedElementThatDoesNotExist() throws Exception { + this.setRestErrorhandler(); String url = baseUrl() + "/ric?managedElementId=kista_1"; - - String rsp = this.restTemplate.getForObject(url, String.class); - System.out.println(rsp); - assertThat(rsp).isEqualTo("ric1"); + ResponseEntity entity = this.restTemplate.getForEntity(url, String.class); + assertThat(entity.getStatusCode().equals(HttpStatus.NOT_FOUND)); } @Test public void testPutPolicy() throws Exception { - reset(); - putService("service1"); - this.addRic("ric1").setState(Ric.RicState.IDLE); - addPolicyType("type1", "ric1"); + String serviceName = "service1"; + String ricName = "ric1"; + String policyTypeName = "type1"; + String policyInstanceId = "instance1"; + + putService(serviceName); + addPolicyType(policyTypeName, ricName); + String url = baseUrl() + "/policy?type=" + policyTypeName + "&instance=" + policyInstanceId + "&ric=" + ricName + + "&service=" + serviceName; final String json = jsonString(); - String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1"; + this.rics.getRic(ricName).setState(Ric.RicState.IDLE); + this.restTemplate.put(url, createJsonHttpEntity(json)); - Policy policy = policies.getPolicy("instance1"); + Policy policy = policies.getPolicy(policyInstanceId); assertThat(policy).isNotNull(); - assertThat(policy.id()).isEqualTo("instance1"); - assertThat(policy.ownerServiceName()).isEqualTo("service1"); + 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); - System.out.println(rsp); + assertThat(rsp.contains(policyInstanceId)).isTrue(); } @@ -247,86 +275,19 @@ public class ApplicationTest { 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.addRic("ric1"); + this.addRic("ricXXX"); this.addPolicy("instance1", "type1", "service1", "ric1"); + this.setRestErrorhandler(); String urlWrongRic = baseUrl() + "/policy?type=type1&instance=instance1&ric=ricXXX&service=service1"; - this.restTemplate.put(urlWrongRic, createJsonHttpEntity(jsonString())); + ResponseEntity entity = this.putForEntity(urlWrongRic, jsonString()); + assertThat(entity.getStatusCode().equals(HttpStatus.METHOD_NOT_ALLOWED)); + Policy policy = policies.getPolicy("instance1"); assertThat(policy.ric().name()).isEqualTo("ric1"); // Not changed } - 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 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(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 baseUrl() { - return "http://localhost:" + port; - } - @Test public void testGetPolicy() throws Exception { String url = baseUrl() + "/policy?instance=id"; @@ -344,10 +305,8 @@ public class ApplicationTest { @Test 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); + addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); this.restTemplate.delete(url); @@ -357,7 +316,6 @@ public class ApplicationTest { @Test public void testGetPolicySchemas() throws Exception { - reset(); addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -368,18 +326,17 @@ public class ApplicationTest { assertThat(rsp).contains("[{\"title\":\"type2\"}"); List info = parseSchemas(rsp); - assertEquals(2, info.size()); + 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); - assertEquals(1, info.size()); + assertThat(info.size()).isEqualTo(1); } @Test public void testGetPolicySchema() throws Exception { - reset(); addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -392,7 +349,6 @@ public class ApplicationTest { @Test public void testGetPolicyTypes() throws Exception { - reset(); addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -407,6 +363,7 @@ public class ApplicationTest { @Test public void testGetPolicies() throws Exception { + reset(); String url = baseUrl() + "/policies"; addPolicy("id1", "type1", "service1"); @@ -432,64 +389,194 @@ public class ApplicationTest { System.out.println(rsp); assertThat(rsp).contains("id1"); assertThat(rsp).contains("id2"); - assertFalse(rsp.contains("id3")); + assertThat(rsp.contains("id3")).isFalse(); 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?name=name"; + String url = baseUrl() + "/services?serviceName=name"; String rsp = this.restTemplate.getForObject(url, String.class); List info = parseList(rsp, ServiceStatus.class); - assertThat(info.size() == 1); + assertThat(info.size()).isEqualTo(1); ServiceStatus status = info.iterator().next(); - assertThat(status.keepAliveIntervalSeconds == 1); - assertThat(status.serviceName.equals("name")); + 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")); + assertThat(rsp.contains("name")).isTrue(); System.out.println(rsp); // Keep alive url = baseUrl() + "/services/keepalive?name=name"; - rsp = this.restTemplate.postForObject(url, null, String.class); - assertThat(rsp.contains("OK")); + ResponseEntity entity = this.restTemplate.postForEntity(url, null, String.class); + assertThat(entity.getStatusCode().equals(HttpStatus.OK)); // DELETE - assertThat(services.size() == 1); + assertThat(services.size()).isEqualTo(1); url = baseUrl() + "/services?name=name"; this.restTemplate.delete(url); - assertThat(services.size() == 0); + assertThat(services.size()).isEqualTo(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)); + url = baseUrl() + "/services/keepalive?name=name"; + setRestErrorhandler(); + 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); + addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); String url = baseUrl() + "/policy_status?instance=id"; String rsp = this.restTemplate.getForObject(url, String.class); - assertThat(rsp.equals("OK")); + assertThat(rsp.equals("OK")).isTrue(); + } + + 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 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 RepositorySupervision supervision; + + ConcurrencyTestRunnable(String baseUrl, RepositorySupervision supervision) { + this.baseUrl = baseUrl; + this.count = nextCount.incrementAndGet(); + this.supervision = supervision; + } + + 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"; + this.restTemplate.put(putUrl, createJsonHttpEntity("{}")); + } + + private void deletePolicy(String name) { + String deleteUrl = baseUrl + "/policy?instance=" + name; + this.restTemplate.delete(deleteUrl); + } + } + + @Test + public void testConcurrency() throws Exception { + final Instant startTime = Instant.now(); + List threads = new ArrayList<>(); + addRic("ric1"); + addPolicyType("type1", "ric1"); + + for (int i = 0; i < 100; ++i) { + Thread t = new Thread(new ConcurrencyTestRunnable(baseUrl(), this.supervision), "TestThread_" + i); + t.start(); + threads.add(t); + } + for (Thread t : threads) { + t.join(); + } + assertThat(policies.size()).isEqualTo(0); + System.out.println("Concurrency test took " + Duration.between(startTime, Instant.now())); + } + + private MockA1Client getA1Client(String ricName) throws ServiceException { + return a1ClientFactory.getOrCreateA1Client(ricName); + } + + 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); + ric.setState(Ric.RicState.IDLE); + 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 ResponseEntity putForEntity(String url, String jsonBody) { + return restTemplate.exchange(url, HttpMethod.PUT, createJsonHttpEntity(jsonBody), String.class); } private static List parseList(String jsonString, Class clazz) { @@ -510,5 +597,4 @@ public class ApplicationTest { } return result; } - }