summaryrefslogtreecommitdiffstats
path: root/ecomp-portal-BE-common
diff options
context:
space:
mode:
authorstatta <statta@research.att.com>2019-08-26 13:14:25 -0400
committerstatta <statta@research.att.com>2019-08-27 17:54:10 -0400
commit60ec30b5f8480da7f525da5e6a9b9e2070100f1b (patch)
tree4c30b6a9de5eab42d3ba3e46f38ecc7b2a7bf347 /ecomp-portal-BE-common
parenta3a04c5887779e9ca8024a3e87ece109b8d9b0c1 (diff)
Portal Setup - App issue
Issue-ID: PORTAL-723 Change-Id: Iff1523b2a474f56a74c9fcb9fd850e0e38f6fc68 Signed-off-by: statta <statta@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-common')
-rw-r--r--ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ConsulClientController.java113
-rw-r--r--ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthService.java62
-rw-r--r--ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthServiceImpl.java114
-rw-r--r--ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java179
-rw-r--r--ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java184
5 files changed, 0 insertions, 652 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ConsulClientController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ConsulClientController.java
deleted file mode 100644
index 264c95c3..00000000
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/ConsulClientController.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.portalapp.portal.controller;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.onap.portalapp.controller.EPRestrictedBaseController;
-import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
-import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
-import org.onap.portalapp.portal.service.ConsulHealthService;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-import com.orbitz.consul.ConsulException;
-import com.orbitz.consul.model.health.ServiceHealth;
-
-import io.searchbox.client.config.exception.NoServerConfiguredException;
-
-@RestController
-@RequestMapping("/portalApi/consul")
-public class ConsulClientController extends EPRestrictedBaseController {
- private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ConsulClientController.class);
-
- @Autowired
- private ConsulHealthService consulHealthService;
-
- // Get location of a healthy node running our service
- @RequestMapping(value = { "/service/{service}" }, method = RequestMethod.GET, produces = "application/json")
- public PortalRestResponse<String> getServiceLocation(HttpServletRequest request, HttpServletResponse response,
- @PathVariable("service") String service) {
-
- try {
- return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "Success!",
- consulHealthService.getServiceLocation(service, null));
- } catch (NoServerConfiguredException e) {
- logger.error(logger.errorLogger, "No healthy service exception!");
- return new PortalRestResponse<String>(PortalRestStatusEnum.WARN, "Warning!",
- "No healthy service exception!");
- } catch (ConsulException e) {
- logger.error(logger.errorLogger, "Couldn't connect ot consul - Is consul running?");
- return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "Error!",
- "Couldn't connect ot consul - Is consul running?");
- }
- }
-
- @RequestMapping(value = { "/service/healthy/{service}" }, method = RequestMethod.GET, produces = "application/json")
- public PortalRestResponse<List<ServiceHealth>> getAllHealthyNodes(HttpServletRequest request,
- HttpServletResponse response, @PathVariable("service") String service) {
- try {
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!",
- consulHealthService.getAllHealthyNodes(service));
- } catch (ConsulException e) {
- logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR, "Error!", new ArrayList<>());
- }
- }
-
- @RequestMapping(value = { "/service/all/{service}" }, method = RequestMethod.GET, produces = "application/json")
- public PortalRestResponse<List<ServiceHealth>> getAllNodes(HttpServletRequest request, HttpServletResponse response,
- @PathVariable("service") String service) {
- try {
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.OK, "Success!",
- consulHealthService.getAllNodes(service));
- } catch (ConsulException e) {
- logger.error(logger.errorLogger, "Couldn't connect to consul - shouldn't break anything.");
- return new PortalRestResponse<List<ServiceHealth>>(PortalRestStatusEnum.ERROR, "Error!", new ArrayList<>());
- }
- }
-
-}
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthService.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthService.java
deleted file mode 100644
index 15af7e0b..00000000
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthService.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.portalapp.portal.service;
-
-import java.util.List;
-
-import org.onap.portalapp.portal.exceptions.NoHealthyServiceException;
-
-import com.ecwid.consul.ConsulException;
-import com.orbitz.consul.model.health.ServiceHealth;
-
-public interface ConsulHealthService {
- /**
- * This method returns the location of one healthy node if found in Consul -
- * If not found in / by Consul, it falls back to 'localhost'
- *
- * @param service
- * @param fallbackPortOnLocalhost
- * value provided by the calling service
- * @return Service location
- */
- public String getServiceLocation(String service, String fallbackPortOnLocalhost) throws NoHealthyServiceException;
-
- public List<ServiceHealth> getAllHealthyNodes(String service) throws ConsulException;
-
- public List<ServiceHealth> getAllNodes(String service) throws ConsulException;
-}
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthServiceImpl.java
deleted file mode 100644
index a0f0841d..00000000
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ConsulHealthServiceImpl.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.portalapp.portal.service;
-
-import java.util.List;
-
-import org.onap.portalapp.portal.utils.EcompPortalUtils;
-import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.stereotype.Component;
-
-import com.ecwid.consul.ConsulException;
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.HealthClient;
-import com.orbitz.consul.model.health.ServiceHealth;
-
-@Component
-public class ConsulHealthServiceImpl implements ConsulHealthService {
-
- private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ConsulHealthServiceImpl.class);
-
- @Override
- public String getServiceLocation(String service, String fallbackPortOnLocalHost) {
-
- List<ServiceHealth> nodes = null;
-
- try {
- Consul consul = Consul.builder().build();
- HealthClient healthClient = consul.healthClient();
- nodes = healthClient.getHealthyServiceInstances(service).getResponse();
- } catch (Exception e) {
- String localFallbackServiceLocation = EcompPortalUtils.localOrDockerHost() + ":" + fallbackPortOnLocalHost;
- logger.debug(EELFLoggerDelegate.debugLogger,
- " problem getting nodes for service {1}. Defaulting to {2}. Exception: {3}", service,
- localFallbackServiceLocation, e.getMessage());
- logger.error(EELFLoggerDelegate.errorLogger,
- " problem getting nodes for service {1}. Defaulting to {2}. Exception: {3}", service,
- localFallbackServiceLocation, e);
- return localFallbackServiceLocation;
- }
-
- if (nodes == null || nodes.size() == 0) {
- logger.debug(EELFLoggerDelegate.debugLogger, "No healthy node found in the consul cluster running service " + service
- + ". Defaulting to localhost");
- return EcompPortalUtils.localOrDockerHost() + ":" + fallbackPortOnLocalHost;
- } else {
- String locationFromConsul;
- ServiceHealth node = nodes.get(0);
- locationFromConsul = node.getNode().getNode() + ":" + node.getService().getPort();
- logger.debug(EELFLoggerDelegate.debugLogger,
- "Found healthy service location using consul - returning location " + locationFromConsul);
-
- // if locationFromConsul is null for some reason (very unlikely at
- // this point), default to localhost
- if (null == locationFromConsul || "".equals(locationFromConsul)) {
- logger.debug(EELFLoggerDelegate.debugLogger,
- "Couldn't get location from consul for service " + service + ". Defaulting to localhost");
- return "localhost:" + fallbackPortOnLocalHost;
- } else {
- logger.debug(EELFLoggerDelegate.debugLogger, "Found service location from consul for service " + service
- + ". Location is " + locationFromConsul);
- return locationFromConsul;
- }
- }
- }
-
- @Override
- public List<ServiceHealth> getAllHealthyNodes(String service) throws ConsulException {
- Consul consul = Consul.builder().build();
- HealthClient healthClient = consul.healthClient();
- return healthClient.getHealthyServiceInstances(service).getResponse();
- }
-
- @Override
- public List<ServiceHealth> getAllNodes(String service) {
- Consul consul = Consul.builder().build();
- HealthClient healthClient = consul.healthClient();
- return healthClient.getAllServiceInstances(service).getResponse();
- }
-}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java
deleted file mode 100644
index 8db66b01..00000000
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/controller/ConsulClientControllerTest.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.portalapp.portal.controller;
-
-import static org.junit.Assert.assertTrue;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.onap.portalapp.portal.controller.ConsulClientController;
-import org.onap.portalapp.portal.domain.BEProperty;
-import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
-import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
-import org.onap.portalapp.portal.framework.MockitoTestSuite;
-import org.onap.portalapp.portal.service.ConsulHealthService;
-import org.onap.portalapp.portal.service.ConsulHealthServiceImpl;
-
-import com.orbitz.consul.ConsulException;
-import com.orbitz.consul.model.health.ServiceHealth;
-
-import io.searchbox.client.config.exception.NoServerConfiguredException;
-
-public class ConsulClientControllerTest {
-
- @Mock
- ConsulHealthService consulHealthService = new ConsulHealthServiceImpl();
-
- @InjectMocks
- ConsulClientController consulClientController = new ConsulClientController();
-
- NoServerConfiguredException noServerConfiguredException = new NoServerConfiguredException(null);
-
- String service = "Test";
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- }
-
- MockitoTestSuite mockitoTestSuite = new MockitoTestSuite();
-
- HttpServletRequest mockedRequest = mockitoTestSuite.getMockedRequest();
- HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
- NullPointerException nullPointerException = new NullPointerException();
- ConsulException consulException = new ConsulException(nullPointerException);
-
- @Test
- public void getServiceLocationTest() {
- PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
- ecpectedPortalRestResponse.setMessage("Success!");
- ecpectedPortalRestResponse.setResponse(null);
- ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK);
- PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
- actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
- }
-
- @Test
- public void getServiceLocationExceptionTest() {
- PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
- ecpectedPortalRestResponse.setMessage("Warning!");
- ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.WARN);
- PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
- Mockito.when(consulHealthService.getServiceLocation(service, null)).thenThrow(noServerConfiguredException);
- actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.getMessage().equals(ecpectedPortalRestResponse.getMessage()));
- assertTrue(actualPortalRestRespone.getStatus().equals(ecpectedPortalRestResponse.getStatus()));
-
- }
-
- @Test
- public void getServiceLocationExceptionConsulExceptionTest() {
- PortalRestResponse<BEProperty> ecpectedPortalRestResponse = new PortalRestResponse<BEProperty>();
- ecpectedPortalRestResponse.setMessage("Error!");
- ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
- PortalRestResponse<String> actualPortalRestRespone = new PortalRestResponse<String>();
- Mockito.when(consulHealthService.getServiceLocation(service, null)).thenThrow(consulException);
- actualPortalRestRespone = consulClientController.getServiceLocation(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.getMessage().equals(ecpectedPortalRestResponse.getMessage()));
- assertTrue(actualPortalRestRespone.getStatus().equals(ecpectedPortalRestResponse.getStatus()));
- }
-
- public PortalRestResponse<List<ServiceHealth>> successResponse() {
- PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = new PortalRestResponse<List<ServiceHealth>>();
- List<ServiceHealth> healths = new ArrayList<ServiceHealth>();
- ecpectedPortalRestResponse.setMessage("Success!");
- ecpectedPortalRestResponse.setResponse(healths);
- ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.OK);
- return ecpectedPortalRestResponse;
- }
-
- public PortalRestResponse<List<ServiceHealth>> errorResponse() {
- PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = new PortalRestResponse<List<ServiceHealth>>();
- List<ServiceHealth> healths = new ArrayList<ServiceHealth>();
- ecpectedPortalRestResponse.setMessage("Error!");
- ecpectedPortalRestResponse.setResponse(healths);
- ecpectedPortalRestResponse.setStatus(PortalRestStatusEnum.ERROR);
- return ecpectedPortalRestResponse;
- }
-
- @Test
- public void getAllHealthyNodesTest() {
- PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = successResponse();
- PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
- actualPortalRestRespone = consulClientController.getAllHealthyNodes(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
-
- }
-
- @Test
- public void getAllHealthyNodesExceptionTest() {
- PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = errorResponse();
- PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
- Mockito.when(consulHealthService.getAllHealthyNodes(service)).thenThrow(consulException);
- actualPortalRestRespone = consulClientController.getAllHealthyNodes(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
- }
-
- @Test
- public void getAllNodesTest() {
- PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = successResponse();
- PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
- actualPortalRestRespone = consulClientController.getAllNodes(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
- }
-
- @Test
- public void getAllNodesExceptionTest() {
- PortalRestResponse<List<ServiceHealth>> ecpectedPortalRestResponse = errorResponse();
- PortalRestResponse<List<ServiceHealth>> actualPortalRestRespone = new PortalRestResponse<List<ServiceHealth>>();
- Mockito.when(consulHealthService.getAllNodes(service)).thenThrow(consulException);
- actualPortalRestRespone = consulClientController.getAllNodes(mockedRequest, mockedResponse, service);
- assertTrue(actualPortalRestRespone.equals(ecpectedPortalRestResponse));
- }
-}
diff --git a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java b/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java
deleted file mode 100644
index 71bdb7c0..00000000
--- a/ecomp-portal-BE-common/src/test/java/org/onap/portalapp/portal/service/ConsulHealthServiceImplTest.java
+++ /dev/null
@@ -1,184 +0,0 @@
-/*-
- * ============LICENSE_START==========================================
- * ONAP Portal
- * ===================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
- * ===================================================================
- *
- * Unless otherwise specified, all software contained herein is licensed
- * under the Apache License, Version 2.0 (the "License");
- * you may not use this software 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.
- *
- * Unless otherwise specified, all documentation contained herein is licensed
- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
- * you may not use this documentation except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * https://creativecommons.org/licenses/by/4.0/
- *
- * Unless required by applicable law or agreed to in writing, documentation
- * 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.portalapp.portal.service;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.mockito.Mockito.*;
-
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.onap.portalapp.portal.utils.EcompPortalUtils;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
-import com.orbitz.consul.Consul;
-import com.orbitz.consul.HealthClient;
-import com.orbitz.consul.model.ConsulResponse;
-import com.orbitz.consul.model.health.ServiceHealth;
-import com.orbitz.consul.Consul.Builder;
-import com.orbitz.consul.model.health.Node;
-import com.orbitz.consul.model.health.Service;
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({ Consul.class ,EcompPortalUtils.class})
-public class ConsulHealthServiceImplTest {
-
- private static final String TEST="test";
- @InjectMocks
- ConsulHealthServiceImpl consulHealthServiceImpl;
-
- @Mock
- Builder builder;
- @Mock
- Consul consul ;
- @Mock
- HealthClient healthClient;
- @Mock
- ServiceHealth serviceHealth;
- @Mock
- ConsulResponse<List<ServiceHealth>> response;
- @Mock
- Node node;
- @Mock
- Service service;
-
- @Before
- public void setup() {
- MockitoAnnotations.initMocks(this);
- }
-
- @Test
- public void getServiceLocation_Error() {
-
- PowerMockito.mockStatic(Consul.class);
- PowerMockito.mockStatic(EcompPortalUtils.class);
- PowerMockito.when(Consul.builder()).thenReturn(builder);
- PowerMockito.when(EcompPortalUtils.localOrDockerHost()).thenReturn(TEST);
- when(builder.build()).thenReturn(consul);
- when(consul.healthClient()).thenReturn(healthClient);
- String location= consulHealthServiceImpl.getServiceLocation(TEST, TEST);
- assertNotNull(location);
-
- }
-
- @Test
- public void getServiceLocation_Empty() {
-
- List<ServiceHealth> nodes=new ArrayList<>();
- nodes.add(serviceHealth);
-
- PowerMockito.mockStatic(Consul.class);
- PowerMockito.mockStatic(EcompPortalUtils.class);
- PowerMockito.when(Consul.builder()).thenReturn(builder);
- PowerMockito.when(EcompPortalUtils.localOrDockerHost()).thenReturn(TEST);
- when(builder.build()).thenReturn(consul);
- when(consul.healthClient()).thenReturn(healthClient);
- when( healthClient.getHealthyServiceInstances(TEST)).thenReturn(null);
-
-
- String location= consulHealthServiceImpl.getServiceLocation(TEST, TEST);
- assertNotNull(location);
-
- }
-
-
- @Test
- public void getServiceLocation() {
-
- List<ServiceHealth> nodes=new ArrayList<>();
- nodes.add(serviceHealth);
-
- PowerMockito.mockStatic(Consul.class);
- PowerMockito.mockStatic(EcompPortalUtils.class);
- PowerMockito.when(Consul.builder()).thenReturn(builder);
- PowerMockito.when(EcompPortalUtils.localOrDockerHost()).thenReturn(TEST);
- when(builder.build()).thenReturn(consul);
- when(consul.healthClient()).thenReturn(healthClient);
- when( healthClient.getHealthyServiceInstances(TEST)).thenReturn(response);
- when(response.getResponse()).thenReturn(nodes);
- when(serviceHealth.getNode()).thenReturn(node);
- when(serviceHealth.getService()).thenReturn(service);
-
- String location= consulHealthServiceImpl.getServiceLocation(TEST, TEST);
- assertNotNull(location);
-
- }
-
- @Test
- public void getAllHealthyNodes() {
- List<ServiceHealth> nodes=new ArrayList<>();
- nodes.add(serviceHealth);
-
- PowerMockito.mockStatic(Consul.class);
- PowerMockito.when(Consul.builder()).thenReturn(builder);
-
- when(builder.build()).thenReturn(consul);
- when(consul.healthClient()).thenReturn(healthClient);
- when( healthClient.getHealthyServiceInstances(TEST)).thenReturn(response);
- when(response.getResponse()).thenReturn(nodes);
- List<ServiceHealth> list= consulHealthServiceImpl.getAllHealthyNodes(TEST);
- assertEquals(1, list.size());
-
- }
-
- @Test
- public void getAllNodes() {
- List<ServiceHealth> nodes=new ArrayList<>();
- nodes.add(serviceHealth);
-
- PowerMockito.mockStatic(Consul.class);
- PowerMockito.when(Consul.builder()).thenReturn(builder);
-
- when(builder.build()).thenReturn(consul);
- when(consul.healthClient()).thenReturn(healthClient);
- when( healthClient.getAllServiceInstances(TEST)).thenReturn(response);
- when(response.getResponse()).thenReturn(nodes);
- List<ServiceHealth> list= consulHealthServiceImpl.getAllNodes(TEST);
- assertEquals(1, list.size());
- }
-
-}