X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2FApplicationTest.java;h=5b1f3ca4e028c7288a7a727f403886f5bdb945ea;hb=c3ed1a5199e3f5f539cc813b9a383dd156fed2e2;hp=d78155d4481160ff9d64582ffe2f0cd97218ea8e;hpb=4891734864ae374cf6ff357f41cc840c4f685300;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 d78155d4..5b1f3ca4 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java @@ -26,15 +26,16 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import com.google.gson.Gson; import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; +import com.google.gson.JsonArray; +import com.google.gson.JsonElement; +import com.google.gson.JsonParser; -import java.net.URL; +import java.util.ArrayList; import java.util.List; import java.util.Vector; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; -import org.oransc.policyagent.clients.A1Client; import org.oransc.policyagent.configuration.ApplicationConfig; import org.oransc.policyagent.configuration.ImmutableRicConfig; import org.oransc.policyagent.configuration.RicConfig; @@ -51,7 +52,10 @@ 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.repository.Services; +import org.oransc.policyagent.tasks.RepositorySupervision; import org.oransc.policyagent.utils.MockA1Client; +import org.oransc.policyagent.utils.MockA1ClientFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; @@ -79,15 +83,23 @@ public class ApplicationTest { @Autowired private PolicyTypes policyTypes; + @Autowired + MockA1ClientFactory a1ClientFactory; + + @Autowired + RepositorySupervision supervision; + + @Autowired + Services services; + private static Gson gson = new GsonBuilder() // .serializeNulls() // .create(); // public static class MockApplicationConfig extends ApplicationConfig { @Override - protected String getLocalConfigurationFilePath() { - URL url = MockApplicationConfig.class.getClassLoader().getResource("test_application_configuration.json"); - return url.getFile(); + public String getLocalConfigurationFilePath() { + return ""; // No config file loaded for the test } } @@ -96,8 +108,6 @@ public class ApplicationTest { */ @TestConfiguration static class TestBeanFactory { - private final Rics rics = new Rics(); - private final Policies policies = new Policies(); private final PolicyTypes policyTypes = new PolicyTypes(); @Bean @@ -106,13 +116,13 @@ public class ApplicationTest { } @Bean - A1Client getA1Client() { - return new MockA1Client(this.policyTypes); + MockA1ClientFactory getA1ClientFactory() { + return new MockA1ClientFactory(this.policyTypes); } @Bean public Policies getPolicies() { - return this.policies; + return new Policies(); } @Bean @@ -122,7 +132,7 @@ public class ApplicationTest { @Bean public Rics getRics() { - return this.rics; + return new Rics(); } } @@ -152,12 +162,36 @@ public class ApplicationTest { assertThat(rsp).isEqualTo("[]"); } + @Test + public void testRecovery() throws Exception { + reset(); + Policy policy = addPolicy("policyId", "typeName", "service", "ric"); // This should be created in the RIC + Policy policy2 = addPolicy("policyId2", "typeName", "service", "ric"); + + getA1Client("ric").putPolicy(policy2); // put it in the RIC + policies.remove(policy2); // Remove it from the repo -> should be deleted in the RIC + + supervision.checkAllRics(); // The created policy should be put in the RIC + Policies ricPolicies = getA1Client("ric").getPolicies(); + assertThat(ricPolicies.size()).isEqualTo(1); + Policy ricPolicy = ricPolicies.get("policyId"); + assertThat(ricPolicy.json()).isEqualTo(policy.json()); + } + + MockA1Client getA1Client(String ricName) throws ServiceException { + return a1ClientFactory.getOrCreateA1Client(ricName); + } + @Test public void testGetRic() throws Exception { reset(); + Ric ric = addRic("ric1"); + ric.addManagedElement("kista_1"); String url = baseUrl() + "/ric?managedElementId=kista_1"; + String rsp = this.restTemplate.getForObject(url, String.class); System.out.println(rsp); + assertThat(rsp).isEqualTo("ric1"); } @@ -201,7 +235,7 @@ public class ApplicationTest { Vector mes = new Vector<>(); RicConfig conf = ImmutableRicConfig.builder() // .name(ricName) // - .baseUrl("baseUrl") // + .baseUrl(ricName) // .managedElementIds(mes) // .build(); Ric ric = new Ric(conf); @@ -257,14 +291,6 @@ public class ApplicationTest { assertThat(policies.size()).isEqualTo(0); } - private static List parseList(String json, Class clazz) { - if (null == json) { - return null; - } - return gson.fromJson(json, new TypeToken() {}.getType()); - - } - @Test public void testGetPolicySchemas() throws Exception { reset(); @@ -278,13 +304,13 @@ public class ApplicationTest { assertThat(rsp).contains("type2"); assertThat(rsp).contains("title"); - List info = parseList(rsp, String.class); + List info = parseSchemas(rsp); assertEquals(2, info.size()); url = baseUrl() + "/policy_schemas?ric=ric1"; rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp).contains("type1"); - info = parseList(rsp, String.class); + info = parseSchemas(rsp); assertEquals(1, info.size()); } @@ -366,21 +392,48 @@ public class ApplicationTest { @Test public void testPutAndGetService() throws Exception { + // PUT putService("name"); - String url = baseUrl() + "/service?name=name"; + // GET + String url = baseUrl() + "/services?name=name"; String rsp = this.restTemplate.getForObject(url, String.class); - ServiceStatus status = gson.fromJson(rsp, ImmutableServiceStatus.class); + List info = parseList(rsp, ImmutableServiceStatus.class); + assertThat(info.size() == 1); + ServiceStatus status = info.iterator().next(); assertThat(status.keepAliveInterval() == 1); assertThat(status.name().equals("name")); + // GET (all) url = baseUrl() + "/services"; rsp = this.restTemplate.getForObject(url, String.class); assertThat(rsp.contains("name")); System.out.println(rsp); - url = baseUrl() + "/service/ping"; - this.restTemplate.put(url, "name"); + // DELETE + assertThat(services.size() == 1); + url = baseUrl() + "/services?name=name"; + this.restTemplate.delete(url); + assertThat(services.size() == 0); + } + + private static List parseList(String jsonString, Class clazz) { + List result = new ArrayList<>(); + JsonArray jsonArr = new JsonParser().parse(jsonString).getAsJsonArray(); + for (JsonElement jsonElement : jsonArr) { + T o = gson.fromJson(jsonElement.toString(), clazz); + result.add(o); + } + return result; + } + + private static List parseSchemas(String jsonString) { + JsonArray arrayOfSchema = new JsonParser().parse(jsonString).getAsJsonArray(); + List result = new ArrayList<>(); + for (JsonElement schemaObject : arrayOfSchema) { + result.add(schemaObject.toString()); + } + return result; } }