update MSO volume group URL

[vid.git] / vid-automation / src / main / java / org / onap / simulator / presetGenerator / presets / mso / PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java

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 c8fb7fc..5a0b752 100644 (file)
--- 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
@@ -44,10 +41,10 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese
                 "      \"modelType\":\"" + select("volumeGroup", "vfModule") + "\"," +
                 "      \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," +
                 "      \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," +
-                "      \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," +
+                "      \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," +
                 "      \"modelVersion\":\"6\"," +
                 "      \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," +
-                "      \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"" +
+                "      \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"" +
                 "    }," +
                 "    \"cloudConfiguration\":{" +
                 "      \"lcpCloudRegionId\":\"my region\"," +
@@ -97,11 +94,11 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese
                 "    \"requestParameters\":{" +
                addTestApi()+
                 "       \"userParams\":[{" +
-                "          \"2017488_PASQUALEvpe0_vnf_instance_name\":\"mtnj309me6\"," +
-                "          \"2017488_PASQUALEvpe0_vnf_config_template_version\":\"17.2\"," +
-                "          \"PASQUALEvpe0_bandwidth\":\"10\"," +
-                "          \"2017488_PASQUALEvpe0_AIC_CLLI\":\"ATLMY8GA\"," +
-                "          \"PASQUALEvpe0_bandwidth_units\":\"Gbps\"" +
+                "          \"2017488_pasqualevpe0_vnf_instance_name\":\"mtnj309me6\"," +
+                "          \"2017488_pasqualevpe0_vnf_config_template_version\":\"17.2\"," +
+                "          \"pasqualevpe0_bandwidth\":\"10\"," +
+                "          \"2017488_pasqualevpe0_AIC_CLLI\":\"ATLMY8GA\"," +
+                "          \"pasqualevpe0_bandwidth_units\":\"Gbps\"" +
                 "        }" +
                 "      ]," +
                 "      \"usePreload\":true" +