X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FStdA1Client.java;h=1c40308a8d21abbd9357ba8149af2ac1ce4fd6d8;hb=f3461cb776023b950d62edd25eca148b6d354c9c;hp=4eb0c06b076d181d33744762e77a828a4b954b6d;hpb=95db19e2820102db0255ca57407faa333cbb4085;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
index 4eb0c06b..1c40308a 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/StdA1Client.java
@@ -22,7 +22,6 @@ package org.oransc.policyagent.clients;
 
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 
 import org.json.JSONArray;
@@ -32,61 +31,59 @@ import org.oransc.policyagent.configuration.RicConfig;
 import org.oransc.policyagent.repository.Policy;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 
 public class StdA1Client implements A1Client {
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
 
-    private final RicConfig ricConfig;
     private final AsyncRestClient restClient;
 
     public StdA1Client(RicConfig ricConfig) {
-        this.ricConfig = ricConfig;
-        this.restClient = new AsyncRestClient(getBaseUrl());
+        String baseUrl = ricConfig.baseUrl() + "/A1-P/v1";
+        this.restClient = new AsyncRestClient(baseUrl);
     }
 
     public StdA1Client(RicConfig ricConfig, AsyncRestClient restClient) {
-        this.ricConfig = ricConfig;
         this.restClient = restClient;
     }
 
     @Override
-    public Mono<Collection<String>> getPolicyTypeIdentities() {
-        logger.debug("getPolicyTypeIdentities nearRtRicUrl = {}", ricConfig.baseUrl());
-        return restClient.get("/policytypes/identities") //
+    public Mono<List<String>> getPolicyIdentities() {
+        return restClient.get("/policies") //
             .flatMap(this::parseJsonArrayOfString);
     }
 
     @Override
-    public Mono<Collection<String>> getPolicyIdentities() {
-        logger.debug("getPolicyIdentities nearRtRicUrl = {}", ricConfig.baseUrl());
-        return restClient.get("/policies/identities") //
+    public Mono<String> putPolicy(Policy policy) {
+        String url = "/policies/" + policy.id() + "?policyTypeId=" + policy.type().name();
+        return restClient.put(url, policy.json()) //
+            .flatMap(this::validateJson);
+    }
+
+    @Override
+    public Mono<List<String>> getPolicyTypeIdentities() {
+        return restClient.get("/policytypes") //
             .flatMap(this::parseJsonArrayOfString);
     }
 
     @Override
     public Mono<String> getPolicyTypeSchema(String policyTypeId) {
-        logger.debug("getPolicyType nearRtRicUrl = {}, policyTypeId = {}", ricConfig.baseUrl(), policyTypeId);
-        Mono<String> response = restClient.get("/policytypes/" + policyTypeId);
-        return response.flatMap(this::createMono);
+        return restClient.get("/policytypes/" + policyTypeId) //
+            .flatMap(this::extractPolicySchema);
     }
 
     @Override
-    public Mono<String> putPolicy(Policy policy) {
-        logger.debug("putPolicy nearRtRicUrl = {}, policyId = {}, policyString = {}", //
-            policy.ric().getConfig().baseUrl(), policy.id(), policy.json());
-        // TODO update when simulator is updated to include policy type
-        // Mono<String> response = client.put("/policies/" + policy.id() + "?policyTypeId=" + policy.type().name(),
-        // policy.json());
-        Mono<String> response = restClient.put("/policies/" + policy.id(), policy.json());
-
-        return response.flatMap(this::createMono);
+    public Mono<String> deletePolicy(Policy policy) {
+        return deletePolicy(policy.id());
     }
 
     @Override
-    public Mono<String> deletePolicy(String policyId) {
-        logger.debug("deletePolicy nearRtRicUrl = {}, policyId = {}", ricConfig.baseUrl(), policyId);
-        return restClient.delete("/policies/" + policyId);
+    public Flux<String> deleteAllPolicies() {
+        return getPolicyIdentities() //
+            .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) // )
+            .flatMap(policyId -> deletePolicy(policyId)); //
     }
 
     @Override
@@ -95,11 +92,11 @@ public class StdA1Client implements A1Client {
             .flatMap(x -> Mono.just(A1ProtocolType.STD_V1));
     }
 
-    private String getBaseUrl() {
-        return ricConfig.baseUrl() + "/A1-P/v1";
+    private Mono<String> deletePolicy(String policyId) {
+        return restClient.delete("/policies/" + policyId);
     }
 
-    private Mono<Collection<String>> parseJsonArrayOfString(String inputString) {
+    private Mono<List<String>> parseJsonArrayOfString(String inputString) {
         try {
             List<String> arrayList = new ArrayList<>();
             JSONArray jsonArray = new JSONArray(inputString);
@@ -113,12 +110,21 @@ public class StdA1Client implements A1Client {
         }
     }
 
-    private Mono<String> createMono(String inputString) {
+    private Mono<String> extractPolicySchema(String inputString) {
         try {
             JSONObject jsonObject = new JSONObject(inputString);
-            String jsonString = jsonObject.toString();
-            logger.debug("A1 client: received string = {}", jsonString);
-            return Mono.just(jsonString);
+            JSONObject schemaObject = jsonObject.getJSONObject("policySchema");
+            String schemaString = schemaObject.toString();
+            return Mono.just(schemaString);
+        } catch (JSONException ex) { // invalid json
+            return Mono.error(ex);
+        }
+    }
+
+    private Mono<String> validateJson(String inputString) {
+        try {
+            new JSONObject(inputString);
+            return Mono.just(inputString);
         } catch (JSONException ex) { // invalid json
             return Mono.error(ex);
         }