Merge changes Ib4430bf2,Icc0bdb9e,I2736b984

* changes:
  Merge from ecomp 718fd196 - Ext. Services Simulator
  Merge from ecomp 718fd196 - Integration Tests
  Merge from ecomp 718fd196 - Modern UI

1 files changed, 9 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 4f4779d8e..8ad111849 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,8 +1,9 @@
 package org.onap.simulator.presetGenerator.presets.BasePresets;
 
-import java.util.Map;
 import vid.automation.test.infra.Features;
 
+import java.util.Map;
+
 /**
  * Created by itzikliderman on 27/12/2017.
  */
@@ -33,6 +34,13 @@ public abstract class BaseMSOPreset extends BasePreset {
                 "\"cloudOwner\": \""+cloudOwner+"\"," : "";
     }
 
+    protected String addPlatformIfNeeded(String platform) {
+        return platform != "" ?
+                " \"platform\": {" +
+                        " \"platformName\": \""+platform+"\"," +
+                        "}," : "";
+    }
+
     @Override
     protected String getRootPath() {
         return "/mso";