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;
public class SdncOscA1Client implements A1Client {
private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- private static final String A1_CONTROLLER_URL = "http://a1-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 SdncOscA1Client(RicConfig ricConfig) {
+ 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()) {
+ logger.debug("SdncOscA1Client for ric: {}, a1ControllerBaseUrl: {}", ricConfig.name(), baseUrl);
+ }
+ }
+
+ public SdncOscA1Client(RicConfig ricConfig, String username, String password, AsyncRestClient restClient) {
this.ricConfig = ricConfig;
- this.restClient = new AsyncRestClient(A1_CONTROLLER_URL);
- logger.debug("SdncOscA1Client 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-url", ricConfig.baseUrl());
- String inputJsonString = createInputJsonString(paramsJson);
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .build();
+ String inputJsonString = createInputJsonString(gson.toJson(inputParams));
logger.debug("POST getPolicyTypeIdentities inputJsonString = {}", inputJsonString);
return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:getPolicyTypeIdentities", inputJsonString, A1_CONTROLLER_USERNAME,
- A1_CONTROLLER_PASSWORD) //
+ .postWithAuthHeader("/A1-ADAPTER-API:getPolicyTypeIdentities", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword) //
.flatMap(response -> getValueFromResponse(response, "policy-type-id-list")) //
.flatMap(this::parseJsonArrayOfString);
}
@Override
public Mono<List<String>> getPolicyIdentities() {
- 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 = createInputJsonString(gson.toJson(inputParams));
logger.debug("POST getPolicyIdentities inputJsonString = {}", inputJsonString);
return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:getPolicyIdentities", inputJsonString, A1_CONTROLLER_USERNAME,
- A1_CONTROLLER_PASSWORD) //
+ .postWithAuthHeader("/A1-ADAPTER-API:getPolicyIdentities", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword) //
.flatMap(response -> getValueFromResponse(response, "policy-id-list")) //
.flatMap(this::parseJsonArrayOfString);
}
@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 = createInputJsonString(gson.toJson(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-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 = createInputJsonString(gson.toJson(inputParams));
logger.debug("POST putPolicy inputJsonString = {}", inputJsonString);
return restClient
- .postWithAuthHeader("/A1-ADAPTER-API:putPolicy", inputJsonString, A1_CONTROLLER_USERNAME,
- A1_CONTROLLER_PASSWORD) //
+ .postWithAuthHeader("/A1-ADAPTER-API:putPolicy", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword) //
.flatMap(response -> getValueFromResponse(response, "returned-policy")) //
.flatMap(this::validateJson);
}
}
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);
+ SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() //
+ .nearRtRicUrl(ricConfig.baseUrl()) //
+ .policyId(policyId) //
+ .build();
+ String inputJsonString = createInputJsonString(gson.toJson(inputParams));
logger.debug("POST deletePolicy inputJsonString = {}", inputJsonString);
- return restClient.postWithAuthHeader("/A1-ADAPTER-API:deletePolicy", inputJsonString, A1_CONTROLLER_USERNAME,
- A1_CONTROLLER_PASSWORD);
+ return restClient.postWithAuthHeader("/A1-ADAPTER-API:deletePolicy", inputJsonString, a1ControllerUsername,
+ a1ControllerPassword);
}
@Override
.flatMap(x -> Mono.just(A1ProtocolType.SDNC_OSC));
}
- private String createInputJsonString(JSONObject paramsJson) {
+ private String createInputJsonString(String paramsJson) {
JSONObject inputJson = new JSONObject();
- inputJson.put("input", paramsJson);
+ inputJson.put("input", new JSONObject(paramsJson));
return inputJson.toString();
}
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
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));
return Mono.error(ex);
}
}
+
+ @Override
+ public Mono<String> getPolicyStatus(Policy policy) {
+ return Mono.error(new Exception("Status not implemented in the SDNC controller"));
+ }
}