X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FSdnrOnapA1Client.java;h=a12b8d50f3b3cea3bf2d6198a9f38f7b7ec8b76e;hb=refs%2Fchanges%2F55%2F2555%2F5;hp=4a0a506c950f789d6f7603490ca42c5fdf44beee;hpb=7dc42f177188d1e56da95d366d94a65d37b0cec6;p=nonrtric.git

diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/SdnrOnapA1Client.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/SdnrOnapA1Client.java
index 4a0a506c..a12b8d50 100644
--- a/policy-agent/src/main/java/org/oransc/policyagent/clients/SdnrOnapA1Client.java
+++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/SdnrOnapA1Client.java
@@ -20,6 +20,10 @@
 
 package org.oransc.policyagent.clients;
 
+import com.google.gson.FieldNamingPolicy;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
 import java.util.List;
@@ -37,29 +41,41 @@ import reactor.core.publisher.Mono;
 
 public class SdnrOnapA1Client implements A1Client {
     private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
-    private static final String A1_CONTROLLER_URL = "http://sdnc_controller_container:8181/restconf/operations";
-    private static final String A1_CONTROLLER_USERNAME = "admin";
-    private static final String A1_CONTROLLER_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U";
 
+    private final String a1ControllerUsername;
+    private final String a1ControllerPassword;
     private final RicConfig ricConfig;
     private final AsyncRestClient restClient;
 
-    public SdnrOnapA1Client(RicConfig ricConfig) {
+    private static Gson gson = new GsonBuilder() //
+        .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES) //
+        .create(); //
+
+    public SdnrOnapA1Client(RicConfig ricConfig, String baseUrl, String username, String password) {
+        this(ricConfig, username, password, new AsyncRestClient(baseUrl + "/restconf/operations"));
+        if (logger.isDebugEnabled()) {
+            logger.debug("SdnrOnapA1Client for ric: {}, a1ControllerBaseUrl: {}", ricConfig.name(), baseUrl);
+        }
+    }
+
+    public SdnrOnapA1Client(RicConfig ricConfig, String username, String password, AsyncRestClient restClient) {
         this.ricConfig = ricConfig;
-        this.restClient = new AsyncRestClient(A1_CONTROLLER_URL);
-        logger.debug("SdnrOnapA1Client for ric: {}", this.ricConfig.name());
+        this.a1ControllerUsername = username;
+        this.a1ControllerPassword = password;
+        this.restClient = restClient;
     }
 
     @Override
     public Mono<List<String>> getPolicyTypeIdentities() {
-        JSONObject paramsJson = new JSONObject();
-        paramsJson.put("near-rt-ric-id", ricConfig.baseUrl());
-        String inputJsonString = createInputJsonString(paramsJson);
+        SdnrOnapAdapterInput inputParams = ImmutableSdnrOnapAdapterInput.builder() //
+            .nearRtRicId(ricConfig.baseUrl()) //
+            .build();
+        String inputJsonString = createInputJsonString(inputParams);
         logger.debug("POST getPolicyTypeIdentities inputJsonString = {}", inputJsonString);
 
         return restClient
-            .postWithAuthHeader("/A1-ADAPTER-API:getPolicyTypes", inputJsonString, A1_CONTROLLER_USERNAME,
-                A1_CONTROLLER_PASSWORD) //
+            .postWithAuthHeader("/A1-ADAPTER-API:getPolicyTypes", inputJsonString, a1ControllerUsername,
+                a1ControllerPassword) //
             .flatMap(response -> getValueFromResponse(response, "policy-type-id-list")) //
             .flatMap(this::parseJsonArrayOfString);
     }
@@ -74,59 +90,63 @@ public class SdnrOnapA1Client implements A1Client {
     }
 
     public Mono<List<String>> getPolicyIdentities(String policyTypeId) {
-        JSONObject paramsJson = new JSONObject();
-        paramsJson.put("near-rt-ric-id", ricConfig.baseUrl());
-        paramsJson.put("policy-type-id", policyTypeId);
-        String inputJsonString = createInputJsonString(paramsJson);
+        SdnrOnapAdapterInput inputParams = ImmutableSdnrOnapAdapterInput.builder() //
+            .nearRtRicId(ricConfig.baseUrl()) //
+            .policyTypeId(policyTypeId) //
+            .build();
+        String inputJsonString = createInputJsonString(inputParams);
         logger.debug("POST getPolicyIdentities inputJsonString = {}", inputJsonString);
 
         return restClient
-            .postWithAuthHeader("/A1-ADAPTER-API:getPolicyInstances", inputJsonString, A1_CONTROLLER_USERNAME,
-                A1_CONTROLLER_PASSWORD) //
+            .postWithAuthHeader("/A1-ADAPTER-API:getPolicyInstances", inputJsonString, a1ControllerUsername,
+                a1ControllerPassword) //
             .flatMap(response -> getValueFromResponse(response, "policy-instance-id-list")) //
             .flatMap(this::parseJsonArrayOfString);
     }
 
     @Override
     public Mono<String> getPolicyTypeSchema(String policyTypeId) {
-        JSONObject paramsJson = new JSONObject();
-        paramsJson.put("near-rt-ric-id", ricConfig.baseUrl());
-        paramsJson.put("policy-type-id", policyTypeId);
-        String inputJsonString = createInputJsonString(paramsJson);
+        SdnrOnapAdapterInput inputParams = ImmutableSdnrOnapAdapterInput.builder() //
+            .nearRtRicId(ricConfig.baseUrl()) //
+            .policyTypeId(policyTypeId) //
+            .build();
+        String inputJsonString = createInputJsonString(inputParams);
         logger.debug("POST getPolicyType inputJsonString = {}", inputJsonString);
 
         return restClient
-            .postWithAuthHeader("/A1-ADAPTER-API:getPolicyType", inputJsonString, A1_CONTROLLER_USERNAME,
-                A1_CONTROLLER_PASSWORD) //
+            .postWithAuthHeader("/A1-ADAPTER-API:getPolicyType", inputJsonString, a1ControllerUsername,
+                a1ControllerPassword) //
             .flatMap(response -> getValueFromResponse(response, "policy-type")) //
             .flatMap(this::extractPolicySchema);
     }
 
     @Override
     public Mono<String> putPolicy(Policy policy) {
-        JSONObject paramsJson = new JSONObject();
-        paramsJson.put("near-rt-ric-id", ricConfig.baseUrl());
-        paramsJson.put("policy-instance-id", policy.id());
-        paramsJson.put("policy-type-id", policy.type().name());
-        paramsJson.put("policy-instance", policy.json());
-        paramsJson.put("properties", new JSONArray());
-        String inputJsonString = createInputJsonString(paramsJson);
+        SdnrOnapAdapterInput inputParams = ImmutableSdnrOnapAdapterInput.builder() //
+            .nearRtRicId(ricConfig.baseUrl()) //
+            .policyTypeId(policy.type().name()) //
+            .policyInstanceId(policy.id()) //
+            .policyInstance(policy.json()) //
+            .properties(new ArrayList<String>()) //
+            .build();
+        String inputJsonString = createInputJsonString(inputParams);
         logger.debug("POST putPolicy inputJsonString = {}", inputJsonString);
 
         return restClient.postWithAuthHeader("/A1-ADAPTER-API:createPolicyInstance", inputJsonString,
-            A1_CONTROLLER_USERNAME, A1_CONTROLLER_PASSWORD);
+            a1ControllerUsername, a1ControllerPassword);
     }
 
     public Mono<String> deletePolicy(String policyTypeId, String policyId) {
-        JSONObject paramsJson = new JSONObject();
-        paramsJson.put("near-rt-ric-id", ricConfig.baseUrl());
-        paramsJson.put("policy-instance-id", policyId);
-        paramsJson.put("policy-type-id", policyTypeId);
-        String inputJsonString = createInputJsonString(paramsJson);
+        SdnrOnapAdapterInput inputParams = ImmutableSdnrOnapAdapterInput.builder() //
+            .nearRtRicId(ricConfig.baseUrl()) //
+            .policyTypeId(policyTypeId) //
+            .policyInstanceId(policyId) //
+            .build();
+        String inputJsonString = createInputJsonString(inputParams);
         logger.debug("POST deletePolicy inputJsonString = {}", inputJsonString);
 
         return restClient.postWithAuthHeader("/A1-ADAPTER-API:deletePolicyInstance", inputJsonString,
-            A1_CONTROLLER_USERNAME, A1_CONTROLLER_PASSWORD);
+            a1ControllerUsername, a1ControllerPassword);
     }
 
     @Override
