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>

1 files changed, 6 insertions, 4 deletions

diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java
index 9b1ea80af..00a47b7db 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/sdc/PresetSDCGetServiceMetadataGet.java
@@ -1,12 +1,14 @@
 package org.onap.simulator.presetGenerator.presets.sdc;
 
 import org.springframework.http.HttpMethod;
+import vid.automation.test.infra.ModelInfo;
 
-/**
- * Created by itzikliderman on 21/12/2017.
- */
 public class PresetSDCGetServiceMetadataGet extends SdcPresetWithModelVersionId {
 
+    public PresetSDCGetServiceMetadataGet(ModelInfo modelInfo) {
+        this(modelInfo.modelVersionId, modelInfo.modelInvariantId, modelInfo.zipFileName);
+    }
+
     public PresetSDCGetServiceMetadataGet(String modelVersionId, String modelInvariantId, String zipFileName) {
         super(modelVersionId);
         this.modelInvariantId = modelInvariantId;
@@ -25,7 +27,7 @@ public class PresetSDCGetServiceMetadataGet extends SdcPresetWithModelVersionId
                 "        \"name\": \"action-data\"," +
                 "        \"version\": \"1.0\"," +
                 "        \"toscaModelURL\": \"./"+zipFileName+"\"," +
-                "        \"category\": \"Mobility\"," +
+                "        \"category\": \"Emanuel\"," +
                 "        \"lifecycleState\": \"CERTIFIED\"," +
                 "        \"lastUpdaterUserId\": \"rg276b\"," +
                 "        \"lastUpdaterFullName\": null," +