From f388c24c982a51c47d6b00c72d9252c5e430f44d Mon Sep 17 00:00:00 2001 From: "Smokowski, Steven" Date: Thu, 30 Jan 2020 16:39:49 -0500 Subject: Remove Valet from openstack adapter Remove Valet from openstack adapter Clean up CI, so it passes on dev branch Fixed bad merge regarding correct method name. Added try catch around createIfNotExists methods to avoid failing sim. Fix broken Fabric Tests from merge Update logging jar dependency for CI Issue-ID: SO-2623 Signed-off-by: Benjamin, Max (mb388a) Change-Id: I572276f751b132ec78d7ab5763f1c76bfc8256c5 --- .../org/onap/so/openstack/utils/MsoHeatUtils.java | 20 -------------------- 1 file changed, 20 deletions(-) (limited to 'adapters/mso-adapter-utils/src/main') diff --git a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java index 92b8cec83b..f06d2a2452 100644 --- a/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java +++ b/adapters/mso-adapter-utils/src/main/java/org/onap/so/openstack/utils/MsoHeatUtils.java @@ -969,26 +969,6 @@ public class MsoHeatUtils extends MsoCommonUtils implements VduPlugin { return newInputs; } - /* - * This helpful method added for Valet - */ - public String getCloudSiteKeystoneUrl(String cloudSiteId) throws MsoCloudSiteNotFound { - String keystoneUrl = null; - try { - CloudSite cloudSite = - cloudConfig.getCloudSite(cloudSiteId).orElseThrow(() -> new MsoCloudSiteNotFound(cloudSiteId)); - CloudIdentity cloudIdentity = cloudSite.getIdentityService(); - keystoneUrl = cloudIdentity.getIdentityUrl(); - } catch (Exception e) { - throw new MsoCloudSiteNotFound(cloudSiteId); - } - if (keystoneUrl == null || keystoneUrl.isEmpty()) { - throw new MsoCloudSiteNotFound(cloudSiteId); - } - return keystoneUrl; - } - - /******************************************************************************* * * Methods (and associated utilities) to implement the VduPlugin interface -- cgit 1.2.3-korg