diff options
author | Ittay Stern <ittay.stern@att.com> | 2018-12-31 17:21:27 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-01-09 20:19:55 +0200 |
commit | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (patch) | |
tree | 3bd672dff83e3218232cd8665680416b7fc26a5d /vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java | |
parent | 5ec29ff5e3864f1ba6ecac71f8bffbefa400cf27 (diff) |
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 <ittay.stern@att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java')
-rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java | 81 |
1 files changed, 23 insertions, 58 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java index 621754d17..3856e8894 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/Vnf.java @@ -22,99 +22,64 @@ package org.onap.vid.model.serviceInstantiation; import com.fasterxml.jackson.annotation.JsonProperty; -import org.apache.commons.lang3.StringUtils; -import org.onap.vid.domain.mso.ModelInfo; +import org.onap.vid.job.JobAdapter; +import org.onap.vid.mso.model.ModelInfo; -import java.util.Collections; import java.util.List; import java.util.Map; /** * The Class VNF. */ -public class Vnf { - private final ModelInfo modelInfo; +public class Vnf extends BaseResource implements JobAdapter.AsyncJobRequest { private final String productFamilyId; - private final String instanceName; - private final String platformName; - private final String lcpCloudRegionId; - - private final String tenantId; - - private final Boolean isUserProvidedNaming; - - private final List<Map<String, String>> instanceParams; - private final String lineOfBusiness; - private final Map<String, Map<String, VfModule>> vfModules; public Vnf(@JsonProperty("modelInfo") ModelInfo modelInfo, - @JsonProperty("productFamilyId") String productFamilyId, - @JsonProperty("instanceName") String instanceName, - @JsonProperty("isUserProvidedNaming") Boolean isUserProvidedNaming, - @JsonProperty("platformName") String platformName, - @JsonProperty("lcpCloudRegionId") String lcpCloudRegionId, - @JsonProperty("tenantId") String tenantId, - @JsonProperty("instanceParams") List<Map<String, String>> instanceParams, - @JsonProperty("lineOfBusinessName") String lineOfBusiness, - @JsonProperty("vfModules") Map<String, Map<String, VfModule>> vfModules) { - this.modelInfo = modelInfo; - this.modelInfo.setModelType("vnf"); + @JsonProperty("productFamilyId") String productFamilyId, + @JsonProperty("instanceName") String instanceName, + @JsonProperty("action") String action, + @JsonProperty("platformName") String platformName, + @JsonProperty("lcpCloudRegionId") String lcpCloudRegionId, + @JsonProperty("legacyRegion") String legacyRegion, + @JsonProperty("tenantId") String tenantId, + @JsonProperty("instanceParams") List<Map<String, String>> instanceParams, + @JsonProperty("lineOfBusinessName") String lineOfBusiness, + @JsonProperty("rollbackOnFailure") boolean rollbackOnFailure, + @JsonProperty("instanceId") String instanceId, + @JsonProperty("vfModules") Map<String, Map<String, VfModule>> vfModules) { + + super(modelInfo, instanceName, action, lcpCloudRegionId, legacyRegion, tenantId, instanceParams, rollbackOnFailure, instanceId); this.productFamilyId = productFamilyId; - this.instanceName = instanceName; - this.isUserProvidedNaming = isUserProvidedNaming; this.platformName = platformName; - this.lcpCloudRegionId = lcpCloudRegionId; - this.tenantId = tenantId; - this.instanceParams = instanceParams; - this.vfModules = vfModules; this.lineOfBusiness = lineOfBusiness; - } - - public ModelInfo getModelInfo() { - return modelInfo; + this.vfModules = vfModules; } public String getProductFamilyId() { return productFamilyId; } - public String getInstanceName() { - return instanceName; - } - - @JsonProperty("isUserProvidedNaming") - public Boolean isUserProvidedNaming() { - return isUserProvidedNaming; - } - public String getPlatformName() { return platformName; } - public String getLcpCloudRegionId() { - return lcpCloudRegionId; - } - - public String getTenantId() { - return tenantId; - } - - public List<Map<String, String>> getInstanceParams() { - return instanceParams == null ? Collections.emptyList() : instanceParams; + public String getLineOfBusiness() { + return lineOfBusiness; } public Map<String, Map<String, VfModule>> getVfModules() { return vfModules; } - public String getLineOfBusiness() { - return lineOfBusiness; + @Override + protected String getModelType() { + return "vnf"; } } |