package org.oransc.policyagent.clients;
-import com.google.gson.FieldNamingPolicy;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
import java.util.Arrays;
import java.util.Vector;
import reactor.core.publisher.Mono;
public class A1ClientHelper {
- private static Gson gson = new GsonBuilder() //
- .setFieldNamingPolicy(FieldNamingPolicy.LOWER_CASE_WITH_DASHES) //
- .create();
private A1ClientHelper() {
}
- protected static <T> String createInputJsonString(T inputParams) {
- JSONObject inputJson = new JSONObject();
- inputJson.put("input", gson.toJson(inputParams));
- return inputJson.toString();
- }
-
protected static Mono<String> createOutputJsonResponse(String key, String value) {
JSONObject paramsJson = new JSONObject();
paramsJson.put(key, value);
SdncOnapA1Client.SdncOnapAdapterInput inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.build();
- String inputJsonString = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams);
List<String> policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID);
Mono<String> policyTypeIdsResp =
SdncOnapA1Client.SdncOnapAdapterInput inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.build();
- String inputJsonStringGetTypeIds = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringGetTypeIds = SdncJsonHelper.createInputJsonString(inputParams);
inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_1_ID) //
.build();
- String inputJsonStringGetPolicyIdsType1 = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringGetPolicyIdsType1 = SdncJsonHelper.createInputJsonString(inputParams);
inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_2_ID) //
.build();
- String inputJsonStringGetPolicyIdsType2 = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringGetPolicyIdsType2 = SdncJsonHelper.createInputJsonString(inputParams);
List<String> policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID);
Mono<String> policyTypeIdsResp =
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_1_ID) //
.build();
- String inputJsonString = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams);
String policyType = "{\"policySchema\": " + POLICY_TYPE_SCHEMA_VALID + ", \"statusSchema\": {} }";
Mono<String> policyTypeResp = A1ClientHelper.createOutputJsonResponse("policy-type", policyType);
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_1_ID) //
.build();
- String inputJsonString = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams);
String policyType = "{\"policySchema\": " + POLICY_TYPE_SCHEMA_INVALID + ", \"statusSchema\": {} }";
Mono<String> policyTypeResp = A1ClientHelper.createOutputJsonResponse("policy-type", policyType);
.policyInstance(POLICY_JSON_VALID) //
.properties(new ArrayList<String>()) //
.build();
- String inputJsonString = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams);
whenAsyncPostThenReturn(Mono.empty());
.policyTypeId(POLICY_TYPE_1_ID) //
.policyInstanceId(POLICY_1_ID) //
.build();
- String inputJsonString = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonString = SdncJsonHelper.createInputJsonString(inputParams);
whenAsyncPostThenReturn(Mono.empty());
SdncOnapA1Client.SdncOnapAdapterInput inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.build();
- String inputJsonStringGetTypeIds = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringGetTypeIds = SdncJsonHelper.createInputJsonString(inputParams);
inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_1_ID) //
.build();
- String inputJsonStringGetPolicyIdsType1 = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringGetPolicyIdsType1 = SdncJsonHelper.createInputJsonString(inputParams);
inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_2_ID) //
.build();
- String inputJsonStringGetPolicyIdsType2 = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringGetPolicyIdsType2 = SdncJsonHelper.createInputJsonString(inputParams);
inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_1_ID) //
.policyInstanceId(POLICY_1_ID) //
.build();
- String inputJsonStringDeletePolicy1 = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringDeletePolicy1 = SdncJsonHelper.createInputJsonString(inputParams);
inputParams = ImmutableSdncOnapAdapterInput.builder() //
.nearRtRicId(RIC_1_URL) //
.policyTypeId(POLICY_TYPE_2_ID) //
.policyInstanceId(POLICY_2_ID) //
.build();
- String inputJsonStringDeletePolicy2 = A1ClientHelper.createInputJsonString(inputParams);
+ String inputJsonStringDeletePolicy2 = SdncJsonHelper.createInputJsonString(inputParams);
List<String> policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID);
Mono<String> policyTypeIdsResp =
AdapterRequest expectedParams = ImmutableAdapterRequest.builder() //
.nearRtRicUrl(expUrl) //
.build();
- String expInput = A1ClientHelper.createInputJsonString(expectedParams);
+ String expInput = SdncJsonHelper.createInputJsonString(expectedParams);
verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_URL, expInput, CONTROLLER_USERNAME,
CONTROLLER_PASSWORD);
AdapterRequest expectedParams = ImmutableAdapterRequest.builder() //
.nearRtRicUrl(policiesUrl()) //
.build();
- String expInput = A1ClientHelper.createInputJsonString(expectedParams);
+ String expInput = SdncJsonHelper.createInputJsonString(expectedParams);
verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_URL, expInput, CONTROLLER_USERNAME,
CONTROLLER_PASSWORD);
.nearRtRicUrl(expUrl) //
.body(POLICY_JSON_VALID) //
.build();
- String expInput = A1ClientHelper.createInputJsonString(expectedInputParams);
+ String expInput = SdncJsonHelper.createInputJsonString(expectedInputParams);
verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD);
}
.nearRtRicUrl(expUrl) //
.body(policyJson) //
.build();
- String expRequest = A1ClientHelper.createInputJsonString(expRequestParams);
+ String expRequest = SdncJsonHelper.createInputJsonString(expRequestParams);
verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expRequest, CONTROLLER_USERNAME,
CONTROLLER_PASSWORD);
StepVerifier.create(returnedMono)
AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() //
.nearRtRicUrl(expUrl) //
.build();
- String expInput = A1ClientHelper.createInputJsonString(expectedInputParams);
+ String expInput = SdncJsonHelper.createInputJsonString(expectedInputParams);
verify(asyncRestClientMock).postWithAuthHeader(DELETE_A1_URL, expInput, CONTROLLER_USERNAME,
CONTROLLER_PASSWORD);
String returnedStatus = clientUnderTest.getPolicyStatus(policy).block();
- assertEquals("OK", returnedStatus, "unexpeted status");
+ assertEquals("OK", returnedStatus, "unexpected status");
final String expUrl = policiesUrl() + "/" + POLICY_1_ID + "/status";
AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() //
.nearRtRicUrl(expUrl) //
.build();
- String expInput = A1ClientHelper.createInputJsonString(expectedInputParams);
+ String expInput = SdncJsonHelper.createInputJsonString(expectedInputParams);
verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_STATUS_URL, expInput, CONTROLLER_USERNAME,
CONTROLLER_PASSWORD);
}
+ @Test
+ public void testGetVersion() {
+ whenPostReturnOkResponse();
+ A1ProtocolType returnedVersion = clientUnderTest.getProtocolVersion().block();
+ assertEquals(A1ProtocolType.SDNC_OSC_STD_V1_1, returnedVersion, "");
+ }
+
private void whenPostReturnOkResponse() {
AdapterResponse adapterResponse = ImmutableAdapterResponse.builder() //
.body("OK") //