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 --- .../org/onap/vid/mso/model/CloudConfiguration.java | 173 +++++++++++++++++++++ 1 file changed, 173 insertions(+) create mode 100644 vid-app-common/src/main/java/org/onap/vid/mso/model/CloudConfiguration.java (limited to 'vid-app-common/src/main/java/org/onap/vid/mso/model/CloudConfiguration.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/model/CloudConfiguration.java b/vid-app-common/src/main/java/org/onap/vid/mso/model/CloudConfiguration.java new file mode 100644 index 000000000..8286ec2b0 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/mso/model/CloudConfiguration.java @@ -0,0 +1,173 @@ + +package org.onap.vid.mso.model; + +import com.fasterxml.jackson.annotation.*; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.commons.lang.builder.ToStringBuilder; + +import java.util.HashMap; +import java.util.Map; + + +/** + * fields communicating the cloud configuration in a standard way + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "nodeLocation", + "lcpCloudRegionId", + "tenantId", + "cloudOwner" +}) +public class CloudConfiguration { + + /** + * Location identifier for the node + * + */ + @JsonProperty("nodeLocation") + private String nodeLocation; + /** + * LCP Node Location identifier + * + */ + @JsonProperty("lcpCloudRegionId") + private String lcpCloudRegionId; + /** + * Openstack tenant id + * + */ + @JsonProperty("tenantId") + private String tenantId; + /** + * the cloud owner + * + */ + @JsonProperty("cloudOwner") + private String cloudOwner; + @JsonIgnore + private Map additionalProperties = new HashMap<>(); + + /** + * Location identifier for the node + * + * @return + * The nodeLocation + */ + @JsonProperty("nodeLocation") + public String getNodeLocation() { + return nodeLocation; + } + + /** + * Location identifier for the node + * + * @param nodeLocation + * The nodeLocation + */ + @JsonProperty("nodeLocation") + public void setNodeLocation(String nodeLocation) { + this.nodeLocation = nodeLocation; + } + + /** + * LCP Node Location identifier + * + * @return + * The lcpCloudRegionId + */ + @JsonProperty("lcpCloudRegionId") + public String getLcpCloudRegionId() { + return lcpCloudRegionId; + } + + /** + * LCP Node Location identifier + * + * @param lcpCloudRegionId + * The lcpCloudRegionId + */ + @JsonProperty("lcpCloudRegionId") + public void setLcpCloudRegionId(String lcpCloudRegionId) { + this.lcpCloudRegionId = lcpCloudRegionId; + } + + /** + * Openstack tenant id + * + * @return + * The tenantId + */ + @JsonProperty("tenantId") + public String getTenantId() { + return tenantId; + } + + /** + * Openstack tenant id + * + * @param tenantId + * The tenantId + */ + @JsonProperty("tenantId") + public void setTenantId(String tenantId) { + this.tenantId = tenantId; + } + + /** + * the cloud owner + * + * @return + * The cloudOwner + */ + @JsonProperty("cloudOwner") + public String getCloudOwner() { + return cloudOwner; + } + + /** + * the cloud owner + * + * @param cloudOwner + * The cloudOwner + */ + @JsonProperty("cloudOwner") + public void setCloudOwner(String cloudOwner) { + this.cloudOwner = cloudOwner; + } + + @Override + public String toString() { + return ToStringBuilder.reflectionToString(this); + } + + @JsonAnyGetter + public Map getAdditionalProperties() { + return this.additionalProperties; + } + + @JsonAnySetter + public void setAdditionalProperty(String name, Object value) { + this.additionalProperties.put(name, value); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(nodeLocation).append(lcpCloudRegionId).append(tenantId).append(cloudOwner).append(additionalProperties).toHashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + if (!(other instanceof CloudConfiguration)) { + return false; + } + CloudConfiguration rhs = ((CloudConfiguration) other); + return new EqualsBuilder().append(nodeLocation, rhs.nodeLocation).append(lcpCloudRegionId, rhs.lcpCloudRegionId).append(tenantId, rhs.tenantId).append(cloudOwner, rhs.cloudOwner).append(additionalProperties, rhs.additionalProperties).isEquals(); + } + +} -- cgit 1.2.3-korg