diff options
4 files changed, 5 insertions, 6 deletions
diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/AicZones.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/AicZones.java index 77553a687..07bb191a9 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/AicZones.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/AicZones.java @@ -36,6 +36,7 @@ public final class AicZones { this.zones = Collections.unmodifiableList(zones); } + @JsonProperty("zone") public List<Zone> getZones() { return zones; } diff --git a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/Zone.java b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/Zone.java index c36618024..df4fd6495 100644 --- a/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/Zone.java +++ b/vid-app-common/src/main/java/org/onap/vid/aai/model/AaiGetAicZone/Zone.java @@ -37,10 +37,12 @@ public final class Zone { this.zoneName = zoneName; } + @JsonProperty("zone-id") public String getZoneId() { return zoneId; } + @JsonProperty("zone-name") public String getZoneName() { return zoneName; } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java index ed92767fa..ce0f8fd71 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateMacroPre1806Post.java @@ -1,11 +1,9 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId.ATT_NC; - public class PresetMSOCreateMacroPre1806Post extends PresetMSOBaseCreateInstancePost { public PresetMSOCreateMacroPre1806Post() { - this.cloudOwner = ATT_NC; + this.cloudOwner = "irma-aic"; } @Override diff --git a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java index df3ef9436..ba951bc55 100644 --- a/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java +++ b/vid-automation/src/main/java/vid/automation/test/test/SanityMacroDeployTest.java @@ -4,7 +4,6 @@ import com.google.common.collect.ImmutableList; import org.junit.Assert; import org.onap.sdc.ci.tests.datatypes.UserCredentials; import org.onap.sdc.ci.tests.utilities.GeneralUIUtils; -import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetCloudOwnersByCloudRegionId; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIGetSubscribersGet; import org.onap.simulator.presetGenerator.presets.aai.PresetAAIServiceDesignAndCreationPut; import org.onap.simulator.presetGenerator.presets.mso.PresetMSOCreateMacroPre1806Post; @@ -60,8 +59,7 @@ public class SanityMacroDeployTest extends CreateInstanceDialogBaseTest { SimulatorApi.registerExpectationFromPresets(ImmutableList.of( new PresetAAIServiceDesignAndCreationPut(), new PresetMSOCreateMacroPre1806Post(), - new PresetAAIGetSubscribersGet(), - PresetAAIGetCloudOwnersByCloudRegionId.PRESET_RDM3_TO_ATT_NC + new PresetAAIGetSubscribersGet() ), APPEND); } |