From 66af8b9b391879be78660d6ccb0a1f1f9340b423 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 11 Mar 2019 09:34:34 +0200
Subject: 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>
---
 .../presets/BasePresets/BaseMSOPreset.java         | 19 +++++++++++++++-
 .../presets/BasePresets/BasePreset.java            | 26 ++++++++++++++++------
 2 files changed, 37 insertions(+), 8 deletions(-)

(limited to 'vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets')

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;
+    }
 }
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java
index 162367368..662677e83 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/BasePresets/BasePreset.java
@@ -1,11 +1,10 @@
 package org.onap.simulator.presetGenerator.presets.BasePresets;
 
-import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest;
-import org.springframework.http.HttpMethod;
-
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.onap.simulator.presetGenerator.presets.model.RegistrationRequest;
+import org.springframework.http.HttpMethod;
 
 /**
  * Created by itzikliderman on 13/12/2017.
@@ -13,12 +12,13 @@ import java.util.Map;
 public abstract class BasePreset {
 
     public RegistrationRequest generateScenario() {
-        Map<String, String> headers = new HashMap<>();
-        headers.put("Content-Type", getContentType());
+        Map<String, String> responseHeaders = new HashMap<>();
+        responseHeaders.put("Content-Type", getContentType());
 
         return new RegistrationRequest(
-                new RegistrationRequest.SimulatorRequest(getReqMethod(), getReqPath(), getQueryParams(), getRequestBody()),
-                new RegistrationRequest.SimulatorResponse(getResponseCode(), headers, getResponseBody(), getFile()));
+                new RegistrationRequest.SimulatorRequest(getReqMethod(), getReqPath(), getQueryParams(), getRequestBody(), isStrictMatch(), getRequestHeaders()),
+                new RegistrationRequest.SimulatorResponse(getResponseCode(), responseHeaders, getResponseBody(), getFile()),
+                new RegistrationRequest.Misc(getNumberOfTimes(), getReplace()));
     }
 
     public Object getResponseBody() { return  null; };
@@ -41,7 +41,19 @@ public abstract class BasePreset {
         return null;
     }
 
+    public boolean isStrictMatch() {
+        return false;
+    }
+
     public Map<String, List> getQueryParams() { return null; }
 
     protected abstract String getRootPath();
+
+    protected Integer getNumberOfTimes() {return null;}
+
+    protected boolean getReplace()  {return true;}
+
+    public Map<String,String> getRequestHeaders() {
+        return new HashMap<>();
+    }
 }
-- 
cgit 1.2.3-korg