summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCheung, Pat (kc1472) <kc1472@att.com>2020-05-01 01:01:06 +0000
committerDan Timoney <dtimoney@att.com>2020-05-01 13:17:48 +0000
commit695b770064bd338191803296d67d9482e0951771 (patch)
tree8289d4aa42d852eb87edeb996fc5ba8a09401364
parent3ffdb6571e187dea4d6491d8bdd832f5f4e2872f (diff)
self-serve DG fix
default value to success when RA returns it as emptystring and object status is success Issue-ID: SDNC-1140 Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com> Change-Id: I0a38d525d54a83c2863b73d944935defbb02b495 (cherry picked from commit ad9e8072cf43eead5021c526bb8397e7720b900c [formerly 1df36cd2a20f26dfa1c80bc5c3baaa03140f1987]) Former-commit-id: ceb230e77fe7b3c32d60772687d9955e14721214
Diffstat
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml20
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml32
4 files changed, 44 insertions, 12 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json
index adb87c2e..ce4d8e5a 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.json
@@ -1 +1 @@
-[{"id":"6b4b49f.1055fb8","type":"dgstart","name":"DGSTART","outputs":1,"x":138.75,"y":96.25,"z":"526171ae.fedf5","wires":[["3c107915.6fa3a6"]]},{"id":"3c107915.6fa3a6","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":414.75,"y":97.25,"z":"526171ae.fedf5","wires":[["cbd0ebd1.6e8f08"]]},{"id":"cbd0ebd1.6e8f08","type":"method","name":"self-serve-process-vfmodule-mapping-ra-response","xml":"<method rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":304.25001525878906,"y":151.00000190734863,"z":"526171ae.fedf5","wires":[["f5bce3e6.1e567"]]},{"id":"f5bce3e6.1e567","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":198.0158462524414,"y":221.86904907226562,"z":"526171ae.fedf5","wires":[["9ce5b52e.48c908","d3cc5884.c30558","abee92b7.bc9c3","b79744d9.2bff98"]]},{"id":"9ce5b52e.48c908","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":489.8015441894531,"y":265.2380962371826,"z":"526171ae.fedf5","wires":[["a0ee3414.05b128"]]},{"id":"a0ee3414.05b128","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":798.3729553222656,"y":264.6666851043701,"z":"526171ae.fedf5","wires":[["ac033f2d.3200b"]]},{"id":"ac033f2d.3200b","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"resolution-summary_length is null\" />\n","comments":"","x":969.3729934692383,"y":265.238094329834,"z":"526171ae.fedf5","wires":[]},{"id":"d3cc5884.c30558","type":"for","name":"for resolution-summary[]","xml":"<for silentFailure='true' index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\n","comments":"","outputs":1,"x":456.01190185546875,"y":475.23812103271484,"z":"526171ae.fedf5","wires":[["dbd631f0.7febe"]]},{"id":"96cd4f.fc62d2b","type":"set","name":" ADD resolution-summary[].name/value to param[]","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>","comments":"","x":1687.5118865966797,"y":557.4881381988525,"z":"526171ae.fedf5","wires":[]},{"id":"2407a617.5c3aba","type":"for","name":"for vf-module-parameters.param[]","xml":"<for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n","comments":"","outputs":1,"x":1359.2619094848633,"y":474.2381362915039,"z":"526171ae.fedf5","wires":[["857d3ce4.02812"]]},{"id":"dbd631f0.7febe","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":684.0118827819824,"y":474.9881372451782,"z":"526171ae.fedf5","wires":[["a8493bfd.538ca8","7fadd92a.eb8488","874b271f.dcac88"]]},{"id":"857d3ce4.02812","type":"switchNode","name":"switch param[].name == resolution-summary[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>","comments":"","outputs":1,"x":1755.2619094848633,"y":474.2381362915039,"z":"526171ae.fedf5","wires":[["61ccc27c.9706bc"]]},{"id":"61ccc27c.9706bc","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2075.2619094848633,"y":474.2381362915039,"z":"526171ae.fedf5","wires":[["5eb760a7.ca8b"]]},{"id":"767ab148.95e74","type":"set","name":"set param[].value = resolution-summary[].value","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\n","comments":"","x":2500.2620277404785,"y":442.4881362915039,"z":"526171ae.fedf5","wires":[]},{"id":"874b271f.dcac88","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":930.0118865966797,"y":556.9881381988525,"z":"526171ae.fedf5","wires":[["36c79855.4818f8"]]},{"id":"36c79855.4818f8","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1157.5118865966797,"y":556.4881381988525,"z":"526171ae.fedf5","wires":[["5e55393f.7f3178"]]},{"id":"a8493bfd.538ca8","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":946.0118713378906,"y":397.23814964294434,"z":"526171ae.fedf5","wires":[]},{"id":"7fadd92a.eb8488","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":910.5118827819824,"y":474.9881372451782,"z":"526171ae.fedf5","wires":[["79213cb4.10d734"]]},{"id":"79213cb4.10d734","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1125.047534942627,"y":474.80957984924316,"z":"526171ae.fedf5","wires":[["2407a617.5c3aba"]]},{"id":"5e55393f.7f3178","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1334.5118865966797,"y":556.4881381988525,"z":"526171ae.fedf5","wires":[["96cd4f.fc62d2b","3ec646c1.fece8a","ebe921a4.8fbc4","ea31d87.b092c28","9a192da8.5a885"]]},{"id":"3ec646c1.fece8a","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1554.4799880981445,"y":827.4840984344482,"z":"526171ae.fedf5","wires":[]},{"id":"69a400ee.5fa1e","type":"comment","name":"vdns-index","info":"","comments":"","x":487.73807525634766,"y":434.47620391845703,"z":"526171ae.fedf5","wires":[]},{"id":"3db6eec.3c5e512","type":"comment","name":"param-index","info":"","comments":"","x":1396.4880981445312,"y":433.4762029647827,"z":"526171ae.fedf5","wires":[]},{"id":"9973b602.5ec998","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2441.4880981445312,"y":506.7262077331543,"z":"526171ae.fedf5","wires":[]},{"id":"5eb760a7.ca8b","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2213.4880981445312,"y":473.72620582580566,"z":"526171ae.fedf5","wires":[["767ab148.95e74","9973b602.5ec998"]]},{"id":"9a192da8.5a885","type":"for","name":"for key-identifiers[]","xml":"<for silentFailure='true' index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\n","comments":"","outputs":1,"x":1580.0594940185547,"y":659.2976322174072,"z":"526171ae.fedf5","wires":[["7055c07e.16aca"]]},{"id":"7055c07e.16aca","type":"set","name":"set resource-key[] to key-identifiers[] ","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\n","comments":"","x":1877.8095245361328,"y":659.5476417541504,"z":"526171ae.fedf5","wires":[]},{"id":"746854e.156b0ac","type":"set","name":"set request-payload","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.payload' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\n\n","comments":"","x":1608.8848266601562,"y":771.4721984863281,"z":"526171ae.fedf5","wires":[]},{"id":"1c0d5ecf.145b11","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2136.988082885742,"y":414.47618675231934,"z":"526171ae.fedf5","wires":[]},{"id":"bf240c3d.97033","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1226.4880676269531,"y":523.226188659668,"z":"526171ae.fedf5","wires":[]},{"id":"ebe921a4.8fbc4","type":"set","name":"set resource-resolution-data.resource-key_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\n","comments":"","x":1684.3055572509766,"y":712.1229569911957,"z":"526171ae.fedf5","wires":[]},{"id":"b79744d9.2bff98","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vfmodule-mapping-ra-response\"/>\n\n","comments":"","outputs":1,"x":384.2618751525879,"y":1003.1824388504028,"z":"526171ae.fedf5","wires":[[]]},{"id":"abee92b7.bc9c3","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' \n\tvalue='`$highnum`'/>\n","comments":"","x":473.4761161804199,"y":950.0395412445068,"z":"526171ae.fedf5","wires":[]},{"id":"ea31d87.b092c28","type":"set","name":" set status, capability-name = dictionary-source","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>\t","comments":"","x":1677.1428680419922,"y":608.5714321136475,"z":"526171ae.fedf5","wires":[]}] \ No newline at end of file
+[{"id":"4dffe5e5.2014cc","type":"dgstart","name":"DGSTART","outputs":1,"x":184.2857208251953,"y":84.28571319580078,"z":"41e4459d.447b8c","wires":[["2ce361bc.f836ce"]]},{"id":"2ce361bc.f836ce","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":460.2857208251953,"y":85.28571319580078,"z":"41e4459d.447b8c","wires":[["cfafb01f.8d49b"]]},{"id":"cfafb01f.8d49b","type":"method","name":"self-serve-process-vfmodule-mapping-ra-response","xml":"<method rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":349.7857360839844,"y":139.0357151031494,"z":"41e4459d.447b8c","wires":[["d204cd73.3857c"]]},{"id":"d204cd73.3857c","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":243.55156707763672,"y":209.9047622680664,"z":"41e4459d.447b8c","wires":[["7add1820.763228","72dcae62.0aab6","b848ea26.075d18","958d6721.474458","69f6ae33.016d1"]]},{"id":"7add1820.763228","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":535.3372650146484,"y":253.2738094329834,"z":"41e4459d.447b8c","wires":[["aa135c09.4b66e"]]},{"id":"aa135c09.4b66e","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":843.9086761474609,"y":252.7023983001709,"z":"41e4459d.447b8c","wires":[["eef16a87.874de8"]]},{"id":"eef16a87.874de8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"resolution-summary_length is null\" />\n","comments":"","x":1014.9087142944336,"y":253.27380752563477,"z":"41e4459d.447b8c","wires":[]},{"id":"72dcae62.0aab6","type":"for","name":"for resolution-summary[]","xml":"<for silentFailure='true' index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\n","comments":"","outputs":1,"x":501.54762268066406,"y":463.2738342285156,"z":"41e4459d.447b8c","wires":[["f9ae9b79.bf3738"]]},{"id":"3b4b5171.7b11de","type":"set","name":" Set resolution-summary[].name to param[].name","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>","comments":"","x":1733.047607421875,"y":545.5238513946533,"z":"41e4459d.447b8c","wires":[]},{"id":"f3b8559c.ea7078","type":"for","name":"for vf-module-parameters.param[]","xml":"<for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n","comments":"","outputs":1,"x":1404.7976303100586,"y":462.2738494873047,"z":"41e4459d.447b8c","wires":[["e7afc417.ee7548"]]},{"id":"f9ae9b79.bf3738","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":729.5476036071777,"y":463.023850440979,"z":"41e4459d.447b8c","wires":[["7a396625.f84478","71739fc4.60f33","9d973e54.a0b6b"]]},{"id":"e7afc417.ee7548","type":"switchNode","name":"switch param[].name == resolution-summary[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>","comments":"","outputs":1,"x":1800.7976303100586,"y":462.2738494873047,"z":"41e4459d.447b8c","wires":[["afcd5282.7577c"]]},{"id":"afcd5282.7577c","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2120.7976303100586,"y":462.2738494873047,"z":"41e4459d.447b8c","wires":[["5f7a295a.f797f8"]]},{"id":"1f555f15.55e331","type":"set","name":"set param[].value = resolution-summary[].value","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$param-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\n","comments":"","x":2545.797748565674,"y":430.5238494873047,"z":"41e4459d.447b8c","wires":[]},{"id":"9d973e54.a0b6b","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":975.547607421875,"y":545.0238513946533,"z":"41e4459d.447b8c","wires":[["2745cd4a.058652"]]},{"id":"2745cd4a.058652","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1203.047607421875,"y":544.5238513946533,"z":"41e4459d.447b8c","wires":[["dccdd9d7.0b79f8"]]},{"id":"7a396625.f84478","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":991.5475921630859,"y":385.2738628387451,"z":"41e4459d.447b8c","wires":[]},{"id":"71739fc4.60f33","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":956.0476036071777,"y":463.023850440979,"z":"41e4459d.447b8c","wires":[["66448f1f.e873c"]]},{"id":"66448f1f.e873c","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1170.5832557678223,"y":462.84529304504395,"z":"41e4459d.447b8c","wires":[["f3b8559c.ea7078"]]},{"id":"dccdd9d7.0b79f8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1380.047607421875,"y":544.5238513946533,"z":"41e4459d.447b8c","wires":[["3b4b5171.7b11de","8184abe7.2cf4d8","f160e4b4.12ad18","389e9c2c.beef34","6480c6ff.db9fb8","98db20a0.3df52"]]},{"id":"8184abe7.2cf4d8","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1600.015769958496,"y":956.9483280181885,"z":"41e4459d.447b8c","wires":[]},{"id":"b57595e3.b06de8","type":"comment","name":"vdns-index","info":"","comments":"","x":533.273796081543,"y":422.5119171142578,"z":"41e4459d.447b8c","wires":[]},{"id":"7ca63690.a892b8","type":"comment","name":"param-index","info":"","comments":"","x":1442.0238189697266,"y":421.5119161605835,"z":"41e4459d.447b8c","wires":[]},{"id":"77656ea4.1cb28","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2487.0238189697266,"y":494.7619209289551,"z":"41e4459d.447b8c","wires":[]},{"id":"5f7a295a.f797f8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2259.0238189697266,"y":461.76191902160645,"z":"41e4459d.447b8c","wires":[["1f555f15.55e331","77656ea4.1cb28"]]},{"id":"6480c6ff.db9fb8","type":"for","name":"for key-identifiers[]","xml":"<for silentFailure='true' index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\n","comments":"","outputs":1,"x":1625.5952758789062,"y":788.7618618011475,"z":"41e4459d.447b8c","wires":[["c71cd379.b1433"]]},{"id":"c71cd379.b1433","type":"set","name":"set resource-key[] to key-identifiers[] ","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\n","comments":"","x":1923.3453063964844,"y":789.0118713378906,"z":"41e4459d.447b8c","wires":[]},{"id":"12b915a0.4fd51a","type":"set","name":"set request-payload","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.payload' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\n\n","comments":"","x":1654.4206085205078,"y":900.9364280700684,"z":"41e4459d.447b8c","wires":[]},{"id":"577d9c27.3765d4","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2182.5238037109375,"y":402.5118999481201,"z":"41e4459d.447b8c","wires":[]},{"id":"e7711e41.d6a6e","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1272.0237884521484,"y":511.26190185546875,"z":"41e4459d.447b8c","wires":[]},{"id":"f160e4b4.12ad18","type":"set","name":"set resource-resolution-data.resource-key_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\n","comments":"","x":1729.8413391113281,"y":841.5871865749359,"z":"41e4459d.447b8c","wires":[]},{"id":"958d6721.474458","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vfmodule-mapping-ra-response\"/>\n\n","comments":"","outputs":1,"x":429.7975959777832,"y":991.2181520462036,"z":"41e4459d.447b8c","wires":[[]]},{"id":"b848ea26.075d18","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length' \n\tvalue='`$highnum`'/>\n","comments":"","x":519.0118370056152,"y":938.0752544403076,"z":"41e4459d.447b8c","wires":[]},{"id":"389e9c2c.beef34","type":"set","name":" set status, capability-name = dictionary-source","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>\t","comments":"","x":1724.107177734375,"y":723.7499876022339,"z":"41e4459d.447b8c","wires":[]},{"id":"98db20a0.3df52","type":"switchNode","name":"switch resolution-summary[].status = success AND value = null","xml":"<switch test=\"`$jsonContextPrefix.resolution-summary[$vdns-index].status == 'success' and\n\t\t$jsonContextPrefix.resolution-summary[$vdns-index].value == ''`\">\n","comments":"","outputs":1,"x":1780.7142333984375,"y":632.857123374939,"z":"41e4459d.447b8c","wires":[["ac48d466.173e28","4f177fab.54b1c"]]},{"id":"ac48d466.173e28","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2132.1427459716797,"y":596.7141876220703,"z":"41e4459d.447b8c","wires":[["29436634.a9614a"]]},{"id":"29436634.a9614a","type":"set","name":" Set param[].value = success","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' \n\tvalue='`$CONSTANT`'/>","comments":"","x":2359.285659790039,"y":597.1427621841431,"z":"41e4459d.447b8c","wires":[]},{"id":"4f177fab.54b1c","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2132.857147216797,"y":658.5713424682617,"z":"41e4459d.447b8c","wires":[["dc032ddc.425d1"]]},{"id":"dc032ddc.425d1","type":"set","name":" Set resolution-summary[].value to param[].value","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>","comments":"","x":2432.142753601074,"y":657.7142295837402,"z":"41e4459d.447b8c","wires":[]},{"id":"69f6ae33.016d1","type":"set","name":"set CONSTANT = success","xml":"<set>\n<parameter name='CONSTANT' value='success'/>\n\n","comments":"","x":502.1429100036621,"y":319.99998664855957,"z":"41e4459d.447b8c","wires":[]}] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json
index 3c740525..6e5fa0bf 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.json
@@ -1 +1 @@
-[{"id":"3ac8196c.8fb0f6","type":"dgstart","name":"DGSTART","outputs":1,"x":126.25,"y":61.25,"z":"551b662f.7d7298","wires":[["f6f8f9de.56f358"]]},{"id":"f6f8f9de.56f358","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":402.25,"y":62.25,"z":"551b662f.7d7298","wires":[["c20fe3f9.92048"]]},{"id":"c20fe3f9.92048","type":"method","name":"self-self-serve-process-vnf-mapping-ra-response","xml":"<method rpc='self-serve-process-vnf-mapping-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":299.2500305175781,"y":127.25000476837158,"z":"551b662f.7d7298","wires":[["9247082.1922ef8"]]},{"id":"9247082.1922ef8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":237.73805618286133,"y":250.2619228363037,"z":"551b662f.7d7298","wires":[["68dd23cb.06097c","71fa910.8f2067","eaa46b7f.c15278","aeabb68e.f51168"]]},{"id":"68dd23cb.06097c","type":"for","name":"for resolution-summary[]","xml":"<for silentFailure='true' index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\n","comments":"","outputs":1,"x":519.7381134033203,"y":541.833384513855,"z":"551b662f.7d7298","wires":[["da76af9.2d4a05"]]},{"id":"1ccb09ad.b434b6","type":"set","name":" ADD resolution-summary[].name/value to param[]","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>","comments":"","x":1786.2380981445312,"y":624.0834016799927,"z":"551b662f.7d7298","wires":[]},{"id":"a1d640da.95bda","type":"for","name":"for vnf-parameters-data.param","xml":"<for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n","comments":"","outputs":1,"x":1422.9881210327148,"y":540.833399772644,"z":"551b662f.7d7298","wires":[["4329c418.10b55c"]]},{"id":"da76af9.2d4a05","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":747.738094329834,"y":541.5834007263184,"z":"551b662f.7d7298","wires":[["effe1903.163ec8","ed323bb9.d00bb8","b1216ac0.f868c8"]]},{"id":"4329c418.10b55c","type":"switchNode","name":"switch param[].name == resolution-summary[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>\n","comments":"","outputs":1,"x":1826.9881210327148,"y":540.833399772644,"z":"551b662f.7d7298","wires":[["930d1042.b7bdb"]]},{"id":"930d1042.b7bdb","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2132.988121032715,"y":540.833399772644,"z":"551b662f.7d7298","wires":[["f2ebb02e.be778"]]},{"id":"e57d9b2b.c5ccc8","type":"set","name":"set param[].value = resolution-summary[].value","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\n","comments":"","x":2560.98823928833,"y":509.08339977264404,"z":"551b662f.7d7298","wires":[]},{"id":"b1216ac0.f868c8","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":993.7380981445312,"y":623.5834016799927,"z":"551b662f.7d7298","wires":[["22c9419d.fe1ace"]]},{"id":"22c9419d.fe1ace","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1221.2380981445312,"y":623.0834016799927,"z":"551b662f.7d7298","wires":[["b583a30f.bb05"]]},{"id":"effe1903.163ec8","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":1009.7380828857422,"y":463.8334131240845,"z":"551b662f.7d7298","wires":[]},{"id":"ed323bb9.d00bb8","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":974.238094329834,"y":541.5834007263184,"z":"551b662f.7d7298","wires":[["2c2d3b60.278684"]]},{"id":"2c2d3b60.278684","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1188.7737464904785,"y":541.4048433303833,"z":"551b662f.7d7298","wires":[["a1d640da.95bda"]]},{"id":"b583a30f.bb05","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1398.2380981445312,"y":623.0834016799927,"z":"551b662f.7d7298","wires":[["1ccb09ad.b434b6","59e3a761.fa3f18","11d5c1d1.7f257e","b0496541.0cf478","96019345.2acd4"]]},{"id":"59e3a761.fa3f18","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1653.1430053710938,"y":886.9525337219238,"z":"551b662f.7d7298","wires":[]},{"id":"71fa910.8f2067","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vnf-mapping-ra-response\"/>\n\n","comments":"","outputs":1,"x":423.32144927978516,"y":1088.500051498413,"z":"551b662f.7d7298","wires":[[]]},{"id":"eaa46b7f.c15278","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":548.5714263916016,"y":300.1785879135132,"z":"551b662f.7d7298","wires":[["6163bd19.e66654"]]},{"id":"6163bd19.e66654","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":791.4285430908203,"y":299.6071729660034,"z":"551b662f.7d7298","wires":[["6d3de81b.ec24d8"]]},{"id":"6d3de81b.ec24d8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"resolution-summary is null\" />\n","comments":"","x":964.5714416503906,"y":299.750018119812,"z":"551b662f.7d7298","wires":[]},{"id":"4684d382.aa8ffc","type":"comment","name":"vdns-index","info":"","comments":"","x":551.4642868041992,"y":501.07146739959717,"z":"551b662f.7d7298","wires":[]},{"id":"9e76ee1.e86481","type":"comment","name":"param-index","info":"","comments":"","x":1460.2143096923828,"y":500.07146644592285,"z":"551b662f.7d7298","wires":[]},{"id":"e84bffc3.779a","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2502.214309692383,"y":573.3214712142944,"z":"551b662f.7d7298","wires":[]},{"id":"f2ebb02e.be778","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2271.214309692383,"y":540.3214693069458,"z":"551b662f.7d7298","wires":[["e57d9b2b.c5ccc8","e84bffc3.779a"]]},{"id":"96019345.2acd4","type":"for","name":"for key-identifiers[]","xml":"<for silentFailure='true' index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\n","comments":"","outputs":1,"x":1676.6430053710938,"y":725.8928451538086,"z":"551b662f.7d7298","wires":[["ef34ac1a.4a62"]]},{"id":"ef34ac1a.4a62","type":"set","name":"set resource-key[] to key-identifiers[] ","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\n","comments":"","x":1974.3930358886719,"y":726.1428546905518,"z":"551b662f.7d7298","wires":[]},{"id":"5c05d5fc.85169c","type":"set","name":"set request-payload","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\n\n","comments":"","x":1780.6906280517578,"y":834.9405727386475,"z":"551b662f.7d7298","wires":[]},{"id":"631ac794.3594b8","type":"comment","name":"from RA response","info":"","comments":"","x":582.7142639160156,"y":268.5714445114136,"z":"551b662f.7d7298","wires":[]},{"id":"e06d97bd.7c1bf8","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2072.7142944335938,"y":481.0714502334595,"z":"551b662f.7d7298","wires":[]},{"id":"aeabb68e.f51168","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' \n\tvalue='`$highnum`'/>\n","comments":"","x":512.5356903076172,"y":1035.357153892517,"z":"551b662f.7d7298","wires":[]},{"id":"d97f37df.4fea28","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1290.2142791748047,"y":589.8214521408081,"z":"551b662f.7d7298","wires":[]},{"id":"11d5c1d1.7f257e","type":"set","name":"set resource-resolution-data.resource-key_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\n","comments":"","x":1783.4285583496094,"y":782.718282699585,"z":"551b662f.7d7298","wires":[]},{"id":"b0496541.0cf478","type":"set","name":" set status, capability-name = dictionary-source","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>\t","comments":"","x":1774.2858428955078,"y":674.2857112884521,"z":"551b662f.7d7298","wires":[]}] \ No newline at end of file
+[{"id":"b3b7b17.a4cf05","type":"switchNode","name":"switch resolution-summary[].status = success AND value = null","xml":"<switch test=\"`$jsonContextPrefix.resolution-summary[$vdns-index].status == 'success' and\n\t\t$jsonContextPrefix.resolution-summary[$vdns-index].value == ''`\">\n","comments":"","outputs":1,"x":1881.7142639160156,"y":732.8571920394897,"z":"4276bad6.5195b4","wires":[["d701bdbd.beb0d","17485c32.a81d94"]]},{"id":"f66d629.78875a","type":"dgstart","name":"DGSTART","outputs":1,"x":176,"y":81.42857360839844,"z":"4276bad6.5195b4","wires":[["8b2dd27a.adc2c"]]},{"id":"8b2dd27a.adc2c","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>","outputs":1,"x":452,"y":82.42857360839844,"z":"4276bad6.5195b4","wires":[["b026238d.9ecac"]]},{"id":"b026238d.9ecac","type":"method","name":"self-self-serve-process-vnf-mapping-ra-response","xml":"<method rpc='self-serve-process-vnf-mapping-ra-response' mode='sync'>\n","comments":"","outputs":1,"x":349.0000305175781,"y":147.42857837677002,"z":"4276bad6.5195b4","wires":[["556d8ea4.6317a"]]},{"id":"556d8ea4.6317a","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":287.4880561828613,"y":270.44049644470215,"z":"4276bad6.5195b4","wires":[["288d3750.8f6c98","85050515.7d57b8","beae62cb.256a8","b9daffd4.9aec6","37f8f45b.488b7c"]]},{"id":"288d3750.8f6c98","type":"for","name":"for resolution-summary[]","xml":"<for silentFailure='true' index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >\n","comments":"","outputs":1,"x":569.4881134033203,"y":562.0119581222534,"z":"4276bad6.5195b4","wires":[["da8bb3c8.9c1fc"]]},{"id":"d937240e.1da0b8","type":"set","name":" Set resolution-summary[].name to param[].name","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>","comments":"","x":1835.9880981445312,"y":644.2619752883911,"z":"4276bad6.5195b4","wires":[]},{"id":"92cd85c1.a2cfb8","type":"for","name":"for vnf-parameters-data.param","xml":"<for silentFailure='true' index='param-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n","comments":"","outputs":1,"x":1472.7381210327148,"y":561.0119733810425,"z":"4276bad6.5195b4","wires":[["cb368506.6b9018"]]},{"id":"da8bb3c8.9c1fc","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":797.488094329834,"y":561.7619743347168,"z":"4276bad6.5195b4","wires":[["4918f3c5.4c6dac","da814a7.c90b7b8","8431c21f.5631e"]]},{"id":"cb368506.6b9018","type":"switchNode","name":"switch param[].name == resolution-summary[].name","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].name == $jsonContextPrefix.resolution-summary[$vdns-index].name`'>\n","comments":"","outputs":1,"x":1876.7381210327148,"y":561.0119733810425,"z":"4276bad6.5195b4","wires":[["1ad83ecf.a600d1"]]},{"id":"1ad83ecf.a600d1","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2182.738121032715,"y":561.0119733810425,"z":"4276bad6.5195b4","wires":[["d65c017.f3eff"]]},{"id":"abb690b3.913df","type":"set","name":"set param[].value = resolution-summary[].value","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$param-index].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>\n","comments":"","x":2610.73823928833,"y":529.2619733810425,"z":"4276bad6.5195b4","wires":[]},{"id":"8431c21f.5631e","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":1043.4880981445312,"y":643.7619752883911,"z":"4276bad6.5195b4","wires":[["d22bec07.6c625"]]},{"id":"d22bec07.6c625","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1270.9880981445312,"y":643.2619752883911,"z":"4276bad6.5195b4","wires":[["699f9e40.5bd87"]]},{"id":"4918f3c5.4c6dac","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":1059.4880828857422,"y":484.0119867324829,"z":"4276bad6.5195b4","wires":[]},{"id":"da814a7.c90b7b8","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":1023.988094329834,"y":561.7619743347168,"z":"4276bad6.5195b4","wires":[["5791c897.46c6a8"]]},{"id":"5791c897.46c6a8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1238.5237464904785,"y":561.5834169387817,"z":"4276bad6.5195b4","wires":[["92cd85c1.a2cfb8"]]},{"id":"699f9e40.5bd87","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1447.9880981445312,"y":643.2619752883911,"z":"4276bad6.5195b4","wires":[["d937240e.1da0b8","232879b6.163346","efacaad4.555498","fd41e789.517c08","b3b7b17.a4cf05","db16c4cc.3b4428"]]},{"id":"232879b6.163346","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1705.7499504089355,"y":1098.5596466064453,"z":"4276bad6.5195b4","wires":[]},{"id":"85050515.7d57b8","type":"record","name":"record","xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"DONE: self-serve-process-vnf-mapping-ra-response\"/>\n\n","comments":"","outputs":1,"x":473.07144927978516,"y":1108.6786251068115,"z":"4276bad6.5195b4","wires":[[]]},{"id":"beae62cb.256a8","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":598.3214263916016,"y":320.3571615219116,"z":"4276bad6.5195b4","wires":[["8f020a50.57ac18"]]},{"id":"8f020a50.57ac18","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":841.1785430908203,"y":319.78574657440186,"z":"4276bad6.5195b4","wires":[["bd1e0ff1.684ab"]]},{"id":"bd1e0ff1.684ab","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"resolution-summary is null\" />\n","comments":"","x":1014.3214416503906,"y":319.92859172821045,"z":"4276bad6.5195b4","wires":[]},{"id":"77f1589c.3d8298","type":"comment","name":"vdns-index","info":"","comments":"","x":605.2142868041992,"y":521.2500410079956,"z":"4276bad6.5195b4","wires":[]},{"id":"640806f0.8c75b8","type":"comment","name":"param-index","info":"","comments":"","x":1513.9643096923828,"y":520.2500400543213,"z":"4276bad6.5195b4","wires":[]},{"id":"9182d93d.367368","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2551.964309692383,"y":593.5000448226929,"z":"4276bad6.5195b4","wires":[]},{"id":"d65c017.f3eff","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2320.964309692383,"y":560.5000429153442,"z":"4276bad6.5195b4","wires":[["abb690b3.913df","9182d93d.367368"]]},{"id":"1813a516.38f77b","type":"set","name":"set request-payload","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>\n\n","comments":"","x":1787.2976760864258,"y":1033.69047164917,"z":"4276bad6.5195b4","wires":[]},{"id":"3eae73b2.e92d1c","type":"comment","name":"from RA response","info":"","comments":"","x":636.4642639160156,"y":288.750018119812,"z":"4276bad6.5195b4","wires":[]},{"id":"4df01056.646ae","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2126.4642944335938,"y":501.2500238418579,"z":"4276bad6.5195b4","wires":[]},{"id":"b9daffd4.9aec6","type":"set","name":"set service-data...param_length","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' \n\tvalue='`$highnum`'/>\n","comments":"","x":562.2856903076172,"y":1055.5357275009155,"z":"4276bad6.5195b4","wires":[]},{"id":"30ee057c.d6701a","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1343.9642791748047,"y":610.0000257492065,"z":"4276bad6.5195b4","wires":[]},{"id":"efacaad4.555498","type":"set","name":"set resource-resolution-data.resource-key_length","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />\n","comments":"","x":1834.606918334961,"y":957.1825046539307,"z":"4276bad6.5195b4","wires":[]},{"id":"fd41e789.517c08","type":"set","name":" set status, capability-name = dictionary-source","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>\t","comments":"","x":1828.3216094970703,"y":894.4642705917358,"z":"4276bad6.5195b4","wires":[]},{"id":"d701bdbd.beb0d","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2233.142776489258,"y":696.7142562866211,"z":"4276bad6.5195b4","wires":[["6ce79210.3b4d9c"]]},{"id":"6ce79210.3b4d9c","type":"set","name":" Set param[].value = success","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \n\tvalue='`$CONSTANT`'/>","comments":"","x":2460.285690307617,"y":697.1428308486938,"z":"4276bad6.5195b4","wires":[]},{"id":"37f8f45b.488b7c","type":"set","name":"set CONSTANT = success","xml":"<set>\n<parameter name='CONSTANT' value='success'/>\n\n","comments":"","x":568.8572082519531,"y":412.8571720123291,"z":"4276bad6.5195b4","wires":[]},{"id":"17485c32.a81d94","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2233.857177734375,"y":758.5714111328125,"z":"4276bad6.5195b4","wires":[["418ccfbe.d6722"]]},{"id":"418ccfbe.d6722","type":"set","name":" Set resolution-summary[].value to param[].value","xml":"<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>","comments":"","x":2533.1427841186523,"y":757.714298248291,"z":"4276bad6.5195b4","wires":[]},{"id":"db16c4cc.3b4428","type":"for","name":"for key-identifiers[]","xml":"<for silentFailure='true' index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >\n","comments":"","outputs":1,"x":1729.4286193847656,"y":837.1428146362305,"z":"4276bad6.5195b4","wires":[["24565c97.90a504"]]},{"id":"24565c97.90a504","type":"set","name":"set resource-key[] to key-identifiers[] ","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].name' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].value' \n\tvalue='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>\n","comments":"","x":2029.1786499023438,"y":837.3928241729736,"z":"4276bad6.5195b4","wires":[]}] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
index 4539ae13..75f5a3fe 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vfmodule-mapping-ra-response.xml
@@ -12,6 +12,9 @@
</return>
</outcome>
</switch>
+ <set>
+ <parameter name='CONSTANT' value='success'/>
+ </set>
<for silentFailure='true' index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >
<block atomic="true">
<set>
@@ -42,9 +45,22 @@
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>
- <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
</set>
+ <switch test="`$jsonContextPrefix.resolution-summary[$vdns-index].status == 'success' and
+ $jsonContextPrefix.resolution-summary[$vdns-index].value == ''`">
+ <outcome value='true'>
+ <set>
+ <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`'
+ value='`$CONSTANT`'/>
+ </set>
+ </outcome>
+ <outcome value='false'>
+ <set>
+ <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`'
+ value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
+ </set>
+ </outcome>
+ </switch>
<set>
<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
index 1be42fa4..551364fb 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-process-vnf-mapping-ra-response.xml
@@ -12,6 +12,9 @@
</return>
</outcome>
</switch>
+ <set>
+ <parameter name='CONSTANT' value='success'/>
+ </set>
<for silentFailure='true' index='vdns-index' start='0' end='`$jsonContextPrefix.resolution-summary_length`' >
<block atomic="true">
<set>
@@ -42,15 +45,22 @@
<set>
<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].name`'/>
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
- </set>
- <set>
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>
</set>
+ <switch test="`$jsonContextPrefix.resolution-summary[$vdns-index].status == 'success' and
+ $jsonContextPrefix.resolution-summary[$vdns-index].value == ''`">
+ <outcome value='true'>
+ <set>
+ <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`'
+ value='`$CONSTANT`'/>
+ </set>
+ </outcome>
+ <outcome value='false'>
+ <set>
+ <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`'
+ value='`$jsonContextPrefix.resolution-summary[$vdns-index].value`'/>
+ </set>
+ </outcome>
+ </switch>
<for silentFailure='true' index='kid-index' start='0' end='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' >
<set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$kid-index].name'
@@ -60,6 +70,12 @@
</set>
</for>
<set>
+ <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`'
+ value='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'/>
+ <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`'
+ value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>
+ </set>
+ <set>
<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />
</set>