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 String a1ControllerBaseUrl;
- private String a1ControllerUsername;
- private String a1ControllerPassword;
+ private final String a1ControllerUsername;
+ private final String a1ControllerPassword;
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()) {
+ 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 = createInputJsonString(gson.toJson(inputParams));
logger.debug("POST getPolicyTypeIdentities inputJsonString = {}", inputJsonString);
return restClient
@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
@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
@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
}
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, a1ControllerUsername,
.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();
}