summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api
diff options
context:
space:
mode:
authorCheung, Pat (kc1472) <kc1472@att.com>2020-04-23 14:52:52 +0000
committerCheung, Pat (kc1472) <kc1472@att.com>2020-04-23 14:52:52 +0000
commitf2572405ddda75817b0e7fb4ecd072be5788d535 (patch)
tree3f6a90c03336b9b17ae7a29d4cf33c7f3624bfbb /platform-logic/generic-resource-api
parentb0b2b0a05048f21f6c0e9d4d40b6ca5eb3bb93e7 (diff)
self-serve DG bugfix
fix cds ra response to yang model mapping Issue-ID: SDNC-1140 Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com> Change-Id: I54cdb6fec0bd448b99344868e894bf65dc2f26fc Former-commit-id: cfddfad6cdbe087a0b75c5df73cf059dbe2d700f
Diffstat (limited to 'platform-logic/generic-resource-api')
-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.xml32
-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, 26 insertions, 42 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 daa8d21f..adb87c2e 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":"79a754d7.03267c","type":"dgstart","name":"DGSTART","outputs":1,"x":138.57142639160156,"y":61.42857360839844,"z":"1823fdbd.4322b2","wires":[["5f07514.3329cb"]]},{"id":"5f07514.3329cb","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.57142639160156,"y":62.42857360839844,"z":"1823fdbd.4322b2","wires":[["ab2e4dba.2286e"]]},{"id":"ab2e4dba.2286e","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.0714416503906,"y":116.17857551574707,"z":"1823fdbd.4322b2","wires":[["553fad5c.980e24"]]},{"id":"553fad5c.980e24","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":197.83727264404297,"y":187.04762268066406,"z":"1823fdbd.4322b2","wires":[["fe513761.0453c8","46e20dec.d3b074","41663779.ca9db8","269dfcc8.a905a4"]]},{"id":"fe513761.0453c8","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":489.6229705810547,"y":230.41666984558105,"z":"1823fdbd.4322b2","wires":[["2b5ec4f9.cbde6c"]]},{"id":"2b5ec4f9.cbde6c","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":798.1943817138672,"y":229.84525871276855,"z":"1823fdbd.4322b2","wires":[["9b918b20.342278"]]},{"id":"9b918b20.342278","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.1944198608398,"y":230.41666793823242,"z":"1823fdbd.4322b2","wires":[]},{"id":"46e20dec.d3b074","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":455.8333282470703,"y":440.4166946411133,"z":"1823fdbd.4322b2","wires":[["954f452d.486a28"]]},{"id":"938b4d93.409c3","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.3333129882812,"y":522.666711807251,"z":"1823fdbd.4322b2","wires":[]},{"id":"3ef76de7.5dfde2","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.0833358764648,"y":439.41670989990234,"z":"1823fdbd.4322b2","wires":[["f75c0cc1.c0d76"]]},{"id":"954f452d.486a28","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":683.833309173584,"y":440.16671085357666,"z":"1823fdbd.4322b2","wires":[["94a79fec.a4fc6","636f16f7.c04838","267a31a7.235fee"]]},{"id":"f75c0cc1.c0d76","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.0833358764648,"y":439.41670989990234,"z":"1823fdbd.4322b2","wires":[["fca48735.1564f8"]]},{"id":"fca48735.1564f8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2075.083335876465,"y":439.41670989990234,"z":"1823fdbd.4322b2","wires":[["57f68d23.7bf1d4"]]},{"id":"b76edb5a.1c05a8","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.08345413208,"y":407.66670989990234,"z":"1823fdbd.4322b2","wires":[]},{"id":"267a31a7.235fee","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":929.8333129882812,"y":522.166711807251,"z":"1823fdbd.4322b2","wires":[["bdf7df62.8888c"]]},{"id":"bdf7df62.8888c","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1157.3333129882812,"y":521.666711807251,"z":"1823fdbd.4322b2","wires":[["50cf521c.43565c"]]},{"id":"94a79fec.a4fc6","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":945.8332977294922,"y":362.4167232513428,"z":"1823fdbd.4322b2","wires":[]},{"id":"636f16f7.c04838","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":910.333309173584,"y":440.16671085357666,"z":"1823fdbd.4322b2","wires":[["c66e2a0d.6fd948"]]},{"id":"c66e2a0d.6fd948","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1124.8689613342285,"y":439.9881534576416,"z":"1823fdbd.4322b2","wires":[["3ef76de7.5dfde2"]]},{"id":"50cf521c.43565c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1334.3333129882812,"y":521.666711807251,"z":"1823fdbd.4322b2","wires":[["938b4d93.409c3","5e3df1a4.6ec2c","17be5cec.c2a0e3","f55a1ca5.c81d9","c092e803.425f58","b53942f9.6835c"]]},{"id":"5e3df1a4.6ec2c","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1547.158576965332,"y":846.9484558105469,"z":"1823fdbd.4322b2","wires":[]},{"id":"17fdac5b.a35a14","type":"comment","name":"vdns-index","info":"","comments":"","x":487.5595016479492,"y":399.65477752685547,"z":"1823fdbd.4322b2","wires":[]},{"id":"36736ef5.d25a72","type":"comment","name":"param-index","info":"","comments":"","x":1396.3095245361328,"y":398.65477657318115,"z":"1823fdbd.4322b2","wires":[]},{"id":"b59f84a4.fbb0f8","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2441.309524536133,"y":471.90478134155273,"z":"1823fdbd.4322b2","wires":[]},{"id":"57f68d23.7bf1d4","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2213.309524536133,"y":438.9047794342041,"z":"1823fdbd.4322b2","wires":[["b76edb5a.1c05a8","b59f84a4.fbb0f8"]]},{"id":"17be5cec.c2a0e3","type":"switchNode","name":"switch dictionary-source","xml":"<switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>\n","comments":"","outputs":1,"x":1587.559497833252,"y":605.9047651290894,"z":"1823fdbd.4322b2","wires":[["4a257f5c.6e8cc"]]},{"id":"4a257f5c.6e8cc","type":"other","name":"sdnc","xml":"<outcome value='sdnc'>\n","comments":"","outputs":1,"x":1800.0595054626465,"y":605.904764175415,"z":"1823fdbd.4322b2","wires":[["c6b4f5b9.5551d8"]]},{"id":"f3cd0176.72782","type":"comment","name":"capability","info":"","comments":"","x":1818.8095092773438,"y":569.6547622680664,"z":"1823fdbd.4322b2","wires":[]},{"id":"c6b4f5b9.5551d8","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":1991.3094787597656,"y":605.9047546386719,"z":"1823fdbd.4322b2","wires":[["6e3cdabe.e05b74"]]},{"id":"6e3cdabe.e05b74","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":2289.0595092773438,"y":606.154764175415,"z":"1823fdbd.4322b2","wires":[]},{"id":"f55a1ca5.c81d9","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":1574.420539855957,"y":733.7936515808105,"z":"1823fdbd.4322b2","wires":[]},{"id":"ba13b3a1.e2577","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2136.8095092773438,"y":379.6547603607178,"z":"1823fdbd.4322b2","wires":[]},{"id":"c092e803.425f58","type":"set","name":"set param[].status and capability-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].resource-resolution-data.capability-name' \n\tvalue='RA Resolved'/>\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`'/>","comments":"","x":1642.6705474853516,"y":793.7936534881592,"z":"1823fdbd.4322b2","wires":[]},{"id":"f4090c21.3d36a","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1226.3094940185547,"y":488.4047622680664,"z":"1823fdbd.4322b2","wires":[]},{"id":"b53942f9.6835c","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":1675.5555267333984,"y":674.4444303512573,"z":"1823fdbd.4322b2","wires":[]},{"id":"269dfcc8.a905a4","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.08330154418945,"y":968.3610124588013,"z":"1823fdbd.4322b2","wires":[[]]},{"id":"41663779.ca9db8","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.2975425720215,"y":915.2181148529053,"z":"1823fdbd.4322b2","wires":[]}] \ No newline at end of file
+[{"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
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 9bd19cac..3c740525 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":"9b6d371e.c6a5b8","type":"dgstart","name":"DGSTART","outputs":1,"x":97.10714721679688,"y":35.357144355773926,"z":"cc8da33a.a3512","wires":[["7f9c939d.f0fa3c"]]},{"id":"7f9c939d.f0fa3c","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":373.1071472167969,"y":36.357144355773926,"z":"cc8da33a.a3512","wires":[["3727034d.b6c80c"]]},{"id":"3727034d.b6c80c","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":270.107177734375,"y":101.35714912414551,"z":"cc8da33a.a3512","wires":[["e0df88c8.a19d48"]]},{"id":"e0df88c8.a19d48","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":208.5952033996582,"y":224.36906719207764,"z":"cc8da33a.a3512","wires":[["1a6fb0cb.d8582f","e44bd144.de106","54667cf1.053ed4","7110110c.690ce"]]},{"id":"1a6fb0cb.d8582f","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":490.5952606201172,"y":515.9405288696289,"z":"cc8da33a.a3512","wires":[["c84e9ab4.fb63b8"]]},{"id":"6216191d.a6c8b8","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":1723.0952453613281,"y":598.1905460357666,"z":"cc8da33a.a3512","wires":[]},{"id":"f0431561.d17b88","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":1393.8452682495117,"y":514.940544128418,"z":"cc8da33a.a3512","wires":[["f790a097.1441e"]]},{"id":"c84e9ab4.fb63b8","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":718.5952415466309,"y":515.6905450820923,"z":"cc8da33a.a3512","wires":[["1b143473.01604c","3e6e808e.4055b","25045112.d8e58e"]]},{"id":"f790a097.1441e","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":1797.8452682495117,"y":514.940544128418,"z":"cc8da33a.a3512","wires":[["e152f6a8.7c7ea8"]]},{"id":"e152f6a8.7c7ea8","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2103.8452682495117,"y":514.940544128418,"z":"cc8da33a.a3512","wires":[["1a4f635d.5cf1ed"]]},{"id":"f2314be8.6e5f98","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":2531.845386505127,"y":483.19054412841797,"z":"cc8da33a.a3512","wires":[]},{"id":"25045112.d8e58e","type":"switchNode","name":"switch tmp.mso.param.found","xml":"<switch test='`$tmp.mso.param.found`'>\n","comments":"","outputs":1,"x":964.5952453613281,"y":597.6905460357666,"z":"cc8da33a.a3512","wires":[["94e253dc.b5579"]]},{"id":"94e253dc.b5579","type":"not-found","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1192.0952453613281,"y":597.1905460357666,"z":"cc8da33a.a3512","wires":[["26faed4e.1937b2"]]},{"id":"1b143473.01604c","type":"set","name":"set tmp.mso.param.found = false","xml":"<set>\n<parameter name='tmp.mso.param.found' value='false' />\n","comments":"","x":980.5952301025391,"y":437.9405574798584,"z":"cc8da33a.a3512","wires":[]},{"id":"3e6e808e.4055b","type":"switchNode","name":"switch prehighnum > 0","xml":"<switch test='`$prehighnum &gt; 0`'>\n","comments":"","outputs":1,"x":945.0952415466309,"y":515.6905450820923,"z":"cc8da33a.a3512","wires":[["dcd8c396.2a136"]]},{"id":"dcd8c396.2a136","type":"not-found","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1159.6308937072754,"y":515.5119876861572,"z":"cc8da33a.a3512","wires":[["f0431561.d17b88"]]},{"id":"26faed4e.1937b2","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1369.0952453613281,"y":597.1905460357666,"z":"cc8da33a.a3512","wires":[["6216191d.a6c8b8","7c581d08.c049e4","be14dceb.d566f","86226715.4e4188","ab22106f.33c1c","2368af4a.13c2e"]]},{"id":"7c581d08.c049e4","type":"set","name":"highnum++","xml":"<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n","comments":"","x":1591.1427917480469,"y":903.9167537689209,"z":"cc8da33a.a3512","wires":[]},{"id":"e44bd144.de106","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":394.17859649658203,"y":1062.607195854187,"z":"cc8da33a.a3512","wires":[[]]},{"id":"54667cf1.053ed4","type":"switchNode","name":"switch resolution-summary_length","xml":"<switch test='`$jsonContextPrefix.resolution-summary_length`'>\n","comments":"","outputs":1,"x":519.4285736083984,"y":274.2857322692871,"z":"cc8da33a.a3512","wires":[["36a8b4bd.a72a1c"]]},{"id":"36a8b4bd.a72a1c","type":"not-found","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":762.2856903076172,"y":273.71431732177734,"z":"cc8da33a.a3512","wires":[["3a0dd12b.637d2e"]]},{"id":"3a0dd12b.637d2e","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":935.4285888671875,"y":273.85716247558594,"z":"cc8da33a.a3512","wires":[]},{"id":"45a63cd6.8d9584","type":"comment","name":"vdns-index","info":"","comments":"","x":522.3214340209961,"y":475.1786117553711,"z":"cc8da33a.a3512","wires":[]},{"id":"d89f51f0.383af","type":"comment","name":"param-index","info":"","comments":"","x":1431.0714569091797,"y":474.1786108016968,"z":"cc8da33a.a3512","wires":[]},{"id":"1d850d86.e6c312","type":"set","name":"set tmp.mso.param.found = true","xml":"<set>\n<parameter name='tmp.mso.param.found' value='true' />\n","comments":"","x":2473.0714569091797,"y":547.4286155700684,"z":"cc8da33a.a3512","wires":[]},{"id":"1a4f635d.5cf1ed","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2242.0714569091797,"y":514.4286136627197,"z":"cc8da33a.a3512","wires":[["f2314be8.6e5f98","1d850d86.e6c312"]]},{"id":"be14dceb.d566f","type":"switchNode","name":"switch dictionary-source","xml":"<switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>\n","comments":"","outputs":1,"x":1629.0714416503906,"y":683.9285984039307,"z":"cc8da33a.a3512","wires":[["3354f65c.fa1afa"]]},{"id":"3354f65c.fa1afa","type":"other","name":"sdnc","xml":"<outcome value='sdnc'>\n","comments":"","outputs":1,"x":1834.8214378356934,"y":681.4285984039307,"z":"cc8da33a.a3512","wires":[["4895fd88.d96874"]]},{"id":"55bbac42.e84034","type":"comment","name":"capability","info":"","comments":"","x":1853.5714416503906,"y":645.178596496582,"z":"cc8da33a.a3512","wires":[]},{"id":"4895fd88.d96874","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":2026.0714111328125,"y":681.4285888671875,"z":"cc8da33a.a3512","wires":[["7ef33d35.752214"]]},{"id":"7ef33d35.752214","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":2323.8214416503906,"y":681.6785984039307,"z":"cc8da33a.a3512","wires":[]},{"id":"86226715.4e4188","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":1614.4047546386719,"y":794.7619495391846,"z":"cc8da33a.a3512","wires":[]},{"id":"5ec89dda.1924b4","type":"comment","name":"from RA response","info":"","comments":"","x":553.5714111328125,"y":242.6785888671875,"z":"cc8da33a.a3512","wires":[]},{"id":"c0f71bea.1b3e78","type":"comment","name":"Overwrite MSO input with RA response","info":"","comments":"","x":2043.5714416503906,"y":455.1785945892334,"z":"cc8da33a.a3512","wires":[]},{"id":"ab22106f.33c1c","type":"set","name":"set param[].status and capability-name","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='RA Resolved'/>\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.payload.resolution-summary[$vdns-index].status`'/>","comments":"","x":1685.6547622680664,"y":849.7619514465332,"z":"cc8da33a.a3512","wires":[]},{"id":"7110110c.690ce","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":483.39283752441406,"y":1009.464298248291,"z":"cc8da33a.a3512","wires":[]},{"id":"c8a2bad.7897e48","type":"comment","name":"NEW param from RA response","info":"","comments":"","x":1261.0714263916016,"y":563.928596496582,"z":"cc8da33a.a3512","wires":[]},{"id":"2368af4a.13c2e","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":1718.5712814331055,"y":742.5396614074707,"z":"cc8da33a.a3512","wires":[]}] \ No newline at end of file
+[{"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
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 cc9d60bb..4539ae13 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
@@ -45,33 +45,25 @@
<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].dictionary-source`'>
- <outcome value='sdnc'>
- <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.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'
+ <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`'/>
+ <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`'
+ value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>
+ </set>
+ <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.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'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-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].resource-resolution-data.resource-key[$kid-index].value'
+ <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'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>
- </set>
- </for>
- </outcome>
- </switch>
+ </set>
+ </for>
<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.resource-key_length'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers_length`' />
</set>
<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.payload'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>
- </set>
- <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='RA Resolved'/>
- <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'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].status`'/>
- </set>
- <set>
<parameter name='highnum' value='`$highnum + 1`' />
</set>
</block>
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 67f16c81..1be42fa4 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
@@ -45,33 +45,25 @@
<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>
- <switch test='`$jsonContextPrefix.resolution-summary[$vdns-index].dictionary-source`'>
- <outcome value='sdnc'>
- <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'
+ <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>
+ <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'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].name`'/>
- <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'
+ <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'
value='`$jsonContextPrefix.resolution-summary[$vdns-index].key-identifiers[$kid-index].value`'/>
- </set>
- </for>
- </outcome>
- </switch>
+ </set>
+ </for>
<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>
<set>
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.payload`'
- value='`$jsonContextPrefix.resolution-summary[$vdns-index].request-payload`'/>
- </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='RA Resolved'/>
- <parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`'
- value='`$jsonContextPrefix.payload.resolution-summary[$vdns-index].status`'/>
- </set>
- <set>
<parameter name='highnum' value='`$highnum + 1`' />
</set>
</block>