From 8d05d604f0f0ea81d835d29b2379a1417a689f32 Mon Sep 17 00:00:00 2001 From: Marcus G K Williams Date: Fri, 30 Nov 2018 13:38:15 -0800 Subject: Fix cloudSite creation in homing This change fixes the use of optional in OofInfraUtils.java, so that cloudSites can be created if one is not found in catalogDB. Issue-ID: SO-1262 Change-Id: Ifec9083950758c650a369e9c5ebd386715ed9df8 Signed-off-by: Marcus G K Williams --- .../onap/so/bpmn/common/scripts/OofHoming.groovy | 2 +- .../onap/so/bpmn/common/util/OofInfraUtils.java | 27 ++++++++++++++-------- 2 files changed, 19 insertions(+), 10 deletions(-) diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy index df3399f1f0..b03256b098 100644 --- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy +++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/OofHoming.groovy @@ -268,7 +268,7 @@ class OofHoming extends AbstractServiceTaskProcessor { cloudIdentity.setAdminTenant("service") cloudIdentity.setIdentityAuthenticationType(AuthenticationType.USERNAME_PASSWORD) String msoMulticloudUserName = UrnPropertiesReader - .getVariable("mso.multicloud.api.password", execution, + .getVariable("mso.multicloud.api.username", execution, "apih") String msoMulticloudPassword = UrnPropertiesReader .getVariable("mso.multicloud.api.password", execution, diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/OofInfraUtils.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/OofInfraUtils.java index b62d8be281..df7b57f3a3 100644 --- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/OofInfraUtils.java +++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/common/util/OofInfraUtils.java @@ -45,18 +45,27 @@ public class OofInfraUtils { public void createCloudSite(CloudSite cloudSite, DelegateExecution execution) { String endpoint = UrnPropertiesReader.getVariable("mso.catalog.db.spring.endpoint", execution); String auth = UrnPropertiesReader.getVariable("mso.db.auth", execution); - Optional optCloudsite = Optional.empty(); - - CatalogDbClient client = new CatalogDbClient(endpoint, auth); try { - optCloudsite = Optional.ofNullable(client.getCloudSite(cloudSite.getId(), endpoint + "/cloudSite/")); + CloudSite getCloudsite; + + CatalogDbClient client = new CatalogDbClient(endpoint, auth); + + getCloudsite = Optional.ofNullable(client.getCloudSite(cloudSite.getId(), endpoint + "/cloudSite/")).orElse(new CloudSite()); + if (!cloudSite.getId().equals(getCloudsite.getId())) { + client.postCloudSite(cloudSite); + LOGGER.debug("Did not findd cloudsite : " + cloudSite.getId()); + LOGGER.debug("Will create cloudSite: " + cloudSite.toString()); + } + else { + LOGGER.debug("Found cloudsite : " + cloudSite.getId()); + LOGGER.debug("Will not create cloudSite: " + cloudSite.toString()); + } } catch (Exception e) { - LOGGER.debug("Could not find cloudsite : " + cloudSite.getId()); - LOGGER.debug("Creating cloudSite: " + cloudSite.toString()); - } - if (optCloudsite.isPresent() && (cloudSite.getId()) != optCloudsite.get().getId()) { - client.postCloudSite(cloudSite); + LOGGER.debug("Error looking up or creating cloudsite : " + cloudSite.getId()); + LOGGER.debug("CloudSite Lookup/Creation Error: " + e); } + + } /** -- cgit 1.2.3-korg