X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=dashboard%2Fwebapp-backend%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fric%2Fportal%2Fdashboard%2Fpolicyagentapi%2FPolicyAgentApiImpl.java;h=d83023b70aa42f53d4caaf8e446ca8adf2ca915e;hb=a76d95e9292f99dfb5cd5782ef6d7bb2ec293fd7;hp=8236de1d52db3e4c61890030f89cdd656b02ab16;hpb=9de32bd6e23b01413d1319e668235568068b3699;p=nonrtric.git

diff --git a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java
index 8236de1d..d83023b7 100644
--- a/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java
+++ b/dashboard/webapp-backend/src/main/java/org/oransc/ric/portal/dashboard/policyagentapi/PolicyAgentApiImpl.java
@@ -31,12 +31,18 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestClientException;
 import org.springframework.web.client.RestTemplate;
 
+import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Vector;
 import java.lang.invoke.MethodHandles;
 import java.lang.reflect.Type;
 
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParser;
 import com.google.gson.annotations.SerializedName;
 import com.google.gson.reflect.TypeToken;
 
@@ -77,22 +83,20 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
         public String schema();
     }
 
-    private PolicyType toPolicyType(PolicyTypeInfo i) {
-        return new PolicyType(i.name(), i.schema());
-    }
-
     @Override
     public PolicyTypes getAllPolicyTypes() throws RestClientException {
-        String url = baseUrl() + "/policy_types";
+        String url = baseUrl() + "/policy_schemas";
         String rsp = this.restTemplate.getForObject(url, String.class);
 
-        Type listType = new TypeToken<List<ImmutablePolicyTypeInfo>>() {
-        }.getType();
-        List<PolicyTypeInfo> rspParsed = gson.fromJson(rsp, listType);
-
         PolicyTypes result = new PolicyTypes();
-        for (PolicyTypeInfo i : rspParsed) {
-            result.add(toPolicyType(i));
+        JsonParser jsonParser = new JsonParser();
+        JsonArray schemas = jsonParser.parse(rsp).getAsJsonArray();
+        for (JsonElement schema : schemas) {
+            JsonObject schemaObj = schema.getAsJsonObject();
+            String title = schemaObj.get("title").getAsString();
+            String schemaAsStr = schemaObj.toString();
+            PolicyType pt = new PolicyType(title, schemaAsStr);
+            result.add(pt);
         }
         return result;
     }
@@ -112,7 +116,6 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
             result.add(p);
         }
         return result;
-
     }
 
     @Override
@@ -124,12 +127,13 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     }
 
     @Override
-    public void putPolicy(String policyTypeIdString, String policyInstanceId, String json) throws RestClientException {
+    public void putPolicy(String policyTypeIdString, String policyInstanceId, String json, String ric)
+            throws RestClientException {
         String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
         Map<String, ?> uriVariables = Map.of( //
                 "type", policyTypeIdString, //
                 "instance", policyInstanceId, //
-                "ric", "ric1", // TODO
+                "ric", ric, //
                 "service", "dashboard");
 
         this.restTemplate.put(url, json, uriVariables);
@@ -142,4 +146,31 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
         this.restTemplate.delete(url, uriVariables);
     }
 
+    @Value.Immutable
+    @Gson.TypeAdapters
+    interface RicInfo {
+        public String name();
+
+        public Collection<String> nodeNames();
+
+        public Collection<String> policyTypes();
+    }
+
+    @Override
+    public Collection<String> getRicsSupportingType(String typeName) {
+        String url = baseUrl() + "/rics?policyType={typeName}";
+        Map<String, ?> uriVariables = Map.of("typeName", typeName);
+        String rsp = this.restTemplate.getForObject(url, String.class, uriVariables);
+
+        Type listType = new TypeToken<List<ImmutableRicInfo>>() {
+        }.getType();
+        List<RicInfo> rspParsed = gson.fromJson(rsp, listType);
+
+        Collection<String> result = new Vector<>(rspParsed.size());
+        for (RicInfo ric : rspParsed) {
+            result.add(ric.name());
+        }
+        return result;
+    }
+
 }