diff options
author | Ittay Stern <ittay.stern@att.com> | 2019-03-11 09:34:34 +0200 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-03-17 17:02:43 +0200 |
commit | 66af8b9b391879be78660d6ccb0a1f1f9340b423 (patch) | |
tree | fc0d510f7ea28a437bcb1e3b950d1281ac88a4e4 /vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model | |
parent | 37ad0cc1d36ec6ff68ec39fcaaf2617eef7d08fe (diff) |
Merge automation from ECOMP's repository
Reference commit in ECOMP: 8e92a8c6
Issue-ID: VID-378
Change-Id: Ia32f4813378ef95097f788246aa5b1172e20ca48
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model')
2 files changed, 27 insertions, 2 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java index 680dabe92..56fd1c9a7 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/RegistrationRequest.java @@ -11,6 +11,8 @@ public class RegistrationRequest { public static class SimulatorRequest { public final HttpMethod method; public final String path; + public final boolean strict; + public final Map<String,String> headers; @JsonInclude(JsonInclude.Include.NON_NULL) public final Map<String,List> queryParams; @@ -18,11 +20,13 @@ public class RegistrationRequest { @JsonInclude(JsonInclude.Include.NON_NULL) public final Object body; - public SimulatorRequest(HttpMethod method, String path, Map<String, List> queryParams, Object body) { + public SimulatorRequest(HttpMethod method, String path, Map<String, List> queryParams, Object body, boolean strictMatch, Map<String, String> headers) { this.method = method; this.path = path; this.queryParams = queryParams; this.body = body; + this.strict = strictMatch; + this.headers = headers; } } @@ -44,11 +48,27 @@ public class RegistrationRequest { } } + public static class Misc { + + @JsonInclude(JsonInclude.Include.NON_NULL) + public Integer numberOfTimes; + + public boolean replace; + + public Misc(Integer numberOfTimes, boolean replace) { + this.numberOfTimes = numberOfTimes; + this.replace = replace; + } + } + public SimulatorRequest simulatorRequest; public SimulatorResponse simulatorResponse; + public Misc misc; - public RegistrationRequest(SimulatorRequest simulatorRequest, SimulatorResponse simulatorResponse) { + public RegistrationRequest(SimulatorRequest simulatorRequest, SimulatorResponse simulatorResponse, Misc misc) { this.simulatorRequest = simulatorRequest; this.simulatorResponse = simulatorResponse; + this.misc = misc; } + } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java index 27f3f9bba..2f1d83f19 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/model/Subscriber.java @@ -3,6 +3,8 @@ package org.onap.simulator.presetGenerator.presets.model; import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.Map; + public class Subscriber { @JsonProperty("global-customer-id") @@ -16,4 +18,7 @@ public class Subscriber { @JsonProperty("resource-version") public String resourceVersion; + + @JsonProperty("relationship-list") + public Map relationshipList; } |