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 --- .../model/serviceInstantiation/BaseResource.java | 115 +++++++++++++++++++++ 1 file changed, 115 insertions(+) create mode 100644 vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java (limited to 'vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java new file mode 100644 index 000000000..653c73477 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/BaseResource.java @@ -0,0 +1,115 @@ +/*- + * ============LICENSE_START======================================================= + * VID + * ================================================================================ + * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file 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. + * ============LICENSE_END========================================================= + */ + +package org.onap.vid.model.serviceInstantiation; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.google.common.collect.ImmutableMap; +import org.apache.commons.lang3.StringUtils; +import org.onap.vid.job.JobAdapter; +import org.onap.vid.model.Action; +import org.onap.vid.mso.model.ModelInfo; + +import java.util.Collections; +import java.util.List; +import java.util.Map; + +public abstract class BaseResource implements JobAdapter.AsyncJobRequest { + + protected final String instanceId; + protected ModelInfo modelInfo; + + protected String instanceName; + + protected final Action action; + + protected String lcpCloudRegionId; + + protected String tenantId; + + protected List> instanceParams; + + protected boolean rollbackOnFailure; + + private static final Map actionStingToEnumMap = ImmutableMap.of( + "Delete", Action.Delete, + "Create", Action.Create, + "None", Action.None, + "Update_Delete", Action.Delete, + "None_Delete", Action.Delete + ); + + + protected BaseResource(@JsonProperty("modelInfo") ModelInfo modelInfo, + @JsonProperty("instanceName") String instanceName, + @JsonProperty("action") String action, + @JsonProperty("lcpCloudRegionId") String lcpCloudRegionId, + @JsonProperty("legacyRegion") String legacyRegion, + @JsonProperty("tenantId") String tenantId, + @JsonProperty("instanceParams") List> instanceParams, + @JsonProperty("rollbackOnFailure") boolean rollbackOnFailure, + @JsonProperty("instanceId") String instanceId) { + this.modelInfo = modelInfo; + this.modelInfo.setModelType(getModelType()); + this.rollbackOnFailure = rollbackOnFailure; + this.instanceName = StringUtils.defaultString(instanceName, "");; + this.action = actionStringToEnum(action); + this.lcpCloudRegionId = StringUtils.isNotEmpty(legacyRegion) ? legacyRegion : lcpCloudRegionId; + this.tenantId = tenantId; + this.instanceParams = instanceParams; + this.instanceId = instanceId; + } + + private Action actionStringToEnum(String actionAsString) { + return actionStingToEnumMap.get(actionAsString); + } + + public ModelInfo getModelInfo() { + return modelInfo; + } + + public String getInstanceName() { + return instanceName; + } + + public Action getAction() { + return action; + } + + public String getLcpCloudRegionId() { + return lcpCloudRegionId; + } + + public String getTenantId() { + return tenantId; + } + + public List> getInstanceParams() { + return instanceParams == null ? Collections.emptyList() : instanceParams; + } + + public boolean isRollbackOnFailure() { return rollbackOnFailure; } + + public String getInstanceId() { + return instanceId; + } + + protected abstract String getModelType(); +} -- cgit 1.2.3-korg