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=0fb80f3d0c28c03bb6c068d6f9585f95fe6dadc1;hb=710dd0ffbea38bfd56d8fde7a559b74d761c1adb;hp=09662575caded0fd5ee8c31137e4c00960eb08f3;hpb=6d503afd38bdf9823bda3dfe3d307adaeb6f7eee;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 09662575..0fb80f3d 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -46,7 +46,9 @@ import org.junit.jupiter.api.extension.ExtendWith; import org.oransc.policyagent.clients.AsyncRestClient; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; +import org.oransc.policyagent.configuration.ImmutableWebClientConfig; import org.oransc.policyagent.configuration.RicConfig; +import org.oransc.policyagent.configuration.WebClientConfig; import org.oransc.policyagent.controllers.PolicyInfo; import org.oransc.policyagent.controllers.ServiceRegistrationInfo; import org.oransc.policyagent.controllers.ServiceStatus; @@ -79,6 +81,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.Bean; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.test.context.TestPropertySource; import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.web.reactive.function.client.WebClientResponseException; @@ -88,7 +91,11 @@ import reactor.util.annotation.Nullable; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class ApplicationTest { +@TestPropertySource( + properties = { // + "server.ssl.key-store=./config/keystore.jks", // + "app.webclient.trust-store=./config/truststore.jks"}) +class ApplicationTest { private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); @Autowired @@ -181,7 +188,7 @@ public class ApplicationTest { private int port; @BeforeEach - public void reset() { + void reset() { rics.clear(); policies.clear(); policyTypes.clear(); @@ -190,7 +197,7 @@ public class ApplicationTest { } @AfterEach - public void verifyNoRicLocks() { + void verifyNoRicLocks() { for (Ric ric : this.rics.getRics()) { ric.getLock().lockBlocking(LockType.EXCLUSIVE); ric.getLock().unlockBlocking(); @@ -200,7 +207,7 @@ public class ApplicationTest { } @Test - public void testGetRics() throws Exception { + void testGetRics() throws Exception { addRic("ric1"); this.addPolicyType("type1", "ric1"); String url = "/rics?policyType=type1"; @@ -211,7 +218,9 @@ public class ApplicationTest { addRic("ric2"); this.addPolicyType("", "ric2"); url = "/rics?policyType="; - rsp = restClient().get(url).block(); + + // This tests also validation of trusted certs restClient(true) + rsp = restClient(true).get(url).block(); assertThat(rsp).contains("ric2"); assertThat(rsp).doesNotContain("ric1"); assertThat(rsp).contains("AVAILABLE"); @@ -227,7 +236,7 @@ public class ApplicationTest { } @Test - public void testSynchronization() throws Exception { + void testSynchronization() throws Exception { // Two polictypes will be put in the NearRT RICs PolicyTypes nearRtRicPolicyTypes = new PolicyTypes(); nearRtRicPolicyTypes.put(createPolicyType("typeName")); @@ -263,7 +272,7 @@ public class ApplicationTest { } @Test - public void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception { + void testGetRicForManagedElement_thenReturnCorrectRic() throws Exception { String ricName = "ric1"; String managedElementId = "kista_1"; addRic(ricName, managedElementId); @@ -297,7 +306,7 @@ public class ApplicationTest { } @Test - public void testPutPolicy() throws Exception { + void testPutPolicy() throws Exception { String serviceName = "service1"; String ricName = "ric1"; String policyTypeName = "type1"; @@ -328,7 +337,7 @@ public class ApplicationTest { url = "/policies"; String rsp = restClient().get(url).block(); - assertThat(rsp.contains(policyInstanceId)).isTrue(); + assertThat(rsp).as("Response contains policy instance ID.").contains(policyInstanceId); url = "/policy?id=" + policyInstanceId; rsp = restClient().get(url).block(); @@ -339,6 +348,7 @@ public class ApplicationTest { testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND); url = putPolicyUrl(serviceName, ricName, policyTypeName + "XX", policyInstanceId); + addPolicyType(policyTypeName + "XX", "otherRic"); testErrorCode(restClient().put(url, policyBody), HttpStatus.NOT_FOUND); url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); @@ -354,7 +364,7 @@ public class ApplicationTest { * * @throws ServiceException */ - public void testErrorFromRIC() throws ServiceException { + void testErrorFromRIC() throws ServiceException { putService("service1"); addPolicyType("type1", "ric1"); @@ -388,7 +398,7 @@ public class ApplicationTest { } @Test - public void testPutTypelessPolicy() throws Exception { + void testPutTypelessPolicy() throws Exception { putService("service1"); addPolicyType("", "ric1"); String url = putPolicyUrl("service1", "ric1", "", "id1"); @@ -396,14 +406,14 @@ public class ApplicationTest { String rsp = restClient().get("/policies").block(); List info = parseList(rsp, PolicyInfo.class); - assertThat(info).size().isEqualTo(1); + assertThat(info.size()).isEqualTo(1); PolicyInfo policyInfo = info.get(0); - assertThat(policyInfo.id.equals("id1")).isTrue(); - assertThat(policyInfo.type.equals("")).isTrue(); + assertThat(policyInfo.id).isEqualTo("id1"); + assertThat(policyInfo.type).isEmpty(); } @Test - public void testRefuseToUpdatePolicy() throws Exception { + 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 this.addRic("ric1"); @@ -417,7 +427,7 @@ public class ApplicationTest { } @Test - public void testGetPolicy() throws Exception { + void testGetPolicy() throws Exception { String url = "/policy?id=id"; Policy policy = addPolicy("id", "typeName", "service1", "ric1"); { @@ -431,7 +441,7 @@ public class ApplicationTest { } @Test - public void testDeletePolicy() throws Exception { + void testDeletePolicy() throws Exception { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); @@ -446,7 +456,7 @@ public class ApplicationTest { } @Test - public void testGetPolicySchemas() throws Exception { + void testGetPolicySchemas() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -470,7 +480,7 @@ public class ApplicationTest { } @Test - public void testGetPolicySchema() throws Exception { + void testGetPolicySchema() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -486,7 +496,7 @@ public class ApplicationTest { } @Test - public void testGetPolicyTypes() throws Exception { + void testGetPolicyTypes() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -504,7 +514,7 @@ public class ApplicationTest { } @Test - public void testGetPolicies() throws Exception { + void testGetPolicies() throws Exception { addPolicy("id1", "type1", "service1"); String url = "/policies"; @@ -520,7 +530,7 @@ public class ApplicationTest { } @Test - public void testGetPoliciesFilter() throws Exception { + void testGetPoliciesFilter() throws Exception { addPolicy("id1", "type1", "service1"); addPolicy("id2", "type1", "service2"); addPolicy("id3", "type2", "service1"); @@ -549,7 +559,7 @@ public class ApplicationTest { } @Test - public void testGetPolicyIdsFilter() throws Exception { + void testGetPolicyIdsFilter() throws Exception { addPolicy("id1", "type1", "service1", "ric1"); addPolicy("id2", "type1", "service2", "ric1"); addPolicy("id3", "type2", "service1", "ric1"); @@ -575,10 +585,11 @@ public class ApplicationTest { } @Test - public void testPutAndGetService() throws Exception { + void testPutAndGetService() throws Exception { // PUT - putService("name", 0, HttpStatus.CREATED); - putService("name", 0, HttpStatus.OK); + String serviceName = "name"; + putService(serviceName, 0, HttpStatus.CREATED); + putService(serviceName, 0, HttpStatus.OK); // GET one service String url = "/services?name=name"; @@ -587,12 +598,12 @@ public class ApplicationTest { assertThat(info.size()).isEqualTo(1); ServiceStatus status = info.iterator().next(); assertThat(status.keepAliveIntervalSeconds).isEqualTo(0); - assertThat(status.serviceName).isEqualTo("name"); + assertThat(status.serviceName).isEqualTo(serviceName); // GET (all) url = "/services"; rsp = restClient().get(url).block(); - assertThat(rsp.contains("name")).isTrue(); + assertThat(rsp).as("Response contains service name").contains(serviceName); logger.info(rsp); // Keep alive @@ -606,22 +617,22 @@ public class ApplicationTest { restClient().delete(url).block(); assertThat(services.size()).isEqualTo(0); - // Keep alive, no registerred service + // Keep alive, no registered service testErrorCode(restClient().put("/services/keepalive?name=name", ""), HttpStatus.NOT_FOUND); // 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")), + testErrorCode(restClient().put("/service", createServiceJson(serviceName, -123)), HttpStatus.BAD_REQUEST); + testErrorCode(restClient().put("/service", createServiceJson(serviceName, 0, "missing.portandprotocol.com")), HttpStatus.BAD_REQUEST); - // GET non existing servive + // GET non existing service testErrorCode(restClient().get("/services?name=XXX"), HttpStatus.NOT_FOUND); } @Test - public void testServiceSupervision() throws Exception { + void testServiceSupervision() throws Exception { putService("service1", 1, HttpStatus.CREATED); addPolicyType("type1", "ric1"); @@ -638,13 +649,13 @@ public class ApplicationTest { } @Test - public void testGetPolicyStatus() throws Exception { + void testGetPolicyStatus() throws Exception { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); String url = "/policy_status?id=id"; String rsp = restClient().get(url).block(); - assertThat(rsp.equals("OK")).isTrue(); + assertThat(rsp).isEqualTo("OK"); // GET non existing policy status url = "/policy_status?id=XXX"; @@ -653,7 +664,7 @@ public class ApplicationTest { private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException { addRic(ric); - Policy p = ImmutablePolicy.builder() // + Policy policy = ImmutablePolicy.builder() // .id(id) // .json(jsonString()) // .ownerServiceName(service) // @@ -662,8 +673,8 @@ public class ApplicationTest { .lastModified("lastModified") // .isTransient(false) // .build(); - policies.put(p); - return p; + policies.put(policy); + return policy; } private Policy addPolicy(String id, String typeName, String service) throws ServiceException { @@ -703,7 +714,7 @@ public class ApplicationTest { } @Test - public void testConcurrency() throws Exception { + void testConcurrency() throws Exception { final Instant startTime = Instant.now(); List threads = new ArrayList<>(); a1ClientFactory.setResponseDelay(Duration.ofMillis(1)); @@ -712,11 +723,11 @@ public class ApplicationTest { addPolicyType("type2", "ric"); for (int i = 0; i < 10; ++i) { - Thread t = + Thread thread = new Thread(new ConcurrencyTestRunnable(baseUrl(), supervision, a1ClientFactory, rics, policyTypes), "TestThread_" + i); - t.start(); - threads.add(t); + thread.start(); + threads.add(thread); } for (Thread t : threads) { t.join(); @@ -725,8 +736,19 @@ public class ApplicationTest { logger.info("Concurrency test took " + Duration.between(startTime, Instant.now())); } + private AsyncRestClient restClient(boolean useTrustValidation) { + WebClientConfig config = this.applicationConfig.getWebClientConfig(); + config = ImmutableWebClientConfig.builder() // + .isTrustStoreUsed(useTrustValidation) // + .trustStore(config.trustStore()) // + .trustStorePassword(config.trustStorePassword()) // + .build(); + + return new AsyncRestClient(baseUrl(), config); + } + private AsyncRestClient restClient() { - return new AsyncRestClient(baseUrl(), this.applicationConfig.getWebClientConfig()); + return restClient(false); } private void testErrorCode(Mono request, HttpStatus expStatus) { @@ -740,11 +762,11 @@ public class ApplicationTest { .verify(); } - 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); + private boolean checkWebClientError(Throwable throwable, HttpStatus expStatus, String responseContains) { + assertTrue(throwable instanceof WebClientResponseException); + WebClientResponseException responseException = (WebClientResponseException) throwable; + assertThat(responseException.getStatusCode()).isEqualTo(expStatus); + assertThat(responseException.getResponseBodyAsString()).contains(responseContains); return true; } @@ -794,8 +816,8 @@ public class ApplicationTest { List result = new ArrayList<>(); JsonArray jsonArr = JsonParser.parseString(jsonString).getAsJsonArray(); for (JsonElement jsonElement : jsonArr) { - T o = gson.fromJson(jsonElement.toString(), clazz); - result.add(o); + T json = gson.fromJson(jsonElement.toString(), clazz); + result.add(json); } return result; }