diff options
| author |   Eylon Malin <eylon.malin@intl.att.com> | 2020-01-08 16:03:08 +0200 |
|---|---|---|
| committer |   Ittay Stern <ittay.stern@att.com> | 2020-01-09 17:17:46 +0200 |
| commit | 6b5dd86a3557e8eed2c4584f5d16df5654cbc57b (patch) | |
| tree | f3978f5e3e92a5728f8bdb89146de38305b16fb7 /vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java | |
| parent | e8414b1fe839291418ead3a7e5a64bf382dc1121 (diff) | |
Fix the format of supplementary file and user params for aLaCarte requests
supplementary file shall be in format [{"name": "fieldName", "value" : "xyz"}]
Also this is the format of each param in user params for aLaCarte requests and old macros
Issue-ID: VID-743
Change-Id: I579298ce3f0b789a7a69e6af5a85bfbd50ae9fc0
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Diffstat (limited to 'vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java')
| -rw-r--r-- | vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java index 89e25e662..d04e679e6 100644 --- a/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java +++ b/vid-app-common/src/main/java/org/onap/vid/model/serviceInstantiation/VfModule.java @@ -33,6 +33,7 @@ import javax.annotation.Nullable; import org.onap.vid.job.JobAdapter; import org.onap.vid.job.JobType; import org.onap.vid.mso.model.ModelInfo; +import org.onap.vid.mso.model.ServiceInstantiationRequestDetails.UserParamNameAndValue; /** * The Class VfModule. @@ -42,7 +43,7 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest @JsonInclude(NON_NULL) @JsonProperty("volumeGroupName") private final String volumeGroupInstanceName; @JsonInclude(NON_NULL) @JsonProperty("sdncPreLoad") private Boolean usePreload; - private Map<String, String> supplementaryParams; + private List<UserParamNameAndValue> supplementaryParams; @JsonInclude(NON_NULL) private final Boolean retainVolumeGroups; @@ -58,7 +59,7 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest @JsonProperty("legacyRegion") String legacyRegion, @JsonProperty("tenantId") String tenantId, @JsonProperty("instanceParams") List<Map<String, String>> instanceParams, - @JsonProperty("supplementaryFileContent") Map<String, String> supplementaryParams, + @JsonProperty("supplementaryFileContent") List<UserParamNameAndValue> supplementaryParams, @JsonProperty("rollbackOnFailure") boolean rollbackOnFailure, @JsonProperty("sdncPreLoad") @JsonAlias("usePreload") Boolean usePreload, @JsonProperty("instanceId") String instanceId, @@ -86,7 +87,7 @@ public class VfModule extends BaseResource implements JobAdapter.AsyncJobRequest return usePreload; } - public Map<String, String> getSupplementaryParams() { + public List<UserParamNameAndValue> getSupplementaryParams() { return supplementaryParams; } |