From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../onap/vid/services/CloudOwnerServiceImpl.java | 76 ++++++++++++++++++++++ 1 file changed, 76 insertions(+) create mode 100644 vid-app-common/src/main/java/org/onap/vid/services/CloudOwnerServiceImpl.java (limited to 'vid-app-common/src/main/java/org/onap/vid/services/CloudOwnerServiceImpl.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/services/CloudOwnerServiceImpl.java b/vid-app-common/src/main/java/org/onap/vid/services/CloudOwnerServiceImpl.java new file mode 100644 index 000000000..3acab9ff9 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/services/CloudOwnerServiceImpl.java @@ -0,0 +1,76 @@ +package org.onap.vid.services; + + +import com.google.common.collect.ImmutableList; +import org.apache.commons.lang3.StringUtils; +import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; +import org.onap.vid.aai.AaiClientInterface; +import org.onap.vid.exceptions.GenericUncheckedException; +import org.onap.vid.exceptions.NotFoundException; +import org.onap.vid.mso.model.CloudConfiguration; +import org.onap.vid.mso.rest.RequestDetails; +import org.onap.vid.properties.Features; +import org.springframework.beans.factory.annotation.Autowired; +import org.togglz.core.manager.FeatureManager; + +import java.util.List; +import java.util.Map; + +public class CloudOwnerServiceImpl implements CloudOwnerService { + + private static final List CLOUD_CONFIGURATION_PATH = ImmutableList.of("requestDetails", "cloudConfiguration"); + private static final List LCP_CLOUD_REGION_ID_PATH = ImmutableList.of("requestDetails", "cloudConfiguration", "lcpCloudRegionId"); + + private static final EELFLoggerDelegate LOGGER = EELFLoggerDelegate.getLogger(CloudOwnerService.class); + + private final AaiClientInterface aaiClient; + private final FeatureManager featureManager; + + @Autowired + public CloudOwnerServiceImpl(AaiClientInterface aaiClient, FeatureManager featureManager) { + this.aaiClient = aaiClient; + this.featureManager = featureManager; + } + + @Override + public void enrichRequestWithCloudOwner(RequestDetails msoRequest) { + if (!featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)) { + return; + } + try { + + //if cloudConfiguration field contains lcpRegion (e.g. in changeManagement scenarios) + if (msoRequest.getCloudConfiguration()!=null && StringUtils.isNotEmpty(msoRequest.getCloudConfiguration().getLcpCloudRegionId())) { + enrichCloudConfigurationWithCloudOwner(msoRequest.getCloudConfiguration(), msoRequest.getCloudConfiguration().getLcpCloudRegionId()); + } + //otherwise the cloudConfiguration is in the additionalProperties field of RequestDetails (e.g. in ng1 view/edit scenario) + else { + enrichRequestWithCloudOwnerByAdditionalProperties(msoRequest); + } + } + catch (Exception e) { + throw new GenericUncheckedException("Failed to enrich requestDetails with cloudOwner", e); + } + } + + protected void enrichRequestWithCloudOwnerByAdditionalProperties(RequestDetails msoRequest) { + String lcpCloudRegionId = null; + try { + lcpCloudRegionId = msoRequest.extractValueByPathUsingAdditionalProperties(LCP_CLOUD_REGION_ID_PATH, String.class); + } + catch (NotFoundException exception) { + LOGGER.debug("Can't find lcp region in RequestDetails. Assume no cloudOwner enrichment is needed. Reason: "+exception.getMessage()); + return; + } + String cloudOwner = aaiClient.getCloudOwnerByCloudRegionId(lcpCloudRegionId); + msoRequest.extractValueByPathUsingAdditionalProperties(CLOUD_CONFIGURATION_PATH, Map.class).put("cloudOwner", cloudOwner); + } + + @Override + public void enrichCloudConfigurationWithCloudOwner(CloudConfiguration cloudConfiguration, String lcpCloudRegionId) { + if (featureManager.isActive(Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST)) { + String cloudOwner = aaiClient.getCloudOwnerByCloudRegionId(lcpCloudRegionId); + cloudConfiguration.setCloudOwner(cloudOwner); + } + } +} -- cgit 1.2.3-korg