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=cffd1c45a1068552bec5205dadae50c4805a5a7b;hb=6116e98837066075013c5ee22b39a2df4ff604ea;hp=43cb96d586961dda4bf21c934030043605032862;hpb=3134679dec4f273afbb768c8ff71a5f50f5a6a4c;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 43cb96d5..cffd1c45 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; @@ -72,7 +74,9 @@ 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.HttpStatus; @@ -86,7 +90,7 @@ import reactor.util.annotation.Nullable; @ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -public class ApplicationTest { +class ApplicationTest { private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); @Autowired @@ -107,6 +111,9 @@ public class ApplicationTest { @Autowired RicSupervision supervision; + @Autowired + ApplicationConfig applicationConfig; + @Autowired Services services; @@ -164,13 +171,19 @@ 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 private int port; @BeforeEach - public void reset() { + void reset() { rics.clear(); policies.clear(); policyTypes.clear(); @@ -179,7 +192,7 @@ public class ApplicationTest { } @AfterEach - public void verifyNoRicLocks() { + void verifyNoRicLocks() { for (Ric ric : this.rics.getRics()) { ric.getLock().lockBlocking(LockType.EXCLUSIVE); ric.getLock().unlockBlocking(); @@ -189,7 +202,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"; @@ -200,7 +213,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"); @@ -216,7 +231,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")); @@ -252,7 +267,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); @@ -266,17 +281,27 @@ public class ApplicationTest { testErrorCode(restClient().get(url), HttpStatus.NOT_FOUND); } - private String putPolicyUrl(String serviceName, String ricName, String policyTypeName, String policyInstanceId) { + private String putPolicyUrl(String serviceName, String ricName, String policyTypeName, String policyInstanceId, + boolean isTransient) { + String url; if (policyTypeName.isEmpty()) { - return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; + url = "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName; } else { - return "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + url = "/policy?id=" + policyInstanceId + "&ric=" + ricName + "&service=" + serviceName + "&type=" + policyTypeName; } + if (isTransient) { + url += "&transient=true"; + } + return url; + } + + private String putPolicyUrl(String serviceName, String ricName, String policyTypeName, String policyInstanceId) { + return putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId, false); } @Test - public void testPutPolicy() throws Exception { + void testPutPolicy() throws Exception { String serviceName = "service1"; String ricName = "ric1"; String policyTypeName = "type1"; @@ -285,7 +310,8 @@ public class ApplicationTest { putService(serviceName); addPolicyType(policyTypeName, ricName); - String url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); + // PUT a transient policy + String url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId, true); final String policyBody = jsonString(); this.rics.getRic(ricName).setState(Ric.RicState.AVAILABLE); @@ -296,6 +322,13 @@ public class ApplicationTest { assertThat(policy.id()).isEqualTo(policyInstanceId); assertThat(policy.ownerServiceName()).isEqualTo(serviceName); assertThat(policy.ric().name()).isEqualTo("ric1"); + assertThat(policy.isTransient()).isEqualTo(true); + + // Put a non transient policy + url = putPolicyUrl(serviceName, ricName, policyTypeName, policyInstanceId); + restClient().put(url, policyBody).block(); + policy = policies.getPolicy(policyInstanceId); + assertThat(policy.isTransient()).isEqualTo(false); url = "/policies"; String rsp = restClient().get(url).block(); @@ -325,7 +358,7 @@ public class ApplicationTest { * * @throws ServiceException */ - public void testErrorFromRIC() throws ServiceException { + void testErrorFromRIC() throws ServiceException { putService("service1"); addPolicyType("type1", "ric1"); @@ -359,7 +392,7 @@ public class ApplicationTest { } @Test - public void testPutTypelessPolicy() throws Exception { + void testPutTypelessPolicy() throws Exception { putService("service1"); addPolicyType("", "ric1"); String url = putPolicyUrl("service1", "ric1", "", "id1"); @@ -374,7 +407,7 @@ public class ApplicationTest { } @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"); @@ -388,7 +421,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"); { @@ -402,7 +435,7 @@ public class ApplicationTest { } @Test - public void testDeletePolicy() throws Exception { + void testDeletePolicy() throws Exception { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); @@ -417,7 +450,7 @@ public class ApplicationTest { } @Test - public void testGetPolicySchemas() throws Exception { + void testGetPolicySchemas() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -441,7 +474,7 @@ public class ApplicationTest { } @Test - public void testGetPolicySchema() throws Exception { + void testGetPolicySchema() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -457,7 +490,7 @@ public class ApplicationTest { } @Test - public void testGetPolicyTypes() throws Exception { + void testGetPolicyTypes() throws Exception { addPolicyType("type1", "ric1"); addPolicyType("type2", "ric2"); @@ -475,7 +508,7 @@ public class ApplicationTest { } @Test - public void testGetPolicies() throws Exception { + void testGetPolicies() throws Exception { addPolicy("id1", "type1", "service1"); String url = "/policies"; @@ -491,7 +524,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"); @@ -520,7 +553,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"); @@ -546,7 +579,7 @@ public class ApplicationTest { } @Test - public void testPutAndGetService() throws Exception { + void testPutAndGetService() throws Exception { // PUT putService("name", 0, HttpStatus.CREATED); putService("name", 0, HttpStatus.OK); @@ -592,7 +625,7 @@ public class ApplicationTest { } @Test - public void testServiceSupervision() throws Exception { + void testServiceSupervision() throws Exception { putService("service1", 1, HttpStatus.CREATED); addPolicyType("type1", "ric1"); @@ -609,7 +642,7 @@ public class ApplicationTest { } @Test - public void testGetPolicyStatus() throws Exception { + void testGetPolicyStatus() throws Exception { addPolicy("id", "typeName", "service1", "ric1"); assertThat(policies.size()).isEqualTo(1); @@ -624,12 +657,15 @@ public class ApplicationTest { private Policy addPolicy(String id, String typeName, String service, String ric) throws ServiceException { addRic(ric); - Policy p = ImmutablePolicy.builder().id(id) // + Policy p = ImmutablePolicy.builder() // + .id(id) // .json(jsonString()) // .ownerServiceName(service) // .ric(rics.getRic(ric)) // .type(addPolicyType(typeName, ric)) // - .lastModified("lastModified").build(); + .lastModified("lastModified") // + .isTransient(false) // + .build(); policies.put(p); return p; } @@ -670,8 +706,8 @@ public class ApplicationTest { return "{\"servingCellNrcgi\":\"1\"}"; } - // @Test TODO temporary disabled - public void testConcurrency() throws Exception { + @Test + void testConcurrency() throws Exception { final Instant startTime = Instant.now(); List threads = new ArrayList<>(); a1ClientFactory.setResponseDelay(Duration.ofMillis(1)); @@ -679,7 +715,7 @@ public class ApplicationTest { addPolicyType("type1", "ric"); addPolicyType("type2", "ric"); - for (int i = 0; i < 100; ++i) { + for (int i = 0; i < 10; ++i) { Thread t = new Thread(new ConcurrencyTestRunnable(baseUrl(), supervision, a1ClientFactory, rics, policyTypes), "TestThread_" + i); @@ -693,8 +729,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()); + return restClient(false); } private void testErrorCode(Mono request, HttpStatus expStatus) {