X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Fmain%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FSdncOscA1Client.java;h=06259c7a6ca709bcf58c942e9500614bfce378c2;hb=deb5bb7b792ba3ac90e4c622cd804c83e4647b92;hp=4000b36213001b190e6bd9434bede158418658c1;hpb=336d24471b994ebe62828d5327e116f766bbfc85;p=nonrtric.git diff --git a/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncOscA1Client.java b/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncOscA1Client.java index 4000b362..06259c7a 100644 --- a/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncOscA1Client.java +++ b/policy-agent/src/main/java/org/oransc/policyagent/clients/SdncOscA1Client.java @@ -2,7 +2,7 @@ * ========================LICENSE_START================================= * O-RAN-SC * %% - * Copyright (C) 2019 Nordix Foundation + * Copyright (C) 2020 Nordix Foundation * %% * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,16 +20,9 @@ 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; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; import org.oransc.policyagent.configuration.RicConfig; import org.oransc.policyagent.repository.Policy; import org.slf4j.Logger; @@ -48,10 +41,6 @@ public class SdncOscA1Client implements A1Client { private final RicConfig ricConfig; private final AsyncRestClient restClient; - private static Gson gson = new GsonBuilder() // - .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES) // - .create(); // - public SdncOscA1Client(RicConfig ricConfig, String baseUrl, String username, String password) { this(ricConfig, username, password, new AsyncRestClient(baseUrl + "/restconf/operations")); if (logger.isDebugEnabled()) { @@ -71,29 +60,21 @@ public class SdncOscA1Client implements A1Client { SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // .nearRtRicUrl(ricConfig.baseUrl()) // .build(); - String inputJsonString = createInputJsonString(inputParams); + String inputJsonString = JsonHelper.createInputJsonString(inputParams); logger.debug("POST getPolicyTypeIdentities inputJsonString = {}", inputJsonString); return restClient .postWithAuthHeader(URL_PREFIX + "getPolicyTypeIdentities", inputJsonString, a1ControllerUsername, a1ControllerPassword) // - .flatMap(response -> getValueFromResponse(response, "policy-type-id-list")) // - .flatMap(this::parseJsonArrayOfString); + .flatMap(response -> JsonHelper.getValueFromResponse(response, "policy-type-id-list")) // + .flatMapMany(JsonHelper::parseJsonArrayOfString) // + .collectList(); } @Override public Mono> getPolicyIdentities() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(ricConfig.baseUrl()) // - .build(); - String inputJsonString = createInputJsonString(inputParams); - logger.debug("POST getPolicyIdentities inputJsonString = {}", inputJsonString); - - return restClient - .postWithAuthHeader(URL_PREFIX + "getPolicyIdentities", inputJsonString, a1ControllerUsername, - a1ControllerPassword) // - .flatMap(response -> getValueFromResponse(response, "policy-id-list")) // - .flatMap(this::parseJsonArrayOfString); + return getPolicyIds() // + .collectList(); } @Override @@ -102,14 +83,14 @@ public class SdncOscA1Client implements A1Client { .nearRtRicUrl(ricConfig.baseUrl()) // .policyTypeId(policyTypeId) // .build(); - String inputJsonString = createInputJsonString(inputParams); + String inputJsonString = JsonHelper.createInputJsonString(inputParams); logger.debug("POST getPolicyType inputJsonString = {}", inputJsonString); return restClient .postWithAuthHeader(URL_PREFIX + "getPolicyType", inputJsonString, a1ControllerUsername, a1ControllerPassword) // - .flatMap(response -> getValueFromResponse(response, "policy-type")) // - .flatMap(this::extractPolicySchema); + .flatMap(response -> JsonHelper.getValueFromResponse(response, "policy-type")) // + .flatMap(JsonHelper::extractPolicySchema); } @Override @@ -120,13 +101,13 @@ public class SdncOscA1Client implements A1Client { .policyId(policy.id()) // .policy(policy.json()) // .build(); - String inputJsonString = createInputJsonString(inputParams); + String inputJsonString = JsonHelper.createInputJsonString(inputParams); logger.debug("POST putPolicy inputJsonString = {}", inputJsonString); return restClient .postWithAuthHeader(URL_PREFIX + "putPolicy", inputJsonString, a1ControllerUsername, a1ControllerPassword) - .flatMap(response -> getValueFromResponse(response, "returned-policy")) // - .flatMap(this::validateJson); + .flatMap(response -> JsonHelper.getValueFromResponse(response, "returned-policy")) // + .flatMap(JsonHelper::validateJson); } @Override @@ -136,9 +117,8 @@ public class SdncOscA1Client implements A1Client { @Override public Flux deleteAllPolicies() { - return getPolicyIdentities() // - .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) // ) - .flatMap(policyId -> deletePolicyById(policyId)); // + return getPolicyIds() // + .flatMap(this::deletePolicyById); // } @Override @@ -149,59 +129,31 @@ public class SdncOscA1Client implements A1Client { @Override public Mono getPolicyStatus(Policy policy) { - return Mono.error(new Exception("Status not implemented in the SDNC controller")); - } - - private Mono getValueFromResponse(String response, String key) { - logger.debug("A1 client: response = {}", response); - 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 - return Mono.error(ex); - } - } + SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // + .nearRtRicUrl(ricConfig.baseUrl()) // + .policyId(policy.id()) // + .build(); + String inputJsonString = JsonHelper.createInputJsonString(inputParams); + logger.debug("POST getPolicyStatus inputJsonString = {}", inputJsonString); - private Mono> parseJsonArrayOfString(String inputString) { - try { - List 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)); - } - logger.debug("A1 client: received list = {}", arrayList); - return Mono.just(arrayList); - } catch (JSONException ex) { // invalid json - return Mono.error(ex); - } + return restClient + .postWithAuthHeader(URL_PREFIX + "getPolicyStatus", inputJsonString, a1ControllerUsername, + a1ControllerPassword) // + .flatMap(response -> JsonHelper.getValueFromResponse(response, "policy-status")); } - private Mono extractPolicySchema(String inputString) { - try { - JSONObject jsonObject = new JSONObject(inputString); - JSONObject schemaObject = jsonObject.getJSONObject("policySchema"); - String schemaString = schemaObject.toString(); - return Mono.just(schemaString); - } catch (JSONException ex) { // invalid json - return Mono.error(ex); - } - } + private Flux getPolicyIds() { + SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // + .nearRtRicUrl(ricConfig.baseUrl()) // + .build(); + String inputJsonString = JsonHelper.createInputJsonString(inputParams); + logger.debug("POST getPolicyIdentities inputJsonString = {}", inputJsonString); - private Mono validateJson(String inputString) { - try { - new JSONObject(inputString); - return Mono.just(inputString); - } catch (JSONException ex) { // invalid json - return Mono.error(ex); - } + return restClient + .postWithAuthHeader(URL_PREFIX + "getPolicyIdentities", inputJsonString, a1ControllerUsername, + a1ControllerPassword) // + .flatMap(response -> JsonHelper.getValueFromResponse(response, "policy-id-list")) // + .flatMapMany(JsonHelper::parseJsonArrayOfString); } private Mono deletePolicyById(String policyId) { @@ -210,16 +162,10 @@ public class SdncOscA1Client implements A1Client { .policyId(policyId) // .build(); - String inputJsonString = createInputJsonString(inputParams); + String inputJsonString = JsonHelper.createInputJsonString(inputParams); logger.debug("POST deletePolicy inputJsonString = {}", inputJsonString); return restClient.postWithAuthHeader(URL_PREFIX + "deletePolicy", inputJsonString, a1ControllerUsername, a1ControllerPassword); } - - private String createInputJsonString(SdncOscAdapterInput params) { - JSONObject inputJson = new JSONObject(); - inputJson.put("input", new JSONObject(gson.toJson(params))); - return inputJson.toString(); - } }