X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FA1ClientImpl.java;h=e576638588fe8ff6eb986a921011fb312fc2d6ea;hb=7a4a590fb0ebf8772169625cdda327da43c79c6d;hp=b3773b8e0910413c92461e916acae75ef6dfd5c8;hpb=de026fb34e3dc3200acdb022782fe68615176ead;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java index b3773b8e..e5766385 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/A1ClientImpl.java @@ -28,6 +28,7 @@ import java.util.List; import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; +import org.oransc.policyagent.repository.Policy; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import reactor.core.publisher.Mono; @@ -39,7 +40,7 @@ public class A1ClientImpl implements A1Client { return nearRtRicUrl + "/A1-P/v1"; } - public AsyncRestClient createClient(final String nearRtRicUrl) { + protected AsyncRestClient createClient(final String nearRtRicUrl) { return new AsyncRestClient(getBaseUrl(nearRtRicUrl)); } @@ -68,11 +69,15 @@ public class A1ClientImpl implements A1Client { } @Override - public Mono putPolicy(String nearRtRicUrl, String policyId, String policyString) { - logger.debug("putPolicy nearRtRicUrl = {}, policyId = {}, policyString = {}", nearRtRicUrl, policyId, - policyString); - AsyncRestClient client = createClient(nearRtRicUrl); - Mono response = client.put("/policies/" + policyId, policyString); + public Mono putPolicy(Policy policy) { + logger.debug("putPolicy nearRtRicUrl = {}, policyId = {}, policyString = {}", // + policy.ric().getConfig().baseUrl(), policy.id(), policy.json()); + AsyncRestClient client = createClient(policy.ric().getConfig().baseUrl()); + // TODO update when simulator is updated to include policy type + // Mono response = client.put("/policies/" + policy.id() + "?policyTypeId=" + policy.type().name(), + // policy.json()); + Mono response = client.put("/policies/" + policy.id(), policy.json()); + return response.flatMap(this::createMono); }