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 --- .../java/org/onap/vid/mso/rest/InstanceIds.java | 202 +++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 vid-app-common/src/main/java/org/onap/vid/mso/rest/InstanceIds.java (limited to 'vid-app-common/src/main/java/org/onap/vid/mso/rest/InstanceIds.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/rest/InstanceIds.java b/vid-app-common/src/main/java/org/onap/vid/mso/rest/InstanceIds.java new file mode 100644 index 000000000..5e1c5ce88 --- /dev/null +++ b/vid-app-common/src/main/java/org/onap/vid/mso/rest/InstanceIds.java @@ -0,0 +1,202 @@ + +package org.onap.vid.mso.rest; + +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; + + +/** + * instanceIds that may be associated with a particular request + * + */ +@JsonInclude(JsonInclude.Include.NON_NULL) +@JsonPropertyOrder({ + "networkInstanceId", + "serviceInstanceId", + "vfModuleInstanceId", + "vnfInstanceId", + "volumeGroupInstanceId" +}) +public class InstanceIds { + + /** + * UUID for the network instance (if any) + * + */ + @JsonProperty("networkInstanceId") + private String networkInstanceId; + /** + * UUID for the service instance + * + */ + @JsonProperty("serviceInstanceId") + private String serviceInstanceId; + /** + * UUID for the vfModule instance (if any) + * + */ + @JsonProperty("vfModuleInstanceId") + private String vfModuleInstanceId; + /** + * UUID for the vnf instance (if any) + * + */ + @JsonProperty("vnfInstanceId") + private String vnfInstanceId; + /** + * UUID for the volume group instance (if any) + * + */ + @JsonProperty("volumeGroupInstanceId") + private String volumeGroupInstanceId; + @JsonIgnore + private Map additionalProperties = new HashMap<>(); + + /** + * UUID for the network instance (if any) + * + * @return + * The networkInstanceId + */ + @JsonProperty("networkInstanceId") + public String getNetworkInstanceId() { + return networkInstanceId; + } + + /** + * UUID for the network instance (if any) + * + * @param networkInstanceId + * The networkInstanceId + */ + @JsonProperty("networkInstanceId") + public void setNetworkInstanceId(String networkInstanceId) { + this.networkInstanceId = networkInstanceId; + } + + /** + * UUID for the service instance + * + * @return + * The serviceInstanceId + */ + @JsonProperty("serviceInstanceId") + public String getServiceInstanceId() { + return serviceInstanceId; + } + + /** + * UUID for the service instance + * + * @param serviceInstanceId + * The serviceInstanceId + */ + @JsonProperty("serviceInstanceId") + public void setServiceInstanceId(String serviceInstanceId) { + this.serviceInstanceId = serviceInstanceId; + } + + /** + * UUID for the vfModule instance (if any) + * + * @return + * The vfModuleInstanceId + */ + @JsonProperty("vfModuleInstanceId") + public String getVfModuleInstanceId() { + return vfModuleInstanceId; + } + + /** + * UUID for the vfModule instance (if any) + * + * @param vfModuleInstanceId + * The vfModuleInstanceId + */ + @JsonProperty("vfModuleInstanceId") + public void setVfModuleInstanceId(String vfModuleInstanceId) { + this.vfModuleInstanceId = vfModuleInstanceId; + } + + /** + * UUID for the vnf instance (if any) + * + * @return + * The vnfInstanceId + */ + @JsonProperty("vnfInstanceId") + public String getVnfInstanceId() { + return vnfInstanceId; + } + + /** + * UUID for the vnf instance (if any) + * + * @param vnfInstanceId + * The vnfInstanceId + */ + @JsonProperty("vnfInstanceId") + public void setVnfInstanceId(String vnfInstanceId) { + this.vnfInstanceId = vnfInstanceId; + } + + /** + * UUID for the volume group instance (if any) + * + * @return + * The volumeGroupInstanceId + */ + @JsonProperty("volumeGroupInstanceId") + public String getVolumeGroupInstanceId() { + return volumeGroupInstanceId; + } + + /** + * UUID for the volume group instance (if any) + * + * @param volumeGroupInstanceId + * The volumeGroupInstanceId + */ + @JsonProperty("volumeGroupInstanceId") + public void setVolumeGroupInstanceId(String volumeGroupInstanceId) { + this.volumeGroupInstanceId = volumeGroupInstanceId; + } + + @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(networkInstanceId).append(serviceInstanceId).append(vfModuleInstanceId).append(vnfInstanceId).append(volumeGroupInstanceId).append(additionalProperties).toHashCode(); + } + + @Override + public boolean equals(Object other) { + if (other == this) { + return true; + } + if (!(other instanceof InstanceIds)) { + return false; + } + InstanceIds rhs = ((InstanceIds) other); + return new EqualsBuilder().append(networkInstanceId, rhs.networkInstanceId).append(serviceInstanceId, rhs.serviceInstanceId).append(vfModuleInstanceId, rhs.vfModuleInstanceId).append(vnfInstanceId, rhs.vnfInstanceId).append(volumeGroupInstanceId, rhs.volumeGroupInstanceId).append(additionalProperties, rhs.additionalProperties).isEquals(); + } + +} -- cgit 1.2.3-korg