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 --- .../BaseResourceInstantiationRequestDetails.java | 142 +++++++++++++++++++++ 1 file changed, 142 insertions(+) create mode 100644 vid-app-common/src/main/java/org/onap/vid/mso/model/BaseResourceInstantiationRequestDetails.java (limited to 'vid-app-common/src/main/java/org/onap/vid/mso/model/BaseResourceInstantiationRequestDetails.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/model/BaseResourceInstantiationRequestDetails.java b/vid-app-common/src/main/java/org/onap/vid/mso/model/BaseResourceInstantiationRequestDetails.java new file mode 100644 index 000000000..9ade2abc4 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/mso/model/BaseResourceInstantiationRequestDetails.java @@ -0,0 +1,142 @@ +package org.onap.vid.mso.model; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.JsonTypeName; + +import java.util.List; + +import static com.fasterxml.jackson.annotation.JsonInclude.Include.NON_NULL; + +@JsonInclude(NON_NULL) +public class BaseResourceInstantiationRequestDetails { + + @JsonProperty("modelInfo") + protected ModelInfo modelInfo; + + @JsonProperty("cloudConfiguration") + protected CloudConfiguration cloudConfiguration; + + @JsonProperty("requestInfo") + protected RequestInfo requestInfo; + + @JsonProperty("platform") + protected Platform platform; + + @JsonProperty("lineOfBusiness") + protected LineOfBusiness lineOfBusiness; + + @JsonProperty("relatedInstanceList") + protected List relatedInstanceList; + + @JsonProperty("requestParameters") + protected RequestParameters requestParameters; + + public BaseResourceInstantiationRequestDetails(@JsonProperty(value = "modelInfo", required = true) ModelInfo modelInfo, + @JsonProperty(value = "cloudConfiguration", required = true) CloudConfiguration cloudConfiguration, + @JsonProperty(value = "requestInfo", required = true) RequestInfo requestInfo, + @JsonProperty(value = "platform", required = true) Platform platform, + @JsonProperty(value = "lineOfBusiness", required = true) LineOfBusiness lineOfBusiness, + @JsonProperty(value = "relatedInstanceList", required = true) List relatedInstanceList, + @JsonProperty(value = "requestParameters", required = true) RequestParameters requestParameters) + { + this.modelInfo = modelInfo; + this.cloudConfiguration = cloudConfiguration; + this.requestInfo = requestInfo; + this.platform = platform; + this.lineOfBusiness = lineOfBusiness; + this.relatedInstanceList = relatedInstanceList; + this.requestParameters = requestParameters; + } + + public BaseResourceInstantiationRequestDetails(@JsonProperty(value = "modelInfo", required = true) ModelInfo modelInfo, + @JsonProperty(value = "cloudConfiguration", required = true) CloudConfiguration cloudConfiguration, + @JsonProperty(value = "requestInfo", required = true) RequestInfo requestInfo, + @JsonProperty(value = "relatedInstanceList", required = true) List relatedInstanceList, + @JsonProperty(value = "requestParameters", required = true) RequestParameters requestParameters) + { + this.modelInfo = modelInfo; + this.cloudConfiguration = cloudConfiguration; + this.requestInfo = requestInfo; + this.relatedInstanceList = relatedInstanceList; + this.requestParameters = requestParameters; + } + + public static class RequestInfo { + + @JsonInclude(NON_NULL) public final String instanceName; + @JsonInclude(NON_NULL) public final String productFamilyId; + public final String source; + public final boolean suppressRollback; + public final String requestorId; + + public RequestInfo(String instanceName, String productFamilyId, String source, boolean rollbackOnFailure, String requestorId) { + this.instanceName = instanceName; + this.productFamilyId = productFamilyId; + this.source = source; + this.requestorId = requestorId; + // in the FE we are asking for "RollbackOnFailure" but to MSO we are passing the negative value "suppressRollback" + this.suppressRollback = !rollbackOnFailure; + } + } + + public static class Project{ + public final String projectName; + + public Project(String projectName) { + this.projectName = projectName; + } + } + + public static class Platform{ + public final String platformName; + + public Platform(String platformName) { + this.platformName = platformName; + } + } + + public static class LineOfBusiness{ + public final String lineOfBusinessName; + + public LineOfBusiness(String lineOfBusiness) { + this.lineOfBusinessName = lineOfBusiness; + } + } + + @JsonTypeName("relatedInstance") + @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) + public static class RelatedInstance{ + public ModelInfo modelInfo; + @JsonInclude(NON_NULL) public String instanceId; //TODO ask Eylon - is this needed, and if yes, for other fields as well? + @JsonInclude(NON_NULL) public String instanceName; + + public RelatedInstance (@JsonProperty(value = "modelInfo", required = true) ModelInfo modelInfo, + @JsonProperty (value = "instanceId", required = true) String instanceId){ + this.modelInfo = modelInfo; + this.instanceId = instanceId; + } + + public RelatedInstance (@JsonProperty(value = "modelInfo", required = true) ModelInfo modelInfo, + @JsonProperty (value = "instanceId", required = true) String instanceId, + @JsonProperty (value = "instanceName", required = true) String instanceName){ + this.modelInfo = modelInfo; + this.instanceId = instanceId; + this.instanceName = instanceName; + } + } + + public static class RequestParameters { + public final List userParams; + + public RequestParameters(List userParams) { + this.userParams = userParams; + } + + public List getUserParams() { + return userParams; + } + } +} + -- cgit 1.2.3-korg