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=8a6523c4ca0b923251434b53e25c90d807d43bfc;hb=ffe0c150f08205d73ee362f58f492aeb2703f295;hp=83ee76037a976d3f3bedf45a933e5dee0548168a;hpb=bbc4aa48f60dc70154ff07c2143918053f1c9154;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 83ee7603..8a6523c4 100644
--- a/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
+++ b/policy-agent/src/test/java/org/oransc/policyagent/ApplicationTest.java
@@ -21,6 +21,7 @@
 package org.oransc.policyagent;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.Assert.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 
 import com.google.gson.Gson;
@@ -38,7 +39,6 @@ import org.oransc.policyagent.configuration.ImmutableRicConfig;
 import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.controllers.ImmutableServiceRegistrationInfo;
 import org.oransc.policyagent.controllers.ImmutableServiceStatus;
-import org.oransc.policyagent.controllers.PolicyTypeInfo;
 import org.oransc.policyagent.controllers.ServiceRegistrationInfo;
 import org.oransc.policyagent.controllers.ServiceStatus;
 import org.oransc.policyagent.exceptions.ServiceException;
@@ -125,6 +125,8 @@ public class ApplicationTest {
 
     @Test
     public void testGetRics() throws Exception {
+        reset();
+        addRic("kista_1");
         String url = baseUrl() + "/rics";
         String rsp = this.restTemplate.getForObject(url, String.class);
         System.out.println(rsp);
@@ -132,14 +134,15 @@ public class ApplicationTest {
 
         url = baseUrl() + "/rics?policyType=ANR";
         rsp = this.restTemplate.getForObject(url, String.class);
-        // TODO this should test that the correct types are retrieved from the RIC
         assertThat(rsp).isEqualTo("[]");
     }
 
     @Test
     public void testGetRic() throws Exception {
+        reset();
         String url = baseUrl() + "/ric?managedElementId=kista_1";
         String rsp = this.restTemplate.getForObject(url, String.class);
+        System.out.println(rsp);
         assertThat(rsp).isEqualTo("ric1");
     }
 
@@ -151,11 +154,11 @@ public class ApplicationTest {
 
         String url = baseUrl() + "/policy?type=type1&instance=instance1&ric=ric1&service=service1";
         String json = "{}";
-        addPolicyType("type1");
+        addPolicyType("type1", "ric1");
 
         this.restTemplate.put(url, json);
 
-        Policy policy = policies.get("instance1");
+        Policy policy = policies.getPolicy("instance1");
 
         assertThat(policy).isNotNull();
         assertThat(policy.id()).isEqualTo("instance1");
@@ -166,18 +169,27 @@ public class ApplicationTest {
         System.out.println(rsp);
     }
 
-    private PolicyType addPolicyType(String name) {
+    private PolicyType addPolicyType(String policyTypeName, String ricName) {
         PolicyType type = ImmutablePolicyType.builder() //
-            .name(name) //
+            .name(policyTypeName) //
+            .schema("{\"title\":\"" + policyTypeName + "\"}") //
             .build();
 
         policyTypes.put(type);
+        addRic(ricName).addSupportedPolicyType(type);
         return type;
     }
 
-    private Ric addRic(String name) {
+    private Ric addRic(String ricName) {
+        if (rics.get(ricName) != null) {
+            return rics.get(ricName);
+        }
         Vector<String> mes = new Vector<>();
-        RicConfig conf = ImmutableRicConfig.builder().name(name).baseUrl("baseUrl").managedElementIds(mes).build();
+        RicConfig conf = ImmutableRicConfig.builder() //
+            .name(ricName) //
+            .baseUrl("baseUrl") //
+            .managedElementIds(mes) //
+            .build();
         Ric ric = new Ric(conf);
         this.rics.put(ric);
         return ric;
@@ -189,7 +201,7 @@ public class ApplicationTest {
             .json("{}") //
             .ownerServiceName(service) //
             .ric(rics.getRic(ric)) //
-            .type(addPolicyType(typeName)) //
+            .type(addPolicyType(typeName, ric)) //
             .lastModified("lastModified").build();
         policies.put(p);
         return p;
@@ -235,23 +247,58 @@ public class ApplicationTest {
             return null;
         }
         return gson.fromJson(json, new TypeToken<T>() {}.getType());
+
     }
 
     @Test
-    public void testGetPolicyTypes() throws Exception {
+    public void testGetPolicySchemas() throws Exception {
         reset();
-        addPolicy("id1", "type1", "service1");
-        addPolicy("id2", "type2", "service2");
+        addPolicyType("type1", "ric1");
+        addPolicyType("type2", "ric2");
 
-        String url = baseUrl() + "/policy_types";
+        String url = baseUrl() + "/policy_schemas";
         String rsp = this.restTemplate.getForObject(url, String.class);
-        System.out.println(rsp);
+        System.out.println("*** " + rsp);
         assertThat(rsp).contains("type1");
         assertThat(rsp).contains("type2");
+        assertThat(rsp).contains("title");
+
+        List<String> info = parseList(rsp, String.class);
+        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);
+        assertEquals(1, info.size());
+    }
+
+    @Test
+    public void testGetPolicySchema() throws Exception {
+        reset();
+        addPolicyType("type1", "ric1");
+        addPolicyType("type2", "ric2");
+
+        String url = baseUrl() + "/policy_schema?id=type1";
+        String rsp = this.restTemplate.getForObject(url, String.class);
+        System.out.println(rsp);
+        assertThat(rsp).contains("type1");
+        assertThat(rsp).contains("title");
+    }
+
+    @Test
+    public void testGetPolicyTypes() throws Exception {
+        reset();
+        addPolicyType("type1", "ric1");
+        addPolicyType("type2", "ric2");
 
-        List<PolicyTypeInfo> info = parseList(rsp, PolicyTypeInfo.class);
-        System.out.println(info.size());
+        String url = baseUrl() + "/policy_types";
+        String rsp = this.restTemplate.getForObject(url, String.class);
+        assertThat(rsp).isEqualTo("[\"type2\",\"type1\"]");
 
+        url = baseUrl() + "/policy_types?ric=ric1";
+        rsp = this.restTemplate.getForObject(url, String.class);
+        assertThat(rsp).isEqualTo("[\"type1\"]");
     }
 
     @Test