aboutsummaryrefslogtreecommitdiffstats
path: root/vid-automation
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2020-01-08 16:03:08 +0200
committerIttay Stern <ittay.stern@att.com>2020-01-09 17:17:46 +0200
commit6b5dd86a3557e8eed2c4584f5d16df5654cbc57b (patch)
treef3978f5e3e92a5728f8bdb89146de38305b16fb7 /vid-automation
parente8414b1fe839291418ead3a7e5a64bf382dc1121 (diff)
Fix the format of supplementary file and user params for aLaCarte requests
supplementary file shall be in format [{"name": "fieldName", "value" : "xyz"}] Also this is the format of each param in user params for aLaCarte requests and old macros Issue-ID: VID-743 Change-Id: I579298ce3f0b789a7a69e6af5a85bfbd50ae9fc0 Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Diffstat (limited to 'vid-automation')
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java9
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java25
-rw-r--r--vid-automation/src/main/resources/supplementaryFiles/sample.json14
3 files changed, 33 insertions, 15 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java
index 89744a723..e09f973d6 100644
--- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java
+++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java
@@ -67,9 +67,12 @@ public class PresetMSOCreateVfModuleALaCarteE2E extends PresetMSOCreateVfModuleB
+ " }" + addRelatedInstance()
+ " ],"
+ " \"requestParameters\": {"
- + " \"userParams\": [{"
- + " \"param\": \"ABCD\","
- + " \"vnf_instance_name\": \"sample\""
+ + " \"userParams\": [{"
+ + " \"name\": \"param\","
+ + " \"value\": \"ABCD\""
+ + " }, {"
+ + " \"name\": \"vnf_instance_name\","
+ + " \"value\": \"sample\""
+ " }"
+ " ],"
+ " \"testApi\": \"VNF_API\""
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 5a0b7525f..9d9984a22 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
@@ -93,14 +93,23 @@ 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\"" +
- " }" +
- " ]," +
+ "\"userParams\": [{"
+ + " \"name\": \"pasqualevpe0_bandwidth\","
+ + " \"value\": \"10\""
+ + " }, {"
+ + " \"name\": \"2017488_pasqualevpe0_vnf_instance_name\","
+ + " \"value\": \"mtnj309me6\""
+ + " }, {"
+ + " \"name\": \"2017488_pasqualevpe0_vnf_config_template_version\","
+ + " \"value\": \"17.2\""
+ + " }, {"
+ + " \"name\": \"2017488_pasqualevpe0_AIC_CLLI\","
+ + " \"value\": \"ATLMY8GA\""
+ + " }, {"
+ + " \"name\": \"pasqualevpe0_bandwidth_units\","
+ + " \"value\": \"Gbps\""
+ + " }"
+ + " ]," +
" \"usePreload\":true" +
" }" +
" }" +
diff --git a/vid-automation/src/main/resources/supplementaryFiles/sample.json b/vid-automation/src/main/resources/supplementaryFiles/sample.json
index c7d245f43..68ad69ccf 100644
--- a/vid-automation/src/main/resources/supplementaryFiles/sample.json
+++ b/vid-automation/src/main/resources/supplementaryFiles/sample.json
@@ -1,4 +1,10 @@
-{
- "param": "ABCD",
- "vnf_instance_name": "sample"
-} \ No newline at end of file
+[
+ {
+ "name": "param",
+ "value": "ABCD"
+ },
+ {
+ "name": "vnf_instance_name",
+ "value": "sample"
+ }
+]