From f9fae2a0913adeba6d9c6d2f6579016a9871190a Mon Sep 17 00:00:00 2001 From: Eylon Malin Date: Tue, 10 Sep 2019 09:54:28 +0300 Subject: update MSO volume group URL Issue-ID: VID-622 Signed-off-by: Eylon Malin Change-Id: Id94bb1406ded3f8092a42c4a4cbc5ab975560721 Signed-off-by: Eylon Malin --- .../mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java | 7 ++----- .../presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java | 2 +- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets') diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java index 764237e18..5a0b7525f 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java @@ -28,11 +28,8 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese @Override public String getReqPath() { - if (isVolumeGroupPreset) { - return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/volumeGroups"; - } else { - return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + "/vfModules"; - } + String trailer = isVolumeGroupPreset ? "/volumeGroups" : "/vfModules"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/" + vnfInstanceId + trailer; } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java index 42e2a7097..0f4a0429c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java @@ -16,7 +16,7 @@ public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateIn @Override public String getReqPath() { - return getRootPath() + "/serviceInstances/v./" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups"; + return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + serviceInstanceId + "/vnfs/"+vnfInstanceId+"/volumeGroups"; } @Override -- cgit 1.2.3-korg