Portal Setup - App issue

Issue-ID: PORTAL-723
Change-Id: Iff1523b2a474f56a74c9fcb9fd850e0e38f6fc68
Signed-off-by: statta <statta@research.att.com>

3 files changed, 0 insertions, 289 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();
-	}
-}