X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=policy-agent%2Fsrc%2Ftest%2Fjava%2Forg%2Foransc%2Fpolicyagent%2Fclients%2FSdncOscA1ClientTest.java;h=cba60e795a292e8ed4026cf7c764c75afb6ccb23;hb=254eab2d525ad00ac092d6859d21cbab8e42746a;hp=b451a0a7b1c98d3291f41f7eda7951cea3a24058;hpb=336d24471b994ebe62828d5327e116f766bbfc85;p=nonrtric.git diff --git a/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java b/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java index b451a0a7..cba60e79 100644 --- a/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java +++ b/policy-agent/src/test/java/org/oransc/policyagent/clients/SdncOscA1ClientTest.java @@ -20,22 +20,31 @@ package org.oransc.policyagent.clients; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.google.gson.Gson; + import java.util.Arrays; import java.util.List; -import org.json.JSONException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.stubbing.OngoingStubbing; +import org.oransc.policyagent.clients.A1Client.A1ProtocolType; +import org.oransc.policyagent.clients.SdncOscA1Client.AdapterRequest; +import org.oransc.policyagent.clients.SdncOscA1Client.AdapterResponse; +import org.oransc.policyagent.configuration.ControllerConfig; +import org.oransc.policyagent.configuration.ImmutableControllerConfig; +import org.oransc.policyagent.repository.Policy; +import org.oransc.policyagent.repository.Ric; +import org.springframework.web.reactive.function.client.WebClientResponseException; -import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import reactor.test.StepVerifier; @@ -44,197 +53,198 @@ public class SdncOscA1ClientTest { private static final String CONTROLLER_USERNAME = "username"; private static final String CONTROLLER_PASSWORD = "password"; private static final String RIC_1_URL = "RicUrl"; - private static final String POLICYTYPES_IDENTITIES_URL = "/A1-ADAPTER-API:getPolicyTypeIdentities"; - private static final String POLICIES_IDENTITIES_URL = "/A1-ADAPTER-API:getPolicyIdentities"; - private static final String POLICYTYPES_URL = "/A1-ADAPTER-API:getPolicyType"; - private static final String PUT_POLICY_URL = "/A1-ADAPTER-API:putPolicy"; - private static final String DELETE_POLICY_URL = "/A1-ADAPTER-API:deletePolicy"; - + private static final String GET_A1_POLICY_URL = "/A1-ADAPTER-API:getA1Policy"; + private static final String PUT_A1_URL = "/A1-ADAPTER-API:putA1Policy"; + private static final String DELETE_A1_URL = "/A1-ADAPTER-API:deleteA1Policy"; + private static final String GET_A1_POLICY_STATUS_URL = "/A1-ADAPTER-API:getA1PolicyStatus"; private static final String POLICY_TYPE_1_ID = "type1"; - private static final String POLICY_TYPE_2_ID = "type2"; - private static final String POLICY_TYPE_SCHEMA_VALID = "{\"type\":\"type1\"}"; - private static final String POLICY_TYPE_SCHEMA_INVALID = "\"type\":\"type1\"}"; private static final String POLICY_1_ID = "policy1"; private static final String POLICY_2_ID = "policy2"; private static final String POLICY_JSON_VALID = "{\"scope\":{\"ueId\":\"ue1\"}}"; - private static final String POLICY_JSON_INVALID = "\"scope\":{\"ueId\":\"ue1\"}}"; SdncOscA1Client clientUnderTest; AsyncRestClient asyncRestClientMock; + private ControllerConfig controllerConfig() { + return ImmutableControllerConfig.builder() // + .name("name") // + .baseUrl("baseUrl") // + .password(CONTROLLER_PASSWORD) // + .userName(CONTROLLER_USERNAME) // + .build(); + } + @BeforeEach public void init() { asyncRestClientMock = mock(AsyncRestClient.class); - clientUnderTest = new SdncOscA1Client(A1ClientHelper.createRic(RIC_1_URL).getConfig(), CONTROLLER_USERNAME, - CONTROLLER_PASSWORD, asyncRestClientMock); + Ric ric = A1ClientHelper.createRic(RIC_1_URL); + + clientUnderTest = new SdncOscA1Client(A1ProtocolType.SDNC_OSC_STD_V1_1, ric.getConfig(), controllerConfig(), + asyncRestClientMock); } @Test - public void testGetPolicyTypeIdentities() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); - - List policyTypeIds = Arrays.asList(POLICY_TYPE_1_ID, POLICY_TYPE_2_ID); - Mono policyTypeIdsResp = - A1ClientHelper.createOutputJsonResponse("policy-type-id-list", policyTypeIds.toString()); - whenAsyncPostThenReturn(policyTypeIdsResp); - - Mono> returnedMono = clientUnderTest.getPolicyTypeIdentities(); - - verify(asyncRestClientMock).postWithAuthHeader(POLICYTYPES_IDENTITIES_URL, inputJsonString, CONTROLLER_USERNAME, - CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectNext(policyTypeIds).expectComplete().verify(); + public void testGetPolicyTypeIdentities_STD() { + List policyTypeIds = clientUnderTest.getPolicyTypeIdentities().block(); + assertEquals(1, policyTypeIds.size(), "should hardcoded to one"); + assertEquals("", policyTypeIds.get(0), "should hardcoded to empty"); } @Test - public void testGetPolicyIdentities() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + public void testGetPolicyTypeIdentities_OSC() { + clientUnderTest = new SdncOscA1Client(A1ProtocolType.SDNC_OSC_OSC_V1, // + A1ClientHelper.createRic(RIC_1_URL).getConfig(), // + controllerConfig(), asyncRestClientMock); - List policyIds = Arrays.asList(POLICY_1_ID, POLICY_2_ID); - Mono policyIdsResp = A1ClientHelper.createOutputJsonResponse("policy-id-list", policyIds.toString()); - whenAsyncPostThenReturn(policyIdsResp); + String response = createResponse(Arrays.asList(POLICY_TYPE_1_ID)); + whenAsyncPostThenReturn(Mono.just(response)); - Mono> returnedMono = clientUnderTest.getPolicyIdentities(); + List policyTypeIds = clientUnderTest.getPolicyTypeIdentities().block(); + assertEquals(1, policyTypeIds.size(), ""); + assertEquals(POLICY_TYPE_1_ID, policyTypeIds.get(0), ""); - verify(asyncRestClientMock).postWithAuthHeader(POLICIES_IDENTITIES_URL, inputJsonString, CONTROLLER_USERNAME, + String expUrl = RIC_1_URL + "/a1-p/policytypes"; + AdapterRequest expectedParams = ImmutableAdapterRequest.builder() // + .nearRtRicUrl(expUrl) // + .build(); + String expInput = A1ClientHelper.createInputJsonString(expectedParams); + verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectNext(policyIds).expectComplete().verify(); + } - @Test - public void testGetValidPolicyType() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyTypeId(POLICY_TYPE_1_ID) // - .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + private String policiesUrl() { + return RIC_1_URL + "/A1-P/v1/policies"; + } - String policyType = "{\"policySchema\": " + POLICY_TYPE_SCHEMA_VALID + ", \"statusSchema\": {} }"; - Mono policyTypeResp = A1ClientHelper.createOutputJsonResponse("policy-type", policyType); - whenAsyncPostThenReturn(policyTypeResp); + private Gson gson() { + return SdncOscA1Client.gson; + } - Mono returnedMono = clientUnderTest.getPolicyTypeSchema(POLICY_TYPE_1_ID); + private String createResponse(Object obj) { + AdapterResponse output = ImmutableAdapterResponse.builder() // + .body(gson().toJson(obj)) // + .httpStatus(200) // + .build(); - verify(asyncRestClientMock).postWithAuthHeader(POLICYTYPES_URL, inputJsonString, CONTROLLER_USERNAME, - CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectNext(POLICY_TYPE_SCHEMA_VALID).expectComplete().verify(); + return gson().toJson(output); } @Test - public void testGetInvalidPolicyType() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyTypeId(POLICY_TYPE_1_ID) // - .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + public void testGetPolicyIdentities() { - String policyType = "{\"policySchema\": " + POLICY_TYPE_SCHEMA_INVALID + ", \"statusSchema\": {} }"; - Mono policyTypeResp = A1ClientHelper.createOutputJsonResponse("policy-type", policyType); - whenAsyncPostThenReturn(policyTypeResp); + String policyIdsResp = createResponse(Arrays.asList(POLICY_1_ID, POLICY_2_ID)); + whenAsyncPostThenReturn(Mono.just(policyIdsResp)); - Mono returnedMono = clientUnderTest.getPolicyTypeSchema(POLICY_TYPE_1_ID); + List returned = clientUnderTest.getPolicyIdentities().block(); + assertEquals(2, returned.size(), ""); - verify(asyncRestClientMock).postWithAuthHeader(POLICYTYPES_URL, inputJsonString, CONTROLLER_USERNAME, + AdapterRequest expectedParams = ImmutableAdapterRequest.builder() // + .nearRtRicUrl(policiesUrl()) // + .build(); + String expInput = A1ClientHelper.createInputJsonString(expectedParams); + verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectErrorMatches(throwable -> throwable instanceof JSONException).verify(); + + } + + @Test + public void testGetValidPolicyType() { + String policyType = clientUnderTest.getPolicyTypeSchema("").block(); + assertEquals("{}", policyType, ""); } @Test public void testPutPolicyValidResponse() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyTypeId(POLICY_TYPE_1_ID) // - .policyId(POLICY_1_ID) // - .policy(POLICY_JSON_VALID) // + whenPostReturnOkResponse(); + + String returned = clientUnderTest + .putPolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID)) + .block(); + assertEquals("OK", returned, ""); + final String expUrl = policiesUrl() + "/" + POLICY_1_ID; + AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() // + .nearRtRicUrl(expUrl) // + .body(POLICY_JSON_VALID) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); + String expInput = A1ClientHelper.createInputJsonString(expectedInputParams); - Mono policyResp = A1ClientHelper.createOutputJsonResponse("returned-policy", POLICY_JSON_VALID); - whenAsyncPostThenReturn(policyResp); - - Mono returnedMono = clientUnderTest - .putPolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID)); - - verify(asyncRestClientMock).postWithAuthHeader(PUT_POLICY_URL, inputJsonString, CONTROLLER_USERNAME, - CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectNext(POLICY_JSON_VALID).expectComplete().verify(); + verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); } @Test - public void testPutPolicyInvalidResponse() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyTypeId(POLICY_TYPE_1_ID) // - .policyId(POLICY_1_ID) // - .policy(POLICY_JSON_VALID) // + public void testPutPolicyRejected() { + final String policyJson = "{}"; + AdapterResponse adapterResponse = ImmutableAdapterResponse.builder() // + .body("NOK") // + .httpStatus(400) // ERROR .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); - Mono policyResp = A1ClientHelper.createOutputJsonResponse("returned-policy", POLICY_JSON_INVALID); - whenAsyncPostThenReturn(policyResp); + String resp = gson().toJson(adapterResponse); + whenAsyncPostThenReturn(Mono.just(resp)); Mono returnedMono = clientUnderTest - .putPolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID)); + .putPolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, policyJson, POLICY_TYPE_1_ID)); - verify(asyncRestClientMock).postWithAuthHeader(PUT_POLICY_URL, inputJsonString, CONTROLLER_USERNAME, + final String expUrl = policiesUrl() + "/" + POLICY_1_ID; + AdapterRequest expRequestParams = ImmutableAdapterRequest.builder() // + .nearRtRicUrl(expUrl) // + .body(policyJson) // + .build(); + String expRequest = A1ClientHelper.createInputJsonString(expRequestParams); + verify(asyncRestClientMock).postWithAuthHeader(PUT_A1_URL, expRequest, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectErrorMatches(throwable -> throwable instanceof JSONException).verify(); + StepVerifier.create(returnedMono) + .expectErrorMatches(throwable -> throwable instanceof WebClientResponseException).verify(); } @Test public void testDeletePolicy() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyId(POLICY_1_ID) // + whenPostReturnOkResponse(); + + String returned = clientUnderTest + .deletePolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID)) + .block(); + assertEquals("OK", returned, ""); + final String expUrl = policiesUrl() + "/" + POLICY_1_ID; + AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() // + .nearRtRicUrl(expUrl) // .build(); - String inputJsonString = A1ClientHelper.createInputJsonString(inputParams); - - whenAsyncPostThenReturn(Mono.empty()); + String expInput = A1ClientHelper.createInputJsonString(expectedInputParams); - Mono returnedMono = clientUnderTest - .deletePolicy(A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID)); - - verify(asyncRestClientMock).postWithAuthHeader(DELETE_POLICY_URL, inputJsonString, CONTROLLER_USERNAME, + verify(asyncRestClientMock).postWithAuthHeader(DELETE_A1_URL, expInput, CONTROLLER_USERNAME, CONTROLLER_PASSWORD); - StepVerifier.create(returnedMono).expectComplete().verify(); } @Test - public void testDeleteAllPolicies() { - SdncOscAdapterInput inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .build(); - String inputJsonStringGetIds = A1ClientHelper.createInputJsonString(inputParams); - inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyId(POLICY_1_ID) // - .build(); - String inputJsonStringDeletePolicy1 = A1ClientHelper.createInputJsonString(inputParams); - inputParams = ImmutableSdncOscAdapterInput.builder() // - .nearRtRicUrl(RIC_1_URL) // - .policyId(POLICY_2_ID) // + public void testGetStatus() { + whenPostReturnOkResponse(); + + Policy policy = A1ClientHelper.createPolicy(RIC_1_URL, POLICY_1_ID, POLICY_JSON_VALID, POLICY_TYPE_1_ID); + + String returnedStatus = clientUnderTest.getPolicyStatus(policy).block(); + + assertEquals("OK", returnedStatus, "unexpeted status"); + + final String expUrl = policiesUrl() + "/" + POLICY_1_ID + "/status"; + AdapterRequest expectedInputParams = ImmutableAdapterRequest.builder() // + .nearRtRicUrl(expUrl) // .build(); - String inputJsonStringDeletePolicy2 = A1ClientHelper.createInputJsonString(inputParams); + String expInput = A1ClientHelper.createInputJsonString(expectedInputParams); - List policyIds = Arrays.asList(POLICY_1_ID, POLICY_2_ID); - Mono policyIdsResp = A1ClientHelper.createOutputJsonResponse("policy-id-list", policyIds.toString()); - whenAsyncPostThenReturn(policyIdsResp).thenReturn(Mono.empty()); + verify(asyncRestClientMock).postWithAuthHeader(GET_A1_POLICY_STATUS_URL, expInput, CONTROLLER_USERNAME, + CONTROLLER_PASSWORD); + } - Flux returnedFlux = clientUnderTest.deleteAllPolicies(); + private void whenPostReturnOkResponse() { + AdapterResponse adapterResponse = ImmutableAdapterResponse.builder() // + .body("OK") // + .httpStatus(200) // + .build(); - StepVerifier.create(returnedFlux).expectComplete().verify(); - verify(asyncRestClientMock).postWithAuthHeader(POLICIES_IDENTITIES_URL, inputJsonStringGetIds, - CONTROLLER_USERNAME, CONTROLLER_PASSWORD); - verify(asyncRestClientMock).postWithAuthHeader(DELETE_POLICY_URL, inputJsonStringDeletePolicy1, - CONTROLLER_USERNAME, CONTROLLER_PASSWORD); - verify(asyncRestClientMock).postWithAuthHeader(DELETE_POLICY_URL, inputJsonStringDeletePolicy2, - CONTROLLER_USERNAME, CONTROLLER_PASSWORD); + String resp = gson().toJson(adapterResponse); + whenAsyncPostThenReturn(Mono.just(resp)); } private OngoingStubbing> whenAsyncPostThenReturn(Mono response) {