From c88676ec64c4c870252502bc1cfaa8990c8fd964 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Mon, 13 Jul 2020 16:06:57 -0400 Subject: Remove legacy actor code from models Deleted legacy actor code. That includes deleting most of the XxxManager classes. Issue-ID: POLICY-2559 Change-Id: I1ef1b900ca1d23e88da64b2c95a18986feb1b765 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/sdnc/SdncManager.java | 158 ----------------- .../java/org/onap/policy/sdnc/SdncManagerTest.java | 192 --------------------- 2 files changed, 350 deletions(-) delete mode 100644 models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java delete mode 100644 models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java (limited to 'models-interactions/model-impl/sdnc') diff --git a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java b/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java deleted file mode 100644 index ec423c758..000000000 --- a/models-interactions/model-impl/sdnc/src/main/java/org/onap/policy/sdnc/SdncManager.java +++ /dev/null @@ -1,158 +0,0 @@ -/* - * ============LICENSE_START======================================================= - * Copyright (C) 2018 Huawei. All rights reserved. - * ================================================================================ - * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved - * Modifications Copyright (C) 2019-2020 Nordix Foundation. - * Modifications Copyright (C) 2019 Samsung Electronics Co., Ltd. - * ================================================================================ - * 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.policy.sdnc; - -import com.google.gson.JsonSyntaxException; -import java.util.HashMap; -import java.util.Map; -import org.apache.commons.lang3.tuple.Pair; -import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure; -import org.onap.policy.common.endpoints.utils.NetLoggerUtil; -import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType; -import org.onap.policy.rest.RestManager; -import org.onap.policy.sdnc.util.Serialization; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -// TODO this class will be deleted - -public final class SdncManager implements Runnable { - - private String sdncUrlBase; - private String username; - private String password; - private SdncRequest sdncRequest; - private SdncCallback callback; - private static final Logger logger = LoggerFactory.getLogger(SdncManager.class); - - // The REST manager used for processing REST calls for this Sdnc manager - private RestManager restManager; - - @FunctionalInterface - public interface SdncCallback { - public void onCallback(SdncResponse response); - } - - /** - * Constructor. - * - * @param cb Callback method - * @param request request - */ - public SdncManager(SdncCallback cb, SdncRequest request, String url, - String user, String password) { - if (cb == null || request == null) { - throw new IllegalArgumentException( - "the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null" - ); - } - this.callback = cb; - this.sdncRequest = request; - if (url == null) { - throw new IllegalArgumentException( - "the \"url\" parameter on the SdncManager constructor may not be null" - ); - } - this.sdncUrlBase = url; - this.username = user; - this.password = password; - - restManager = new RestManager(); - } - - /** - * Set the parameters. - * - * @param baseUrl base URL - * @param name username - * @param pwd password - */ - public void setSdncParams(String baseUrl, String name, String pwd) { - sdncUrlBase = baseUrl; - username = name; - password = pwd; - } - - @Override - public void run() { - Map headers = new HashMap<>(); - Pair httpDetails; - - SdncResponse responseError = new SdncResponse(); - SdncResponseOutput responseOutput = new SdncResponseOutput(); - responseOutput.setResponseCode("404"); - responseError.setResponseOutput(responseOutput); - - headers.put("Accept", "application/json"); - String sdncUrl = sdncUrlBase + sdncRequest.getUrl(); - - try { - String sdncRequestJson = Serialization.gsonPretty.toJson(sdncRequest); - NetLoggerUtil.log(EventType.OUT, CommInfrastructure.REST, sdncUrl, sdncRequestJson); - logger.info("[OUT|{}|{}|]{}{}", CommInfrastructure.REST, sdncUrl, NetLoggerUtil.SYSTEM_LS, sdncRequestJson); - - httpDetails = restManager.post(sdncUrl, username, password, headers, "application/json", - sdncRequestJson); - } catch (Exception e) { - logger.info(e.getMessage(), e); - this.callback.onCallback(responseError); - return; - } - - if (httpDetails == null) { - this.callback.onCallback(responseError); - return; - } - - try { - SdncResponse response = Serialization.gsonPretty.fromJson(httpDetails.getRight(), SdncResponse.class); - NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, sdncUrl, httpDetails.getRight()); - logger.info("[IN|{}|{}|]{}{}", "Sdnc", sdncUrl, NetLoggerUtil.SYSTEM_LS, httpDetails.getRight()); - String body = Serialization.gsonPretty.toJson(response); - logger.info("Response to Sdnc Heal post:"); - logger.info(body); - response.setRequestId(sdncRequest.getRequestId().toString()); - - if (!"200".equals(response.getResponseOutput().getResponseCode())) { - logger.info( - "Sdnc Heal Restcall failed with http error code {} {}", - httpDetails.getLeft(), httpDetails.getRight() - ); - } - - this.callback.onCallback(response); - } catch (JsonSyntaxException e) { - logger.info("Failed to deserialize into SdncResponse {}", e.getLocalizedMessage(), e); - } catch (Exception e) { - logger.info("Unknown error deserializing into SdncResponse {}", e.getLocalizedMessage(), e); - } - } - - /** - * Protected setter for rest manager to allow mocked rest manager to be used for testing. - * @param restManager the test REST manager - */ - protected void setRestManager(final RestManager restManager) { - this.restManager = restManager; - } -} diff --git a/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java b/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java deleted file mode 100644 index 45461de43..000000000 --- a/models-interactions/model-impl/sdnc/src/test/java/org/onap/policy/sdnc/SdncManagerTest.java +++ /dev/null @@ -1,192 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * sdnc - * ================================================================================ - * Copyright (C) 2018 Huawei. All rights reserved. - * ================================================================================ - * Modifications Copyright (C) 2019-2020 AT&T Intellectual Property. All rights reserved - * Modifications Copyright (C) 2019-2020 Nordix Foundation. - * ================================================================================ - * 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.policy.sdnc; - -import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyMap; -import static org.mockito.ArgumentMatchers.anyString; -import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.ArgumentMatchers.startsWith; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import java.util.UUID; -import org.apache.commons.lang3.tuple.Pair; -import org.junit.Before; -import org.junit.Test; -import org.onap.policy.rest.RestManager; -import org.onap.policy.sdnc.SdncManager.SdncCallback; -import org.onap.policy.sdnc.util.Serialization; - -public class SdncManagerTest implements SdncCallback { - private static final String SOMEWHERE_OVER_THE_RAINBOW = "http://somewhere.over.the.rainbow"; - - private static final String DOROTHY = "Dorothy"; - - private RestManager mockedRestManager; - - private Pair httpResponsePutOk; - private Pair httpResponseBadResponse; - private Pair httpResponseErr; - - private SdncRequest request; - private SdncResponse response; - - /** - * Set up the mocked REST manager. - */ - @Before - public void setupMockedRest() { - mockedRestManager = mock(RestManager.class); - - httpResponsePutOk = Pair.of(202, Serialization.gsonPretty.toJson(response)); - httpResponseBadResponse = Pair.of(202, Serialization.gsonPretty.toJson(null)); - httpResponseErr = Pair.of(200, null); - } - - /** - * Create the request and response before. - */ - @Before - public void createRequestAndResponse() { - SdncHealServiceInfo serviceInfo = new SdncHealServiceInfo(); - serviceInfo.setServiceInstanceId("E-City"); - - SdncHealRequestHeaderInfo additionalParams = new SdncHealRequestHeaderInfo(); - additionalParams.setSvcAction("Go Home"); - additionalParams.setSvcRequestId("My Request"); - - SdncHealRequest healRequest = new SdncHealRequest(); - healRequest.setRequestHeaderInfo(additionalParams); - healRequest.setServiceInfo(serviceInfo); - - UUID requestId = UUID.randomUUID(); - request = new SdncRequest(); - request.setRequestId(requestId); - request.setHealRequest(healRequest); - request.setNsInstanceId(DOROTHY); - - SdncResponseOutput responseDescriptor = new SdncResponseOutput(); - responseDescriptor.setSvcRequestId("1234"); - responseDescriptor.setResponseCode("200"); - responseDescriptor.setAckFinalIndicator("final-indicator-00"); - - response = new SdncResponse(); - response.setRequestId(request.getRequestId().toString()); - response.setResponseOutput(responseDescriptor); - } - - @Test - public void testSdncInitiation() { - - assertThatIllegalArgumentException().isThrownBy(() -> new SdncManager(null, null, null, null, null)) - .withMessage("the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null"); - - assertThatIllegalArgumentException().isThrownBy(() -> new SdncManager(this, null, null, null, null)) - .withMessage("the parameters \"callback\" and \"request\" on the SdncManager constructor may not be null"); - - assertThatIllegalArgumentException().isThrownBy(() -> new SdncManager(this, request, null, null, null)) - .withMessage("the \"url\" parameter on the SdncManager constructor may not be null"); - - new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Toto"); - } - - @Test - public void testSdncExecutionException() throws InterruptedException { - SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Exception"); - manager.setRestManager(mockedRestManager); - - when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("Exception"), anyMap(), - anyString(), anyString())).thenThrow(new RuntimeException("OzException")); - - Thread managerThread = new Thread(manager); - managerThread.start(); - - managerThread.join(1000); - - verify(mockedRestManager).post(any(), any(), any(), any(), any(), any()); - } - - @Test - public void testSdncExecutionNull() throws InterruptedException { - SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Null"); - manager.setRestManager(mockedRestManager); - - when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("Null"), anyMap(), - anyString(), anyString())).thenReturn(null); - - manager.run(); - - verify(mockedRestManager).post(any(), any(), any(), any(), any(), any()); - } - - - @Test - public void testSdncExecutionError0() throws InterruptedException { - SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "Error0"); - manager.setRestManager(mockedRestManager); - - when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("Error0"), anyMap(), - anyString(), anyString())).thenReturn(httpResponseErr); - - manager.run(); - - verify(mockedRestManager).post(any(), any(), any(), any(), any(), any()); - } - - @Test - public void testSdncExecutionBadResponse() throws InterruptedException { - SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "BadResponse"); - manager.setRestManager(mockedRestManager); - - when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("OK"), anyMap(), - anyString(), anyString())).thenReturn(httpResponseBadResponse); - - manager.run(); - - verify(mockedRestManager).post(any(), any(), any(), any(), any(), any()); - } - - @Test - public void testSdncExecutionOk() throws InterruptedException { - SdncManager manager = new SdncManager(this, request, SOMEWHERE_OVER_THE_RAINBOW, DOROTHY, "OOK"); - manager.setRestManager(mockedRestManager); - - when(mockedRestManager.post(startsWith(SOMEWHERE_OVER_THE_RAINBOW), eq(DOROTHY), eq("OK"), anyMap(), - anyString(), anyString())).thenReturn(httpResponsePutOk); - - manager.run(); - - verify(mockedRestManager).post(any(), any(), any(), any(), any(), any()); - } - - @Override - public void onCallback(SdncResponse response) { - // - // Nothing really to do - // - } -} -- cgit 1.2.3-korg