Add http put AAI client for SDK 44/78744/1
authorpwielebs <piotr.wielebski@nokia.com>
Tue, 19 Feb 2019 09:52:18 +0000 (10:52 +0100)
committerpwielebs <piotr.wielebski@nokia.com>
Tue, 19 Feb 2019 10:59:08 +0000 (11:59 +0100)
Change-Id: I28c563508977162eacb35a09f2a6c3b932535b52
Issue-ID: DCAEGEN2-1246
Signed-off-by: pwielebs <piotr.wielebski@nokia.com>
rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/patch/AaiReactiveHttpPatchClient.java
rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiReactiveHttpPutClient.java [new file with mode: 0644]
rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiReactiveHttpPutClientTest.java [new file with mode: 0644]

diff --git a/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiReactiveHttpPutClient.java b/rest-services/aai-client/src/main/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiReactiveHttpPutClient.java
new file mode 100644 (file)
index 0000000..bd5271b
--- /dev/null
@@ -0,0 +1,96 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2018-2019 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.put;
+
+
+import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
+import org.onap.dcaegen2.services.sdk.rest.services.model.AaiModel;
+import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder;
+import org.slf4j.MDC;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.WebClient;
+import org.springframework.web.util.DefaultUriBuilderFactory;
+import reactor.core.publisher.Mono;
+
+import java.net.URI;
+import java.util.UUID;
+
+
+import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.REQUEST_ID;
+import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.X_INVOCATION_ID;
+import static org.onap.dcaegen2.services.sdk.rest.services.model.logging.MdcVariables.X_ONAP_REQUEST_ID;
+
+
+public class AaiReactiveHttpPutClient {
+
+    private WebClient webClient;
+    private final String aaiHost;
+    private final String aaiProtocol;
+    private final Integer aaiHostPortNumber;
+    private final String aaiBasePath;
+    private final String aaiPnfPath;
+
+    private final JsonBodyBuilder jsonBodyBuilder;
+
+    /**
+     * Constructor of AaiProducerReactiveHttpClient.
+     *
+     * @param configuration - AAI producer configuration object
+     */
+    public AaiReactiveHttpPutClient(AaiClientConfiguration configuration, JsonBodyBuilder jsonBodyBuilder) {
+        this.aaiHost = configuration.aaiHost();
+        this.aaiProtocol = configuration.aaiProtocol();
+        this.aaiHostPortNumber = configuration.aaiPort();
+        this.aaiBasePath = configuration.aaiBasePath();
+        this.aaiPnfPath = configuration.aaiPnfPath();
+        this.jsonBodyBuilder = jsonBodyBuilder;
+    }
+
+    /**
+     * Function for calling AAI Http producer - put request to AAI database.
+     *
+     * @param aaiModel - object which will be sent to AAI database
+     * @return status code of operation
+     */
+    public Mono<ClientResponse> getAaiProducerResponse(AaiModel aaiModel) {
+        return putAaiRequest(aaiModel);
+    }
+
+    public AaiReactiveHttpPutClient createAaiWebClient(WebClient webClient) {
+        this.webClient = webClient;
+        return this;
+    }
+
+    private Mono<ClientResponse> putAaiRequest(AaiModel aaiModel) {
+        return
+                webClient.put()
+                        .uri(getUri(aaiModel.getCorrelationId()))
+                        .header(X_ONAP_REQUEST_ID, MDC.get(REQUEST_ID))
+                        .header(X_INVOCATION_ID, UUID.randomUUID().toString())
+                        .body(Mono.just(jsonBodyBuilder.createJsonBody(aaiModel)), String.class)
+                        .exchange();
+    }
+
+    URI getUri(String pnfName) {
+        return new DefaultUriBuilderFactory().builder().scheme(aaiProtocol).host(aaiHost).port(aaiHostPortNumber)
+                .path(aaiBasePath + aaiPnfPath + "/" + pnfName).build();
+    }
+}
\ No newline at end of file
diff --git a/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiReactiveHttpPutClientTest.java b/rest-services/aai-client/src/test/java/org/onap/dcaegen2/services/sdk/rest/services/aai/client/service/http/put/AaiReactiveHttpPutClientTest.java
new file mode 100644 (file)
index 0000000..3b69449
--- /dev/null
@@ -0,0 +1,140 @@
+/*
+ * ============LICENSE_START=======================================================
+ * DCAEGEN2-SERVICES-SDK
+ * ================================================================================
+ * Copyright (C) 2018 NOKIA Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.dcaegen2.services.sdk.rest.services.aai.client.service.http.put;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.onap.dcaegen2.services.sdk.rest.services.aai.client.config.AaiClientConfiguration;
+
+import org.onap.dcaegen2.services.sdk.rest.services.model.AaiModel;
+import org.onap.dcaegen2.services.sdk.rest.services.model.JsonBodyBuilder;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+import reactor.test.StepVerifier;
+
+import java.net.URI;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+import static org.springframework.web.reactive.function.client.ExchangeFilterFunctions.basicAuthentication;
+
+
+class AaiReactiveHttpPutClientTest {
+    private static final Integer SUCCESS_RESPONSE = 200;
+    private static AaiClientConfiguration aaiConfigurationMock = mock(AaiClientConfiguration.class);
+
+
+    private AaiReactiveHttpPutClient httpClient;
+    private WebClient webClient;
+    private WebClient.RequestBodyUriSpec requestBodyUriSpec;
+    private WebClient.ResponseSpec responseSpec;
+
+    private Map<String, String> aaiHeaders;
+    private ClientResponse clientResponse;
+    private Mono<ClientResponse> clientResponseMono;
+
+    private AaiModel aaiModel = mock(AaiModel.class);
+    private JsonBodyBuilder<AaiModel> jsonBodyBuilder = mock(JsonBodyBuilder.class);
+
+    @BeforeEach
+    void setUp() {
+        setupHeaders();
+        clientResponse = mock(ClientResponse.class);
+        clientResponseMono = Mono.just(clientResponse);
+
+        when(aaiConfigurationMock.aaiHost()).thenReturn("54.45.33.2");
+        when(aaiConfigurationMock.aaiProtocol()).thenReturn("https");
+        when(aaiConfigurationMock.aaiPort()).thenReturn(1234);
+        when(aaiConfigurationMock.aaiUserName()).thenReturn("PRH");
+        when(aaiConfigurationMock.aaiUserPassword()).thenReturn("PRH");
+        when(aaiConfigurationMock.aaiBasePath()).thenReturn("/aai/v11");
+        when(aaiConfigurationMock.aaiPnfPath()).thenReturn("/network/pnfs/pnf");
+        when(aaiConfigurationMock.aaiHeaders()).thenReturn(aaiHeaders);
+
+        when(aaiModel.getCorrelationId()).thenReturn("NOKnhfsadhff");
+
+        when(jsonBodyBuilder.createJsonBody(aaiModel)).thenReturn(
+                "{\"correlationId\":\"NOKnhfsadhff\"," +
+                        "\"ipaddress-v4\":\"256.22.33.155\", " +
+                        "\"ipaddress-v6\":\"200J:0db8:85a3:0000:0000:8a2e:0370:7334\"}");
+
+        httpClient = new AaiReactiveHttpPutClient(aaiConfigurationMock, jsonBodyBuilder);
+
+        webClient = spy(WebClient.builder()
+                .defaultHeaders(httpHeaders -> httpHeaders.setAll(aaiHeaders))
+                .filter(basicAuthentication(aaiConfigurationMock.aaiUserName(), aaiConfigurationMock.aaiUserPassword()))
+                .build());
+
+        requestBodyUriSpec = mock(WebClient.RequestBodyUriSpec.class);
+        responseSpec = mock(WebClient.ResponseSpec.class);
+    }
+
+    @Test
+    void getAaiProducerResponse_shouldReturn200() {
+        //given
+        Mono<Integer> expectedResult = Mono.just(SUCCESS_RESPONSE);
+
+        //when
+        mockWebClientDependantObject();
+        doReturn(expectedResult).when(responseSpec).bodyToMono(Integer.class);
+        httpClient.createAaiWebClient(webClient);
+
+        //then
+        StepVerifier.create(httpClient.getAaiProducerResponse(aaiModel)).expectSubscription()
+                .expectNextMatches(results -> {
+                    Assertions.assertEquals(results, clientResponse);
+                    return true;
+                }).verifyComplete();
+    }
+
+
+    @Test
+    void getAppropriateUri_whenPassingCorrectedPathForPnf() {
+        Assertions.assertEquals(httpClient.getUri("NOKnhfsadhff"),
+                URI.create("https://54.45.33.2:1234/aai/v11/network/pnfs/pnf/NOKnhfsadhff"));
+    }
+
+
+    private void setupHeaders() {
+        aaiHeaders = new HashMap<>();
+        aaiHeaders.put("X-FromAppId", "PRH");
+        aaiHeaders.put("X-TransactionId", "vv-temp");
+        aaiHeaders.put("Accept", "application/json");
+        aaiHeaders.put("Real-Time", "true");
+        aaiHeaders.put("Content-Type", "application/json");
+    }
+
+    private void mockWebClientDependantObject() {
+        WebClient.RequestHeadersSpec requestHeadersSpec = mock(WebClient.RequestHeadersSpec.class);
+        when(webClient.put()).thenReturn(requestBodyUriSpec);
+        when(requestBodyUriSpec.uri((URI) any())).thenReturn(requestBodyUriSpec);
+        when(requestBodyUriSpec.header(any(), any())).thenReturn(requestBodyUriSpec);
+        when(requestBodyUriSpec.body(any(), (Class<Object>) any())).thenReturn(requestHeadersSpec);
+        when(requestHeadersSpec.exchange()).thenReturn(clientResponseMono);
+    }
+}
\ No newline at end of file