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/ServiceInstantiationRequestDetails.java | 84 +++++++++++++++------- 1 file changed, 57 insertions(+), 27 deletions(-) (limited to 'vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java') diff --git a/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java b/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java index 1a54b74cb..c6d89e31f 100644 --- a/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java +++ b/vid-app-common/src/main/java/org/onap/vid/mso/model/ServiceInstantiationRequestDetails.java @@ -2,12 +2,7 @@ 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 org.onap.vid.domain.mso.CloudConfiguration; -import org.onap.vid.domain.mso.ModelInfo; -import org.onap.vid.domain.mso.SubscriberInfo; -import org.onap.vid.model.serviceInstantiation.VfModule; +import org.onap.vid.mso.rest.SubscriberInfo; import java.util.List; import java.util.Map; @@ -62,7 +57,7 @@ public class ServiceInstantiationRequestDetails { public static class RequestInfo { @JsonInclude(NON_NULL) public final String instanceName; - public final String productFamilyId; + @JsonInclude(NON_NULL) public final String productFamilyId; public final String source; public final boolean suppressRollback; public final String requestorId; @@ -86,33 +81,68 @@ public class ServiceInstantiationRequestDetails { } public static class RequestParameters { - + @JsonInclude(NON_NULL) public final String testApi; public final String subscriptionServiceType; public final boolean aLaCarte; - public final List userParams; + public final List userParams; - public RequestParameters(String subscriptionServiceType, boolean aLaCarte, List userParams) { + public RequestParameters(String subscriptionServiceType, boolean aLaCarte, List userParams) { + this(subscriptionServiceType, aLaCarte, userParams, null); + } + + public RequestParameters(String subscriptionServiceType, boolean aLaCarte, List userParams, String testApi) { this.subscriptionServiceType = subscriptionServiceType; this.aLaCarte = aLaCarte; this.userParams = userParams; + this.testApi = testApi; } } - @JsonTypeName("service") - @JsonTypeInfo(include = JsonTypeInfo.As.WRAPPER_OBJECT, use = JsonTypeInfo.Id.NAME) - public static class ServiceInstantiationService{ - public ModelInfo modelInfo = new ModelInfo(); - @JsonInclude(NON_NULL) public String instanceName; - public List> instanceParams; - public ServiceInstantiationVnfList resources; - - public ServiceInstantiationService (ModelInfo modelInfo, String instanceName, List> instanceParams, ServiceInstantiationVnfList vnfs){ - this.modelInfo.setModelType(modelInfo.getModelType()); - this.modelInfo.setModelName(modelInfo.getModelName()); - this.modelInfo.setModelVersionId(modelInfo.getModelVersionId()); - this.instanceName = instanceName; - this.instanceParams = instanceParams; - this.resources = vnfs; + public static class UserParamNameAndValue implements UserParamTypes { + private final String name; + private final String value; + + public UserParamNameAndValue(String name, String value) { + this.name = name; + this.value = value; + } + + public String getName() { + return name; + } + + public String getValue() { + return value; + } + } + + public static class ServiceInstantiationService implements UserParamTypes { + private final ServiceInstantiationServiceInner serviceInstantiationServiceInner; + + public ServiceInstantiationService(ModelInfo modelInfo, String instanceName, List> instanceParams, ServiceInstantiationVnfList vnfs) { + serviceInstantiationServiceInner = new ServiceInstantiationServiceInner(modelInfo, instanceName, instanceParams, vnfs); + } + + @JsonProperty("service") + public ServiceInstantiationServiceInner getServiceInstantiationServiceInner() { + return serviceInstantiationServiceInner; + } + + private static class ServiceInstantiationServiceInner implements UserParamTypes { + public ModelInfo modelInfo = new ModelInfo(); + @JsonInclude(NON_NULL) + public String instanceName; + public List> instanceParams; + public ServiceInstantiationVnfList resources; + + public ServiceInstantiationServiceInner(ModelInfo modelInfo, String instanceName, List> instanceParams, ServiceInstantiationVnfList vnfs) { + this.modelInfo.setModelType(modelInfo.getModelType()); + this.modelInfo.setModelName(modelInfo.getModelName()); + this.modelInfo.setModelVersionId(modelInfo.getModelVersionId()); + this.instanceName = instanceName; + this.instanceParams = instanceParams; + this.resources = vnfs; + } } } @@ -131,10 +161,10 @@ public class ServiceInstantiationRequestDetails { public final LineOfBusiness lineOfBusiness; public final String productFamilyId; public final List> instanceParams; - @JsonInclude(NON_EMPTY) public final List vfModules; + @JsonInclude(NON_EMPTY) public final List vfModules; @JsonInclude(NON_NULL) public final String instanceName; - public ServiceInstantiationVnf(ModelInfo modelInfo, CloudConfiguration cloudConfiguration, String platform, String lineOfBusiness, String productFamilyId, List> instanceParams, List vfModules, String instanceName) { + public ServiceInstantiationVnf(ModelInfo modelInfo, CloudConfiguration cloudConfiguration, String platform, String lineOfBusiness, String productFamilyId, List> instanceParams, List vfModules, String instanceName) { this.modelInfo = modelInfo; this.cloudConfiguration = cloudConfiguration; this.platform = new Platform(platform); -- cgit 1.2.3-korg