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/BasePresets/BaseMSOPreset.java | |
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/BasePresets/BaseMSOPreset.java')
-rw-r--r-- | vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java index 8194d87ac..4f4779d8e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BaseMSOPreset.java @@ -1,5 +1,6 @@ package org.onap.simulator.presetGenerator.presets.BasePresets; +import java.util.Map; import vid.automation.test.infra.Features; /** @@ -7,13 +8,17 @@ import vid.automation.test.infra.Features; */ public abstract class BaseMSOPreset extends BasePreset { + public static final String DEFAULT_CLOUD_OWNER = "irma-aic"; + public static final String DEFAULT_INSTANCE_ID = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb"; + protected String cloudOwner = DEFAULT_CLOUD_OWNER; + public static String getRequestBodyWithTestApiOnly() { if (Features.FLAG_ADD_MSO_TESTAPI_FIELD.isActive()) { return "" + "{" + " \"requestDetails\": { " + " \"requestParameters\": { " + - " \"testApi\": \"GR_API\" " + + " \"testApi\": \"VNF_API\" " + " } " + " } " + "} " + @@ -23,8 +28,20 @@ public abstract class BaseMSOPreset extends BasePreset { } } + protected String addCloudOwnerIfNeeded() { + return Features.FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST.isActive() ? + "\"cloudOwner\": \""+cloudOwner+"\"," : ""; + } + @Override protected String getRootPath() { return "/mso"; } + + @Override + public Map<String, String> getRequestHeaders() { + Map<String, String> map = super.getRequestHeaders(); + map.put("X-ONAP-PartnerName", "VID"); + return map; + } } |