* ========================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.
package org.oransc.policyagent.clients;
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;
import reactor.core.publisher.Mono;
public class SdncOscA1Client implements A1Client {
+ private static final String URL_PREFIX = "/A1-ADAPTER-API:";
+
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private String a1ControllerBaseUrl;
- private String a1ControllerUsername;
- private String a1ControllerPassword;
+ private final String a1ControllerUsername;
+ private final String a1ControllerPassword;
private final RicConfig ricConfig;
private final AsyncRestClient restClient;
public SdncOscA1Client(RicConfig ricConfig, String baseUrl, String username, String password) {
+ this(ricConfig, username, password, new AsyncRestClient(baseUrl + "/restconf/operations"));
+ if (logger.isDebugEnabled()) {
+ logger.debug("SdncOscA1Client for ric: {}, a1ControllerBaseUrl: {}", ricConfig.name(), baseUrl);
+ }
+ }
+
+ public SdncOscA1Client(RicConfig ricConfig, String username, String password, AsyncRestClient restClient) {
this.ricConfig = ricConfig;
- this.a1ControllerBaseUrl = baseUrl;
this.a1ControllerUsername = username;
this.a1ControllerPassword = password;
- this.restClient = new AsyncRestClient(a1ControllerBaseUrl + "/restconf/operations");
- logger.debug("SdncOscA1Client for ric: {}, a1ControllerBaseUrl: {}", this.ricConfig.name(),
- a1ControllerBaseUrl);
+ this.restClient = restClient;
}
@Override
public Mono<List<String>> getPolicyTypeIdentities() {
- JSONObject paramsJson = new JSONObject();
- paramsJson.put("near-rt-ric-url", ricConfig.baseUrl());
- String inputJsonString = createInputJsonString(paramsJson);
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .build();
+ String inputJsonString = JsonHelper.createInputJsonString(inputParams);
logger.debug("POST getPolicyTypeIdentities inputJsonString = {}", inputJsonString);
return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:getPolicyTypeIdentities", inputJsonString, a1ControllerUsername,
+ .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<List<String>> getPolicyIdentities() {
- JSONObject paramsJson = new JSONObject();
- paramsJson.put("near-rt-ric-url", ricConfig.baseUrl());
- String inputJsonString = createInputJsonString(paramsJson);
- logger.debug("POST getPolicyIdentities inputJsonString = {}", inputJsonString);
-
- return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:getPolicyIdentities", inputJsonString, a1ControllerUsername,
- a1ControllerPassword) //
- .flatMap(response -> getValueFromResponse(response, "policy-id-list")) //
- .flatMap(this::parseJsonArrayOfString);
+ return getPolicyIds() //
+ .collectList();
}
@Override
public Mono<String> getPolicyTypeSchema(String policyTypeId) {
- JSONObject paramsJson = new JSONObject();
- paramsJson.put("near-rt-ric-url", ricConfig.baseUrl());
- paramsJson.put("policy-type-id", policyTypeId);
- String inputJsonString = createInputJsonString(paramsJson);
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .policyTypeId(policyTypeId) //
+ .build();
+ String inputJsonString = JsonHelper.createInputJsonString(inputParams);
logger.debug("POST getPolicyType inputJsonString = {}", inputJsonString);
return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:getPolicyType", inputJsonString, a1ControllerUsername,
+ .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
public Mono<String> putPolicy(Policy policy) {
- JSONObject paramsJson = new JSONObject();
- paramsJson.put("near-rt-ric-url", ricConfig.baseUrl());
- paramsJson.put("policy-id", policy.id());
- paramsJson.put("policy-type-id", policy.type().name());
- paramsJson.put("policy", policy.json());
- String inputJsonString = createInputJsonString(paramsJson);
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .policyTypeId(policy.type().name()) //
+ .policyId(policy.id()) //
+ .policy(policy.json()) //
+ .build();
+ String inputJsonString = JsonHelper.createInputJsonString(inputParams);
logger.debug("POST putPolicy inputJsonString = {}", inputJsonString);
return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:putPolicy", inputJsonString, a1ControllerUsername,
- a1ControllerPassword) //
- .flatMap(response -> getValueFromResponse(response, "returned-policy")) //
- .flatMap(this::validateJson);
+ .postWithAuthHeader(URL_PREFIX + "putPolicy", inputJsonString, a1ControllerUsername, a1ControllerPassword)
+ .flatMap(response -> JsonHelper.getValueFromResponse(response, "returned-policy")) //
+ .flatMap(JsonHelper::validateJson);
}
@Override
public Mono<String> deletePolicy(Policy policy) {
- return deletePolicy(policy.id());
+ return deletePolicyById(policy.id());
}
@Override
public Flux<String> deleteAllPolicies() {
- return getPolicyIdentities() //
- .flatMapMany(policyIds -> Flux.fromIterable(policyIds)) // )
- .flatMap(policyId -> deletePolicy(policyId)); //
- }
-
- public Mono<String> deletePolicy(String policyId) {
- JSONObject paramsJson = new JSONObject();
- paramsJson.put("near-rt-ric-url", ricConfig.baseUrl());
- paramsJson.put("policy-id", policyId);
- String inputJsonString = createInputJsonString(paramsJson);
- logger.debug("POST deletePolicy inputJsonString = {}", inputJsonString);
-
- return restClient.postWithAuthHeader("/A1-ADAPTER-API:deletePolicy", inputJsonString, a1ControllerUsername,
- a1ControllerPassword);
+ return getPolicyIds() //
+ .flatMap(this::deletePolicyById); //
}
@Override
.flatMap(x -> Mono.just(A1ProtocolType.SDNC_OSC));
}
- private String createInputJsonString(JSONObject paramsJson) {
- JSONObject inputJson = new JSONObject();
- inputJson.put("input", paramsJson);
- return inputJson.toString();
- }
+ @Override
+ public Mono<String> getPolicyStatus(Policy policy) {
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .policyId(policy.id()) //
+ .build();
+ String inputJsonString = JsonHelper.createInputJsonString(inputParams);
+ logger.debug("POST getPolicyStatus inputJsonString = {}", inputJsonString);
- private Mono<String> 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);
- }
+ return restClient
+ .postWithAuthHeader(URL_PREFIX + "getPolicyStatus", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword) //
+ .flatMap(response -> JsonHelper.getValueFromResponse(response, "policy-status"));
}
- 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));
- }
- logger.debug("A1 client: received list = {}", arrayList);
- return Mono.just(arrayList);
- } catch (JSONException ex) { // invalid json
- return Mono.error(ex);
- }
- }
+ private Flux<String> getPolicyIds() {
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .build();
+ String inputJsonString = JsonHelper.createInputJsonString(inputParams);
+ logger.debug("POST getPolicyIdentities inputJsonString = {}", inputJsonString);
- private Mono<String> 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);
- }
+ return restClient
+ .postWithAuthHeader(URL_PREFIX + "getPolicyIdentities", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword) //
+ .flatMap(response -> JsonHelper.getValueFromResponse(response, "policy-id-list")) //
+ .flatMapMany(JsonHelper::parseJsonArrayOfString);
}
- private Mono<String> validateJson(String inputString) {
- try {
- new JSONObject(inputString);
- return Mono.just(inputString);
- } catch (JSONException ex) { // invalid json
- return Mono.error(ex);
- }
+ private Mono<String> deletePolicyById(String policyId) {
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .policyId(policyId) //
+ .build();
+
+ String inputJsonString = JsonHelper.createInputJsonString(inputParams);
+ logger.debug("POST deletePolicy inputJsonString = {}", inputJsonString);
+
+ return restClient.postWithAuthHeader(URL_PREFIX + "deletePolicy", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword);
}
}
Code Review / nonrtric.git / blobdiff