Merge from ecomp 718fd196 - Integration Tests

Issue-ID: VID-378

Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489
Signed-off-by: Ittay Stern <ittay.stern@att.com>

1 files changed, 9 insertions, 8 deletions

diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java
index 615c196a9..291f0b722 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/aai/PresetAAIGetSubDetailsGetSpecificService.java
@@ -1,15 +1,16 @@
 package org.onap.simulator.presetGenerator.presets.aai;
 
-import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService;
-
 import com.google.common.collect.ImmutableMap;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
 import org.onap.simulator.presetGenerator.presets.BasePresets.BaseAAIPreset;
 import org.springframework.http.HttpMethod;
 import vid.automation.test.infra.ModelInfo;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import static vid.automation.test.infra.ModelInfo.serviceFabricSriovService;
+
 public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset {
     private String subscriberId;
     private String subscriberName = "Emanuel";
@@ -60,13 +61,13 @@ public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset {
                 "  \"service-subscriptions\":{" +
                 "    \"service-subscription\":[" +
                 "      {" +
-                "        \"service-type\":\"vFlowLogic\"," +
+                "        \"service-type\":\"vRichardson\"," +
                 "        \"resource-version\":\"1501700976809\"," +
                 "        \"service-instances\":{" +
                 "          \"service-instance\":[" +
                 "            {" +
                 "              \"service-instance-id\":\"414db2d4-18d0-415e-aac2-f255b586cfb5\"," +
-                "              \"service-instance-name\":\"vFlowLogic-vflf_080117\"," +
+                "              \"service-instance-name\":\"vRichardson-vflf_080117\"," +
                 "              \"persona-model-id\":null," +
                 "              \"persona-model-version\":null," +
                 "              \"resource-version\":\"1502391806301\"," +
@@ -76,7 +77,7 @@ public class PresetAAIGetSubDetailsGetSpecificService extends BaseAAIPreset {
                 "            }," +
                 "            {" +
                 "              \"service-instance-id\":\"769be44e-981a-4da8-af3b-ca5fa76b7fb1\"," +
-                "              \"service-instance-name\":\"vFlowLogic-vflp_080117\"," +
+                "              \"service-instance-name\":\"vRichardson-vflp_080117\"," +
                 "              \"persona-model-id\":null," +
                 "              \"persona-model-version\":null," +
                 "              \"resource-version\":\"1501712783617\"," +