X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FMockPolicyAgent.java;h=d37a2be4eca701f7a61a56fd96c3c5ff4d688d02;hb=2310d1c6a458bd12b2d1ff805f1bd12dcd536cfa;hp=743fa6659b124291cc08ed7cb339111bbfd5da64;hpb=ffe0c150f08205d73ee362f58f492aeb2703f295;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java b/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java index 743fa665..d37a2be4 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/MockPolicyAgent.java @@ -20,6 +20,8 @@ package org.oransc.policyagent; +import static org.awaitility.Awaitility.await; + import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -27,125 +29,94 @@ import java.io.File; import java.io.IOException; import java.net.URL; import java.nio.file.Files; -import java.util.HashMap; -import java.util.Map; -import java.util.Vector; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.oransc.policyagent.clients.A1Client; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; import org.oransc.policyagent.configuration.ApplicationConfig; +import org.oransc.policyagent.repository.ImmutablePolicy; import org.oransc.policyagent.repository.ImmutablePolicyType; import org.oransc.policyagent.repository.Policies; +import org.oransc.policyagent.repository.Policy; import org.oransc.policyagent.repository.PolicyType; import org.oransc.policyagent.repository.PolicyTypes; +import org.oransc.policyagent.repository.Ric; import org.oransc.policyagent.repository.Rics; +import org.oransc.policyagent.utils.MockA1ClientFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; 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.server.LocalServerPort; import org.springframework.context.annotation.Bean; -import org.springframework.test.context.junit4.SpringRunner; - -import reactor.core.publisher.Flux; -import reactor.core.publisher.Mono; +import org.springframework.test.context.junit.jupiter.SpringExtension; +import org.springframework.util.StringUtils; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest(webEnvironment = WebEnvironment.DEFINED_PORT) -public class MockPolicyAgent { +class MockPolicyAgent { + private static final Logger logger = LoggerFactory.getLogger(MockPolicyAgent.class); @Autowired - private Rics rics; + Rics rics; @Autowired - private Policies policies; + Policies policies; @Autowired - private PolicyTypes policyTypes; + PolicyTypes policyTypes; - static class MockApplicationConfig extends ApplicationConfig { + @Autowired + ApplicationConfig applicationConfig; + static class MockApplicationConfig extends ApplicationConfig { @Override - public void initialize() { + public String getLocalConfigurationFilePath() { URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); - loadConfigurationFromFile(url.getFile()); + return url.getFile(); } } - private static class RicPolicyDatabase { - private Map> policies = new HashMap<>(); - - public void putPolicy(String nearRtRicUrl, String policyId, String policyString) { - getPolicies(nearRtRicUrl).put(policyId, policyString); - } - - public Iterable getPolicyIdentities(String nearRtRicUrl) { - return getPolicies(nearRtRicUrl).keySet(); - } - - public void deletePolicy(String nearRtRicUrl, String policyId) { - getPolicies(nearRtRicUrl).remove(policyId); - } - - private Map getPolicies(String nearRtRicUrl) { - if (!policies.containsKey(nearRtRicUrl)) { - policies.put(nearRtRicUrl, new HashMap<>()); - } - return policies.get(nearRtRicUrl); - } - } - - static class A1ClientMock implements A1Client { + /** + * Overrides the BeanFactory. + */ + @TestConfiguration + static class TestBeanFactory { - private final RicPolicyDatabase policies = new RicPolicyDatabase(); + private final Rics rics = new Rics(); + private final Policies policies = new Policies(); private final PolicyTypes policyTypes = new PolicyTypes(); - A1ClientMock() { - loadTypes(this.policyTypes); - } - - @Override - public Flux getPolicyTypeIdentities(String nearRtRicUrl) { - Vector result = new Vector<>(); - for (PolicyType p : this.policyTypes.getAll()) { - result.add(p.name()); - } - return Flux.fromIterable(result); + @Bean + public ApplicationConfig getApplicationConfig() { + return new MockApplicationConfig(); } - @Override - public Flux getPolicyIdentities(String nearRtRicUrl) { - Iterable result = policies.getPolicyIdentities(nearRtRicUrl); - return Flux.fromIterable(result); + @Bean + public MockA1ClientFactory getA1ClientFactory() { + PolicyTypes ricTypes = new PolicyTypes(); + loadTypes(ricTypes); + return new MockA1ClientFactory(ricTypes); } - @Override - public Mono getPolicyType(String nearRtRicUrl, String policyTypeId) { - try { - return Mono.just(this.policyTypes.getType(policyTypeId).schema()); - } catch (Exception e) { - return Mono.error(e); - } + @Bean + public Policies getPolicies() { + return this.policies; } - @Override - public Mono putPolicy(String nearRtRicUrl, String policyId, String policyString) { - policies.putPolicy(nearRtRicUrl, policyId, policyString); - return Mono.just("OK"); + @Bean + public PolicyTypes getPolicyTypes() { + return this.policyTypes; } - @Override - public Mono deletePolicy(String nearRtRicUrl, String policyId) { - policies.deletePolicy(nearRtRicUrl, policyId); - return Mono.just("OK"); + @Bean + public Rics getRics() { + return this.rics; } private static File[] getResourceFolderFiles(String folder) { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - URL url = loader.getResource(folder); - String path = url.getPath(); - return new File(path).listFiles(); + return getFile(folder).listFiles(); } private static String readFile(File file) throws IOException { @@ -161,70 +132,75 @@ public class MockPolicyAgent { PolicyType type = ImmutablePolicyType.builder().name(typeName).schema(schema).build(); policyTypes.put(type); } catch (Exception e) { - System.out.println("Could not load json schema " + e); + logger.error("Could not load json schema ", e); } } + policyTypes.put(ImmutablePolicyType.builder().name("").schema("{}").build()); } } - /** - * overrides the BeanFactory - */ - @TestConfiguration - static class TestBeanFactory { - - private final Rics rics = new Rics(); - private final Policies policies = new Policies(); - private final PolicyTypes policyTypes = new PolicyTypes(); - - @Bean - public ApplicationConfig getApplicationConfig() { - return new MockApplicationConfig(); - } - - @Bean - A1Client getA1Client() { - return new A1ClientMock(); - } - - @Bean - public Policies getPolicies() { - return this.policies; - } - - @Bean - public PolicyTypes getPolicyTypes() { - return this.policyTypes; - } - - @Bean - public Rics getRics() { - return this.rics; - } + private static File getFile(String path) { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + URL url = loader.getResource(path); + return new File(url.getPath()); } @LocalServerPort private int port; - private void keepServerAlive() { - System.out.println("Keeping server alive!"); + private void keepServerAlive() throws InterruptedException, IOException { + waitForConfigurationToBeLoaded(); + loadInstances(); + logger.info("Keeping server alive!"); + synchronized (this) { + this.wait(); + } + } + + private void waitForConfigurationToBeLoaded() throws IOException { + String json = getConfigJsonFromFile(); try { - synchronized (this) { - this.wait(); - } - } catch (Exception ex) { - System.out.println("Unexpected: " + ex.toString()); + int noOfRicsInConfigFile = StringUtils.countOccurrencesOf(json, "baseUrl"); + await().until(() -> rics.size() == noOfRicsInConfigFile); + } catch (Exception e) { + logger.info("Loaded rics: {}, and no of rics in config file: {} never matched!", rics.size(), + StringUtils.countOccurrencesOf(json, "baseUrl")); } } private static String title(String jsonSchema) { - JsonObject parsedSchema = (JsonObject) new JsonParser().parse(jsonSchema); + JsonObject parsedSchema = (JsonObject) JsonParser.parseString(jsonSchema); String title = parsedSchema.get("title").getAsString(); return title; } + private void loadInstances() throws IOException { + PolicyType unnamedPolicyType = policyTypes.get(""); + Ric ric = rics.get("ric1"); + String json = getConfigJsonFromFile(); + + Policy policy = ImmutablePolicy.builder() // + .id("typelessPolicy") // + .json(json) // + .ownerServiceName("MockPolicyAgent") // + .ric(ric) // + .type(unnamedPolicyType) // + .lastModified("now") // + .isTransient(false) // + .build(); + this.policies.put(policy); + } + + private String getConfigJsonFromFile() throws IOException { + File jsonFile = getFile("test_application_configuration.json"); + String json = new String(Files.readAllBytes(jsonFile.toPath())); + return json; + } + @Test - public void runMock() throws Exception { + @SuppressWarnings("squid:S2699") // Tests should include assertions. This test is only for keeping the server + // alive, so it will only be confusing to add an assertion. + void runMock() throws Exception { keepServerAlive(); }