@@ -153,9 +173,9 @@ public class SdnrOnapA1Client implements A1Client {
             .flatMap(x -> Mono.just(A1ProtocolType.SDNR_ONAP));
     }
 
-    private String createInputJsonString(JSONObject paramsJson) {
+    private String createInputJsonString(SdnrOnapAdapterInput inputParams) {
         JSONObject inputJson = new JSONObject();
-        inputJson.put("input", paramsJson);
+        inputJson.put("input", new JSONObject(gson.toJson(inputParams)));
         return inputJson.toString();
     }
 
@@ -164,6 +184,9 @@ public class SdnrOnapA1Client implements A1Client {
         try {
             JSONObject outputJson = new JSONObject(response);
             JSONObject responseParams = outputJson.getJSONObject("output");
+            if (!responseParams.has(key)) {
+                return Mono.just("");
+            }
             String value = responseParams.get(key).toString();
             return Mono.just(value);
         } catch (JSONException ex) { // invalid json
@@ -174,6 +197,9 @@ public class SdnrOnapA1Client implements A1Client {
     private Mono<List<String>> parseJsonArrayOfString(String inputString) {
         try {
             List<String> arrayList = new ArrayList<>();
+            if (inputString.isEmpty()) {
+                return Mono.just(arrayList);
+            }
             JSONArray jsonArray = new JSONArray(inputString);
             for (int i = 0; i < jsonArray.length(); i++) {
                 arrayList.add(jsonArray.getString(i));
@@ -195,4 +221,9 @@ public class SdnrOnapA1Client implements A1Client {
             return Mono.error(ex);
         }
     }
+
+    @Override
+    public Mono<String> getPolicyStatus(Policy policy) {
+        return Mono.error(new Exception("Status not implemented in the controller"));
+    }
 }