aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json834
-rw-r--r--platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json514
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml250
-rw-r--r--platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml261
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml30
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml34
8 files changed, 1438 insertions, 489 deletions
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
index 442a44eb..9c07e5fb 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
@@ -1,20 +1,20 @@
[
{
- "id": "3dae3829.6d50d8",
+ "id": "5858bb6c.1c5b2c",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 140,
- "y": 83,
- "z": "5fc7c3fb.48a444",
+ "x": 116,
+ "y": 67,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "de2fffb7.c073f8"
+ "350dfcb7.24e654"
]
]
},
{
- "id": "de2fffb7.c073f8",
+ "id": "350dfcb7.24e654",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -22,264 +22,890 @@
"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='DataChange' version='${project.version}'>",
"outputs": 1,
- "x": 182,
- "y": 162.888916015625,
- "z": "5fc7c3fb.48a444",
+ "x": 173,
+ "y": 146.888916015625,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "8d7f08d3.c67fe8"
+ "92cd3521.3e4e6"
]
]
},
{
- "id": "8d7f08d3.c67fe8",
+ "id": "92cd3521.3e4e6",
"type": "method",
"name": "method update-network-links-to-aai",
"xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 196,
- "y": 239.22222900390625,
- "z": "5fc7c3fb.48a444",
+ "x": 187,
+ "y": 223.22222900390625,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "89a3239d.9a961"
+ "b665c6f2.69a4d"
]
]
},
{
- "id": "89a3239d.9a961",
+ "id": "b665c6f2.69a4d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 207.33343505859375,
- "y": 316.7779235839844,
- "z": "5fc7c3fb.48a444",
+ "x": 198.33343505859375,
+ "y": 300.7779235839844,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "f779b713.8cfdc8"
+ "c59c9b79.9f8cc"
]
]
},
{
- "id": "705ccc82.ecc094",
+ "id": "f41ff5d9.72c91",
"type": "update",
- "name": "save logical-link",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n\n\n\n\n\n",
+ "name": "save logical-link with regular id",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 580.1111450195312,
- "y": 168.11109924316406,
- "z": "5fc7c3fb.48a444",
+ "x": 1156.111083984375,
+ "y": 546.111083984375,
+ "z": "3cbec5d5.54ea02",
"wires": [
[]
]
},
{
- "id": "f779b713.8cfdc8",
+ "id": "c59c9b79.9f8cc",
"type": "for",
"name": "for each link",
"xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 235.88885498046875,
- "y": 410.33331298828125,
- "z": "5fc7c3fb.48a444",
+ "x": 226.88885498046875,
+ "y": 394.33331298828125,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "705ccc82.ecc094",
- "45a55196.a54ca",
- "d54d8abb.5beac",
- "5271a41c.d8700c"
+ "6d5acc0f.b7df54",
+ "8fbc8f1e.fe24c8",
+ "954c1d48.971018",
+ "915555f.abb44a8"
]
]
},
{
- "id": "45a55196.a54ca",
+ "id": "6d5acc0f.b7df54",
"type": "set",
"name": "set network link's local variables",
- "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n\n",
+ "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
"comments": "",
- "x": 581.111083984375,
- "y": 109.22221374511719,
- "z": "5fc7c3fb.48a444",
+ "x": 572.111083984375,
+ "y": 62.22221374511719,
+ "z": "3cbec5d5.54ea02",
"wires": []
},
{
- "id": "d54d8abb.5beac",
- "type": "save",
- "name": "save source and dest TP",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
- "comments": "",
- "outputs": 1,
- "x": 596.7779541015625,
- "y": 234.44447326660156,
- "z": "5fc7c3fb.48a444",
- "wires": [
- []
- ]
- },
- {
- "id": "5271a41c.d8700c",
+ "id": "7a38f4d0.9f3e6c",
"type": "for",
"name": "for each label-restriction",
"xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 533.4444580078125,
- "y": 375.111083984375,
- "z": "5fc7c3fb.48a444",
+ "x": 1535.4444580078125,
+ "y": 712.111083984375,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "1b0f5546.e78123",
- "443c3267.dc2134",
- "b1de45a9.d99468"
+ "556fc245.d19e3c",
+ "d6c13a1b.e798a",
+ "69e9f586.641064"
]
]
},
{
- "id": "1b0f5546.e78123",
+ "id": "556fc245.d19e3c",
"type": "set",
"name": "set label-restriction's local variables",
"xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
"comments": "",
- "x": 805.111328125,
- "y": 299.00006103515625,
- "z": "5fc7c3fb.48a444",
+ "x": 1870.111328125,
+ "y": 635.0000610351562,
+ "z": "3cbec5d5.54ea02",
"wires": []
},
{
- "id": "759b3331.b0b62c",
+ "id": "3398d2c0.69ae06",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 982.4998779296875,
- "y": 371.7460632324219,
- "z": "5fc7c3fb.48a444",
+ "x": 2005.4998779296875,
+ "y": 679.74609375,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "1a522f6e.2f6589"
+ "abb716be.3fb59"
]
]
},
{
- "id": "b709b603.7fa938",
+ "id": "3d46f558.3e53f2",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 990.178466796875,
- "y": 430.96038818359375,
- "z": "5fc7c3fb.48a444",
+ "x": 2013.178466796875,
+ "y": 738.9604187011719,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "5fd30b98.524afc"
+ "f0df0cf2.e46b6"
]
]
},
{
- "id": "1a522f6e.2f6589",
+ "id": "abb716be.3fb59",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1102,
- "y": 318,
- "z": "5fc7c3fb.48a444",
+ "x": 2166,
+ "y": 679.0000305175781,
+ "z": "3cbec5d5.54ea02",
"wires": [
[]
]
},
{
- "id": "61d66d0d.d0e254",
+ "id": "9aed5c80.54f11",
"type": "set",
"name": "set src-ltpId dst-ltpId",
"xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
"comments": "",
- "x": 2595.5001220703125,
- "y": 2430.545135498047,
- "z": "5fc7c3fb.48a444",
+ "x": 2586.5001220703125,
+ "y": 2414.545135498047,
+ "z": "3cbec5d5.54ea02",
"wires": []
},
{
- "id": "d454df86.50acb",
+ "id": "ce693523.2da318",
"type": "save",
"name": "save srcLTP relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 2629.0001220703125,
- "y": 2470.545135498047,
- "z": "5fc7c3fb.48a444",
+ "x": 2620.0001220703125,
+ "y": 2454.545135498047,
+ "z": "3cbec5d5.54ea02",
"wires": [
[]
]
},
{
- "id": "f86402c5.f4d968",
+ "id": "72343f4d.bac85",
"type": "save",
"name": "save dstLTP relationship in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
"comments": "",
"outputs": 1,
- "x": 2629.0001220703125,
- "y": 2510.545135498047,
- "z": "5fc7c3fb.48a444",
+ "x": 2620.0001220703125,
+ "y": 2494.545135498047,
+ "z": "3cbec5d5.54ea02",
"wires": [
[]
]
},
{
- "id": "5fd30b98.524afc",
+ "id": "f0df0cf2.e46b6",
"type": "update",
"name": "save label-restriction",
"xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 1114,
- "y": 507,
- "z": "5fc7c3fb.48a444",
+ "x": 2197,
+ "y": 739.0000305175781,
+ "z": "3cbec5d5.54ea02",
"wires": [
[]
]
},
{
- "id": "443c3267.dc2134",
+ "id": "d6c13a1b.e798a",
"type": "save",
"name": "save link relationship to label-restriction in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 770,
- "y": 533,
- "z": "5fc7c3fb.48a444",
+ "x": 1892,
+ "y": 793,
+ "z": "3cbec5d5.54ea02",
"wires": [
[]
]
},
{
- "id": "b1de45a9.d99468",
+ "id": "69e9f586.641064",
"type": "update",
"name": "save label-restriction",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 795.815185546875,
- "y": 425.55560302734375,
- "z": "5fc7c3fb.48a444",
+ "x": 1814.815185546875,
+ "y": 711.5556640625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "3398d2c0.69ae06",
+ "3d46f558.3e53f2"
+ ]
+ ]
+ },
+ {
+ "id": "9c77d572.aa0dd",
+ "type": "switchNode",
+ "name": "switch te-link-attributes",
+ "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1135,
+ "y": 668,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "acb46a14.faf1b8",
+ "fad2e2be.055cd8"
+ ]
+ ]
+ },
+ {
+ "id": "acb46a14.faf1b8",
+ "type": "outcome",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1324,
+ "y": 639,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "b663d811.06fad8"
+ ]
+ ]
+ },
+ {
+ "id": "b663d811.06fad8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1484,
+ "y": 638,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "fad2e2be.055cd8",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1328,
+ "y": 712,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "7a38f4d0.9f3e6c"
+ ]
+ ]
+ },
+ {
+ "id": "8fbc8f1e.fe24c8",
+ "type": "switchNode",
+ "name": "switch link.destination",
+ "xml": "<switch test='`$link.destination`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 540,
+ "y": 158,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "44b39c00.9558ec",
+ "d8a931d0.793fd"
+ ]
+ ]
+ },
+ {
+ "id": "44b39c00.9558ec",
+ "type": "outcome",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 784,
+ "y": 129,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "dd848e51.9b8178"
+ ]
+ ]
+ },
+ {
+ "id": "d8a931d0.793fd",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 736,
+ "y": 190,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "bdffabea.a9f78"
+ ]
+ ]
+ },
+ {
+ "id": "bdffabea.a9f78",
+ "type": "set",
+ "name": "set network link's destination variables",
+ "xml": "<set>\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n<parameter name='unique-dst-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`\" />\n<parameter name='is-open-ended-link' value='false' />\n\n",
+ "comments": "",
+ "x": 965,
+ "y": 190,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
+ },
+ {
+ "id": "d1d8b826.4d04f",
+ "type": "set",
+ "name": "set is-open-ended-link",
+ "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
+ "comments": "",
+ "x": 1144,
+ "y": 94,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
+ },
+ {
+ "id": "b17a800b.11d598",
+ "type": "save",
+ "name": "get p-interface from aai",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t key=\"pnf.pnf-name = $unique-src-node-Id\n\t and p-interface.interface-name = $src-tpId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.p-interface\" >",
+ "comments": "",
+ "outputs": 1,
+ "x": 1146,
+ "y": 150,
+ "z": "3cbec5d5.54ea02",
"wires": [
[
- "759b3331.b0b62c",
- "b709b603.7fa938"
+ "698d4309.a506a4",
+ "c0b09280.fde57",
+ "b035740b.82c768"
]
]
+ },
+ {
+ "id": "698d4309.a506a4",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1389,
+ "y": 145,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "d4d599ee.a3913"
+ ]
+ ]
+ },
+ {
+ "id": "c0b09280.fde57",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1387,
+ "y": 234,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "d42c9066.3cdb28"
+ ]
+ ]
+ },
+ {
+ "id": "d4d599ee.a3913",
+ "type": "set",
+ "name": "set alternative unique link id",
+ "xml": "<set>\n<parameter name='alt-unique-linkId' value=\"`$tmp.aai.p-interface.inter-domain-plug-id`\" />\n\n",
+ "comments": "",
+ "x": 1597,
+ "y": 147,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
+ },
+ {
+ "id": "d42c9066.3cdb28",
+ "type": "returnFailure",
+ "name": "return failure",
+ "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+ "comments": "",
+ "x": 1556,
+ "y": 235,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
+ },
+ {
+ "id": "f65cb67d.b3d368",
+ "type": "save",
+ "name": "get logical-link from aai",
+ "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\t key=\"logical-link.link-name = $alt-unique-linkId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.logical-link\" >",
+ "comments": "",
+ "outputs": 1,
+ "x": 943,
+ "y": 355,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "48397109.a69d68",
+ "efa56bf.4c6db98"
+ ]
+ ]
+ },
+ {
+ "id": "b035740b.82c768",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1398.490966796875,
+ "y": 187.57403564453125,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "6959706d.7f87e8"
+ ]
+ ]
+ },
+ {
+ "id": "6959706d.7f87e8",
+ "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=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+ "comments": "",
+ "x": 1552.0623779296875,
+ "y": 190.85977172851562,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
+ },
+ {
+ "id": "954c1d48.971018",
+ "type": "switchNode",
+ "name": "switch is-open-ended-link",
+ "xml": "<switch test='`$is-open-ended-link`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 522,
+ "y": 394,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "4e6e74a5.e8af4c",
+ "53a87226.590744"
+ ]
+ ]
+ },
+ {
+ "id": "4e6e74a5.e8af4c",
+ "type": "outcomeFalse",
+ "name": "false",
+ "xml": "<outcome value='false'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 739,
+ "y": 416,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "2e08f3a1.53987c"
+ ]
+ ]
+ },
+ {
+ "id": "53a87226.590744",
+ "type": "outcomeTrue",
+ "name": "true",
+ "xml": "<outcome value='true'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 742,
+ "y": 356,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "f65cb67d.b3d368"
+ ]
+ ]
+ },
+ {
+ "id": "48397109.a69d68",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1140,
+ "y": 325,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "6b973.4170168dc"
+ ]
+ ]
+ },
+ {
+ "id": "efa56bf.4c6db98",
+ "type": "not-found",
+ "name": "not-found",
+ "xml": "<outcome value='not-found'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1143.490966796875,
+ "y": 365.57403564453125,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "ef51ee2a.cafb5"
+ ]
+ ]
+ },
+ {
+ "id": "842144b1.a1cb2",
+ "type": "update",
+ "name": "save logical-link with alternative link id",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1590,
+ "y": 368,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "2e08f3a1.53987c",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 917,
+ "y": 424,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "f41ff5d9.72c91",
+ "9c77d572.aa0dd",
+ "34901df.74cf7e2"
+ ]
+ ]
+ },
+ {
+ "id": "6b973.4170168dc",
+ "type": "save",
+ "name": "update dest TP by putting src TP of the current link",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />-->\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1429,
+ "y": 321,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "34901df.74cf7e2",
+ "type": "save",
+ "name": "save source and dest TP",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
+ "comments": "",
+ "outputs": 1,
+ "x": 1142,
+ "y": 601,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "dd848e51.9b8178",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 927,
+ "y": 126,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "d1d8b826.4d04f",
+ "b17a800b.11d598"
+ ]
+ ]
+ },
+ {
+ "id": "ef51ee2a.cafb5",
+ "type": "block",
+ "name": "block : atomic",
+ "xml": "<block atomic='true'>",
+ "atomic": "true",
+ "comments": "",
+ "outputs": 1,
+ "x": 1314,
+ "y": 366,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "842144b1.a1cb2",
+ "9ab70c9.3d83df",
+ "dd8767a.3acd918"
+ ]
+ ]
+ },
+ {
+ "id": "9ab70c9.3d83df",
+ "type": "save",
+ "name": "save source only",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1527,
+ "y": 416,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "ec4710d1.a4614",
+ "type": "for",
+ "name": "for each label-restriction",
+ "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1933,
+ "y": 499,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "5f4e6661.8be42",
+ "bf1c8950.f6775",
+ "869edf38.84c148"
+ ]
+ ]
+ },
+ {
+ "id": "5f4e6661.8be42",
+ "type": "set",
+ "name": "set label-restriction's local variables",
+ "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+ "comments": "",
+ "x": 2267.6668701171875,
+ "y": 421.88897705078125,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
+ },
+ {
+ "id": "7135b68.c08c3c8",
+ "type": "success",
+ "name": "success",
+ "xml": "<outcome value='success'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2403.055419921875,
+ "y": 466.635009765625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "2043dae3.034356"
+ ]
+ ]
+ },
+ {
+ "id": "69007117.c84f9",
+ "type": "failure",
+ "name": "failure",
+ "xml": "<outcome value='failure'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2410.7340087890625,
+ "y": 525.8493347167969,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "30f94010.a2f0b"
+ ]
+ ]
+ },
+ {
+ "id": "2043dae3.034356",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 2563.5555419921875,
+ "y": 465.8889465332031,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "30f94010.a2f0b",
+ "type": "update",
+ "name": "save label-restriction",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $alt-unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2594.5555419921875,
+ "y": 525.8889465332031,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "bf1c8950.f6775",
+ "type": "save",
+ "name": "save link relationship to label-restriction in AAI",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2289.5555419921875,
+ "y": 579.888916015625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "869edf38.84c148",
+ "type": "update",
+ "name": "save label-restriction",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n key='logical-link.link-name = $alt-unique-linkId\n AND label-restriction.id = $unique-lrId' > \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 2212.3707275390625,
+ "y": 498.444580078125,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "7135b68.c08c3c8",
+ "69007117.c84f9"
+ ]
+ ]
+ },
+ {
+ "id": "dd8767a.3acd918",
+ "type": "switchNode",
+ "name": "switch te-link-attributes",
+ "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1532.5555419921875,
+ "y": 454.888916015625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "2ac06a2f.120e4e",
+ "45e6587f.a583a"
+ ]
+ ]
+ },
+ {
+ "id": "2ac06a2f.120e4e",
+ "type": "outcome",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1721.5555419921875,
+ "y": 425.888916015625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "5884f4a0.224604"
+ ]
+ ]
+ },
+ {
+ "id": "5884f4a0.224604",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1881.5555419921875,
+ "y": 424.888916015625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "45e6587f.a583a",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1725.5555419921875,
+ "y": 498.888916015625,
+ "z": "3cbec5d5.54ea02",
+ "wires": [
+ [
+ "ec4710d1.a4614"
+ ]
+ ]
+ },
+ {
+ "id": "915555f.abb44a8",
+ "type": "set",
+ "name": "set more local variables",
+ "xml": "<set>\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='unique-src-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`\" />\n",
+ "comments": "",
+ "x": 557,
+ "y": 102,
+ "z": "3cbec5d5.54ea02",
+ "wires": []
}
] \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index 7f980627..382a4c98 100644
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
[
{
- "id": "e71bc70e.124d38",
+ "id": "ef88be3f.517f78",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 142,
- "y": 49,
- "z": "a2160ede.50a7f8",
+ "x": 105,
+ "y": 67,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "f849e1fd.7b8e28"
+ "74a7a837.229be"
]
]
},
{
- "id": "f849e1fd.7b8e28",
+ "id": "74a7a837.229be",
"type": "service-logic",
"name": "DataChange ${project.version}",
"module": "DataChange",
@@ -22,457 +22,633 @@
"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='DataChange' version='${project.version}'>",
"outputs": 1,
- "x": 231.00003051757812,
- "y": 139.88891220092773,
- "z": "a2160ede.50a7f8",
+ "x": 194.00003051757812,
+ "y": 157.88891220092773,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "7adf111d.766db8"
+ "284dae72.737532"
]
]
},
{
- "id": "7adf111d.766db8",
+ "id": "284dae72.737532",
"type": "method",
- "name": "method update-network-to-aai",
+ "name": "update-network-to-aai",
"xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 267.1112518310547,
- "y": 210.22223663330078,
- "z": "a2160ede.50a7f8",
+ "x": 230.1112518310547,
+ "y": 228.22223663330078,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "802b5752.247908"
+ "da05320e.186d48"
]
]
},
{
- "id": "802b5752.247908",
+ "id": "da05320e.186d48",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
- "atomic": "false",
+ "atomic": "true",
"comments": "",
"outputs": 1,
- "x": 492.33343505859375,
- "y": 209.77792358398438,
- "z": "a2160ede.50a7f8",
+ "x": 455.33343505859375,
+ "y": 227.77792358398438,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "32d96ea8.386a82",
- "7667af77.0df1e8",
- "6f623dd3.9a7c44",
- "ffd24e55.e4afa"
+ "8c187a81.9e4d28",
+ "75113293.98ea0c",
+ "9937b93d.ff5938",
+ "55dde830.cc61b8"
]
]
},
{
- "id": "7667af77.0df1e8",
- "type": "update",
+ "id": "75113293.98ea0c",
+ "type": "save",
"name": "save network-resource",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource' \n key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
"comments": "",
"outputs": 1,
- "x": 722.333251953125,
- "y": 115.00001525878906,
- "z": "a2160ede.50a7f8",
+ "x": 685.333251953125,
+ "y": 133.00001525878906,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "ab67cffd.8b31",
- "type": "update",
+ "id": "74f65e67.75c658",
+ "type": "save",
"name": "save pnf",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 934.1111450195312,
- "y": 205.111083984375,
- "z": "a2160ede.50a7f8",
+ "x": 897.1111450195312,
+ "y": 223.111083984375,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "6f623dd3.9a7c44",
+ "id": "9937b93d.ff5938",
"type": "for",
"name": "for each node",
"xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 705.8888549804688,
- "y": 185.33331298828125,
- "z": "a2160ede.50a7f8",
+ "x": 668.8888549804688,
+ "y": 203.33331298828125,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "ab67cffd.8b31",
- "c4083363.2a3b2",
- "ba78539e.d2e248",
- "c02a5c85.3b448",
- "499b8cbc.ebafac",
- "7a876b8.f89b114",
- "46013f8c.54849"
+ "74f65e67.75c658",
+ "60e29b35.16fbd4",
+ "b27f201.393186",
+ "e83884ed.3fb2d8",
+ "7257c53.4f087bc",
+ "395bef40.08498",
+ "1392eb55.76adbd",
+ "e55192de.2cc998"
]
]
},
{
- "id": "c4083363.2a3b2",
+ "id": "60e29b35.16fbd4",
"type": "set",
- "name": "set network",
- "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n",
+ "name": "set node",
+ "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
"comments": "",
- "x": 950.111083984375,
- "y": 133.2222137451172,
- "z": "a2160ede.50a7f8",
+ "x": 902.111083984375,
+ "y": 119.22221374511719,
+ "z": "6d6b8a1f.be1cb4",
"wires": []
},
{
- "id": "c02a5c85.3b448",
+ "id": "e83884ed.3fb2d8",
"type": "save",
"name": "save pnf relationship to network-resource in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 1030.7779541015625,
- "y": 380.44447803497314,
- "z": "a2160ede.50a7f8",
+ "x": 993.7779541015625,
+ "y": 398.44447803497314,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "499b8cbc.ebafac",
+ "id": "9c15e41a.6cfbc8",
"type": "for",
"name": "for each termination point",
"xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 963.4444580078125,
- "y": 496.111083984375,
- "z": "a2160ede.50a7f8",
+ "x": 1279.4444580078125,
+ "y": 574.111083984375,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "c5951e15.43701",
- "c670da77.075458",
- "3831ed03.d1f9da",
- "f6959b19.b0bc18"
+ "3c657cae.66477c",
+ "2e1dc2b9.f23686",
+ "8c144095.b1eaf8"
]
]
},
{
- "id": "c5951e15.43701",
+ "id": "3c657cae.66477c",
"type": "set",
"name": "set termination point",
"xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
"comments": "",
- "x": 1230.111328125,
- "y": 457.0000457763672,
- "z": "a2160ede.50a7f8",
+ "x": 1550.111328125,
+ "y": 536.0000457763672,
+ "z": "6d6b8a1f.be1cb4",
"wires": []
},
{
- "id": "3831ed03.d1f9da",
- "type": "update",
+ "id": "8c144095.b1eaf8",
+ "type": "save",
"name": "save p-interface",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $unique-nodeId\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n\n",
"comments": "",
"outputs": 1,
- "x": 1213.8151397705078,
- "y": 630.5555934906006,
- "z": "a2160ede.50a7f8",
+ "x": 1533.815185546875,
+ "y": 628.5556030273438,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "9d09dea6.d30ca8",
- "abd50ee3.2f813"
+ "3fc33363.5b82ec",
+ "34c813e4.f5477c"
]
]
},
{
- "id": "7e259f3c.438d9",
+ "id": "f6e5129a.8bd048",
"type": "save",
"name": "save pnf relationship to p-interface in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $unique-nodeId '/p-interfaces/p-interface/' + $unique-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-ltpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1297.703857421875,
- "y": 765.3333740234375,
- "z": "a2160ede.50a7f8",
+ "x": 1610.703857421875,
+ "y": 784.3333740234375,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "c670da77.075458",
+ "id": "2e1dc2b9.f23686",
"type": "set",
"name": "set unique-ltpId",
"xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
"comments": "",
- "x": 1214.000244140625,
- "y": 491.1111145019531,
- "z": "a2160ede.50a7f8",
+ "x": 1534.000244140625,
+ "y": 570.1111145019531,
+ "z": "6d6b8a1f.be1cb4",
"wires": []
},
{
- "id": "32d96ea8.386a82",
+ "id": "8c187a81.9e4d28",
"type": "execute",
"name": "execute",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$network.network-id`\"/>\n <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n <parameter name=\"target\" value=\"/\"/>\n <parameter name=\"replacement\" value=\"-\"/>\n ",
"comments": "",
"outputs": 1,
- "x": 671.9935302734375,
- "y": 75.99349212646484,
- "z": "a2160ede.50a7f8",
+ "x": 640.9935302734375,
+ "y": 83.99349975585938,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "ba78539e.d2e248",
+ "id": "b27f201.393186",
"type": "save",
"name": "save pnf relation with esr-thirdparty-sdnc",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
"comments": "",
"outputs": 1,
- "x": 1012,
- "y": 416.9934997558594,
- "z": "a2160ede.50a7f8",
+ "x": 975,
+ "y": 434.9934997558594,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "9d09dea6.d30ca8",
+ "id": "3fc33363.5b82ec",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1385.4998397827148,
- "y": 617.7460689544678,
- "z": "a2160ede.50a7f8",
+ "x": 1705.499885559082,
+ "y": 615.7460784912109,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "3d744c93.2eb20c"
+ "a873419b.bc81c"
]
]
},
{
- "id": "abd50ee3.2f813",
+ "id": "34c813e4.f5477c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1379.1784286499023,
- "y": 669.9603805541992,
- "z": "a2160ede.50a7f8",
+ "x": 1699.1784744262695,
+ "y": 667.9603900909424,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "a0fb6003.0efd8"
+ "66113f50.7819f8"
]
]
},
{
- "id": "3d744c93.2eb20c",
+ "id": "a873419b.bc81c",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1536,
- "y": 617,
- "z": "a2160ede.50a7f8",
+ "x": 1856.0000457763672,
+ "y": 615.0000095367432,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "a0fb6003.0efd8",
+ "id": "66113f50.7819f8",
"type": "update",
"name": "update p-interface",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $node.node-id\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n\n",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n key='pnf.pnf-name = $unique-nodeId\n AND p-interface.interface-name = $unique-ltpId' > \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />",
"comments": "",
"outputs": 1,
- "x": 1556,
- "y": 667,
- "z": "a2160ede.50a7f8",
+ "x": 1885,
+ "y": 669,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "aa9ed7c5.9f2be8",
- "type": "update",
+ "id": "c8e5472a.d10408",
+ "type": "save",
"name": "save tunnel-termination-point",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='pnf.pnf-name = $unique-nodeId\n AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1423,
- "y": 205,
- "z": "a2160ede.50a7f8",
+ "x": 1678,
+ "y": 331,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "54fe71d8.edb1c",
- "6cd48f92.21a288"
+ "11cb3cf8.02c3eb",
+ "1a336806.ba4bc8"
]
]
},
{
- "id": "7a876b8.f89b114",
+ "id": "8b0a557c.b35cd",
"type": "for",
"name": "for each tunnel termination point",
"xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1038,
- "y": 281,
- "z": "a2160ede.50a7f8",
+ "x": 1341,
+ "y": 319,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "79913f13.5b1fa",
- "4552b8b5.e9ba2",
- "aa9ed7c5.9f2be8",
- "e23bdb7f.fdc9c"
+ "58c4d943.63d2f",
+ "e7e93cd.8f563c",
+ "c8e5472a.d10408",
+ "7c00c858.c87ab8"
]
]
},
{
- "id": "79913f13.5b1fa",
+ "id": "58c4d943.63d2f",
"type": "set",
"name": "set tunnel termination point",
"xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
"comments": "",
- "x": 1393,
- "y": 114,
- "z": "a2160ede.50a7f8",
+ "x": 1676,
+ "y": 239,
+ "z": "6d6b8a1f.be1cb4",
"wires": []
},
{
- "id": "4552b8b5.e9ba2",
+ "id": "e7e93cd.8f563c",
"type": "set",
"name": "set unique-ttpId",
"xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
"comments": "",
- "x": 1370.888916015625,
- "y": 151.111083984375,
- "z": "a2160ede.50a7f8",
+ "x": 1634.888916015625,
+ "y": 277.111083984375,
+ "z": "6d6b8a1f.be1cb4",
"wires": []
},
{
- "id": "54fe71d8.edb1c",
+ "id": "11cb3cf8.02c3eb",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1680,
- "y": 191,
- "z": "a2160ede.50a7f8",
+ "x": 1944,
+ "y": 317,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "42f8b4e.c7b524c"
+ "9ad375c8.fab3e8"
]
]
},
{
- "id": "6cd48f92.21a288",
+ "id": "1a336806.ba4bc8",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1673.6785888671875,
- "y": 243.21431159973145,
- "z": "a2160ede.50a7f8",
+ "x": 1937.6785888671875,
+ "y": 369.21431159973145,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[
- "5f719388.c96efc"
+ "842e7e75.fc0558"
]
]
},
{
- "id": "42f8b4e.c7b524c",
+ "id": "9ad375c8.fab3e8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1830.5001602172852,
- "y": 190.25393104553223,
- "z": "a2160ede.50a7f8",
+ "x": 2094.500160217285,
+ "y": 316.2539310455322,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "5f719388.c96efc",
+ "id": "842e7e75.fc0558",
"type": "update",
"name": "update tunnel-termination-point",
- "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='pnf.pnf-name = $node.node-id\n AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+ "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n key='pnf.pnf-name = $unique-nodeId\n AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 1911,
- "y": 245,
- "z": "a2160ede.50a7f8",
+ "x": 2175,
+ "y": 371,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "46013f8c.54849",
+ "id": "7257c53.4f087bc",
"type": "set",
"name": "set local variables",
- "xml": "<set>\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
+ "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
"comments": "",
- "x": 969,
- "y": 167,
- "z": "a2160ede.50a7f8",
+ "x": 927,
+ "y": 166,
+ "z": "6d6b8a1f.be1cb4",
"wires": []
},
{
- "id": "ffd24e55.e4afa",
+ "id": "55dde830.cc61b8",
"type": "call",
"name": "call update-network-links-to-aai",
"xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 648,
- "y": 311,
- "z": "a2160ede.50a7f8",
+ "x": 611,
+ "y": 329,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "f6959b19.b0bc18",
+ "id": "b86a9ee9.558c2",
"type": "save",
"name": "save pnf-interface relationship to pnf in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n key='pnf.pnf-name = $unique-nodeId\n AND p-interface.interface-name = $unique-ltpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-nodeId`\" />\n",
"comments": "",
"outputs": 1,
- "x": 1300,
- "y": 724,
- "z": "a2160ede.50a7f8",
+ "x": 1617,
+ "y": 728,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
},
{
- "id": "e23bdb7f.fdc9c",
+ "id": "7c00c858.c87ab8",
"type": "save",
"name": "save pnf relationship to tunnel termination point in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$ttidx].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
"comments": "",
"outputs": 1,
- "x": 1485,
- "y": 297,
- "z": "a2160ede.50a7f8",
+ "x": 1749,
+ "y": 423,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "395bef40.08498",
+ "type": "switchNode",
+ "name": "switch node ttp",
+ "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 913,
+ "y": 295,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "84bf875e.b8d51",
+ "cc6df2e.2398e9",
+ "f2d2c388.1aa578"
+ ]
+ ]
+ },
+ {
+ "id": "5889c4ed.3fc544",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1261,
+ "y": 247,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "f2d2c388.1aa578",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1103,
+ "y": 318,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "8b0a557c.b35cd"
+ ]
+ ]
+ },
+ {
+ "id": "1392eb55.76adbd",
+ "type": "switchNode",
+ "name": "switch node tp",
+ "xml": "<switch test='`$node.termination-point_length`'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 893,
+ "y": 550,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "c5e649ab.cfe2e8",
+ "d7a3de29.b44a1",
+ "a21fbfb7.b6608"
+ ]
+ ]
+ },
+ {
+ "id": "c5e649ab.cfe2e8",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1072,
+ "y": 502,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "3d51c59d.7acffa"
+ ]
+ ]
+ },
+ {
+ "id": "d7a3de29.b44a1",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1071,
+ "y": 604,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "9c15e41a.6cfbc8"
+ ]
+ ]
+ },
+ {
+ "id": "3d51c59d.7acffa",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1227,
+ "y": 502,
+ "z": "6d6b8a1f.be1cb4",
"wires": [
[]
]
+ },
+ {
+ "id": "e55192de.2cc998",
+ "type": "record",
+ "name": "log file",
+ "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n <parameter name=\"file\" value=\"/opt/onap/hesamlogx.txt\" />\n <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n <parameter name=\"field2\" value=\"sucess executing Hesam hesam log file\" />\n <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n ",
+ "comments": "",
+ "outputs": 1,
+ "x": 891,
+ "y": 339,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ []
+ ]
+ },
+ {
+ "id": "84bf875e.b8d51",
+ "type": "other",
+ "name": "Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1101,
+ "y": 181,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "5889c4ed.3fc544"
+ ]
+ ]
+ },
+ {
+ "id": "cc6df2e.2398e9",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1106,
+ "y": 256,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "5889c4ed.3fc544"
+ ]
+ ]
+ },
+ {
+ "id": "a21fbfb7.b6608",
+ "type": "outcome",
+ "name": "length 0",
+ "xml": "<outcome value='0'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1082,
+ "y": 550,
+ "z": "6d6b8a1f.be1cb4",
+ "wires": [
+ [
+ "3d51c59d.7acffa"
+ ]
+ ]
}
] \ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
index 3495214e..8777891a 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
@@ -1,70 +1,192 @@
-<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='DataChange' version='${project.version}'>
- <method rpc='update-network-links-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+ <method rpc="update-network-links-to-aai" mode="sync">
<block atomic="true">
- <for index='pidx' start='0' end='`$network.link_length`' >
+ <for index="pidx" start="0" end="`$network.link_length`">
<set>
- <parameter name='link.' value='`$network.link[$pidx].`' />
- <parameter name='unique-networkId' value='`$tmp.network-id`' />
- <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />
- <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
- <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />
+ <parameter name="link." value="`$network.link[$pidx].`"/>
+ <parameter name="unique-networkId" value="`$tmp.network-id`"/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
- key='logical-link.link-name = $unique-linkId' >
- <parameter name='link-name' value='`$unique-linkId`' />
- <parameter name='link-id' value='`$link.link-id`' />
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/p-interfaces/p-interface/' + $src-tpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
- <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[1].related-link" value="`'/p-interfaces/p-interface/' + $dst-tpId`" />
- <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
- <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
- </save>
- <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
- <set>
- <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
- <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
- </set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
- key='logical-link.link-name = $unique-linkId
- AND label-restriction.id = $unique-lrId' >
- <parameter name='id' value='`$unique-lrId`' />
- <parameter name='label-start' value='`$label-restriction.label-start`' />
- <parameter name='label-end' value='`$label-restriction.label-end`' />
- <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
- <parameter name='label-step' value='`$label-restriction.label-step`' />
- <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
- <outcome value='success'>
- <block></block>
- </outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
- key='logical-link.link-name = $unique-linkId
- AND label-restriction.id = $unique-lrId' >
- <parameter name='id' value='`$unique-lrId`' />
- <parameter name='label-start' value='`$label-restriction.label-start`' />
- <parameter name='label-end' value='`$label-restriction.label-end`' />
- <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
- <parameter name='label-step' value='`$label-restriction.label-step`' />
- <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
- </update>
- </outcome>
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
- key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
- <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
- <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
- <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
- </save>
- </for>
+ <set>
+ <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>
+ <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>
+ <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>
+ </set>
+ <switch test="`$link.destination`">
+ <outcome value="">
+ <block>
+ <set>
+ <parameter name="is-open-ended-link" value="true"/>
+ </set>
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-src-node-Id and p-interface.interface-name = $src-tpId" local-only="false" pfx="tmp.aai.p-interface">
+ <outcome value="success">
+ <set>
+ <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>
+ </set>
+ </outcome>
+ <outcome value="not-found">
+ <return status="failure">
+ <parameter name="ack-final" value="Y"/>
+ <parameter name="error-code" value="500"/>
+ <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`"/>
+ </return>
+ </outcome>
+ <outcome value="failure">
+ <return status="failure">
+ <parameter name="error-code" value=""/>
+ <parameter name="error-message" value=""/>
+ </return>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ <outcome value="Other">
+ <set>
+ <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>
+ <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>
+ <parameter name="is-open-ended-link" value="false"/>
+ </set>
+ </outcome>
+ </switch>
+ <switch test="`$is-open-ended-link`">
+ <outcome value="true">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId" local-only="false" pfx="tmp.aai.logical-link">
+ <outcome value="success">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">
+ <!--
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+ -->
+ <!--
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+ -->
+ <!--
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+ -->
+ <!--
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`" />
+ -->
+ <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+ <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+ <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$src-tpId`"/>
+ </update>
+ </outcome>
+ <outcome value="not-found">
+ <block atomic="true">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">
+ <parameter name="link-name" value="`$alt-unique-linkId`"/>
+ <parameter name="link-id" value="`$link.link-id`"/>
+ <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>
+ </save>
+ <switch test="`$link.te.te-link-attributes.label-restriction`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+ <set>
+ <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+ <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ <outcome value="success">
+ <block/>
+ </outcome>
+ <outcome value="failure">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ </update>
+ </outcome>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
+ <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+ <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
+ <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+ </save>
+ </for>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </get-resource>
+ </outcome>
+ <outcome value="false">
+ <block atomic="true">
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">
+ <parameter name="link-name" value="`$unique-linkId`"/>
+ <parameter name="link-id" value="`$link.link-id`"/>
+ <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-tpId`"/>
+ <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+ <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>
+ <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+ <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>
+ </save>
+ <switch test="`$link.te.te-link-attributes.label-restriction`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+ <set>
+ <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+ <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ <outcome value="success">
+ <block/>
+ </outcome>
+ <outcome value="failure">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+ <parameter name="id" value="`$unique-lrId`"/>
+ <parameter name="label-start" value="`$label-restriction.label-start`"/>
+ <parameter name="label-end" value="`$label-restriction.label-end`"/>
+ <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+ <parameter name="label-step" value="`$label-restriction.label-step`"/>
+ <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+ </update>
+ </outcome>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
+ <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+ <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
+ <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+ </save>
+ </for>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
</for>
</block>
</method>
diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 9c17eac5..17be19ec 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -1,148 +1,149 @@
-<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='DataChange' version='${project.version}'>
- <method rpc='update-network-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+ <method rpc="update-network-to-aai" mode="sync">
<block atomic="true">
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">
<parameter name="source" value="`$network.network-id`"/>
<parameter name="outputPath" value="tmp.network-id"/>
<parameter name="target" value="/"/>
<parameter name="replacement" value="-"/>
</execute>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'
- key='network-resource.network-id = $tmp.network-id' >
- <parameter name='network-id' value='`$tmp.network-id`' />
- <parameter name='client-id' value='`$network.client-id`' />
- <parameter name='te-topo-id' value='`$network.te-topology-id`' />
- <parameter name='provider-id' value='`$network.provider-id`' />
- <parameter name='network-type' value='`$network.network-types`' />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">
+ <parameter name="network-id" value="`$tmp.network-id`"/>
+ <parameter name="client-id" value="`$network.client-id`"/>
+ <parameter name="te-topo-id" value="`$network.te-topology-id`"/>
+ <parameter name="provider-id" value="`$network.provider-id`"/>
+ <parameter name="network-type" value="`$network.network-types`"/>
</save>
- <for index='pidx' start='0' end='`$network.node_length`' >
+ <for index="pidx" start="0" end="`$network.node_length`">
<set>
- <parameter name='node.' value='`$network.node[$pidx].`' />
- <parameter name='unique-networkId' value='`$tmp.network-id`' />
- <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
- <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
+ <parameter name="node." value="`$network.node[$pidx].`"/>
+ <parameter name="unique-networkId" value="`$tmp.network-id`"/>
</set>
<set>
- <parameter name='unique-networkId' value='`$tmp.network-id`' />
- <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />
+ <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>
</set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'
- key='pnf.pnf-name = $unique-nodeId' >
- <parameter name='pnf-name' value='`$unique-nodeId`' />
- <parameter name='pnf-id' value='`$node.node-id`' />
- <parameter name='operational-status' value='`$node.te.oper-status`' />
- <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />
- <parameter name='in-maint' value='true' />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">
+ <parameter name="pnf-name" value="`$unique-nodeId`"/>
+ <parameter name="pnf-id" value="`$node.node-id`"/>
+ <parameter name="operational-status" value="`$node.te.oper-status`"/>
+ <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>
+ <parameter name="in-maint" value="true"/>
</save>
- <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >
- <set>
- <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />
- </set>
- <set>
- <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />
- </set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
- key='pnf.pnf-name = $unique-nodeId
- AND tunnel-termination-point.ttp-id = $unique-ttpId' >
- <parameter name='ttp-id' value='`$unique-ttpId`' />
- <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
- <parameter name='name' value='`$ttp.name`' />
- <parameter name='admin-status' value='`$ttp.admin-status`' />
- <parameter name='oper-status' value='`$ttp.oper-status`' />
- <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
- <parameter name='switching-capability' value='`$ttp.switching-capability`' />
- <parameter name='protection-type' value='`$ttp.protection-type`' />
- <parameter name='encoding' value='`$ttp.encoding`' />
- <outcome value='success'>
- <block></block>
- </outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'
- key='pnf.pnf-name = $node.node-id
- AND tunnel-termination-point.ttp-id = $unique-ttpId' >
- <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />
- <parameter name='name' value='`$ttp.name`' />
- <parameter name='admin-status' value='`$ttp.admin-status`' />
- <parameter name='oper-status' value='`$ttp.oper-status`' />
- <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />
- <parameter name='switching-capability' value='`$ttp.switching-capability`' />
- <parameter name='protection-type' value='`$ttp.protection-type`' />
- <parameter name='encoding' value='`$ttp.encoding`' />
- </update>
- </outcome>
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
- key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point" />
- <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />
- <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />
- <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`" />
- </save>
- </for>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'
- key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />
+ <switch test="`$node.te.tunnel-termination-point_length`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">
+ <set>
+ <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>
+ </set>
+ <set>
+ <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">
+ <parameter name="ttp-id" value="`$unique-ttpId`"/>
+ <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+ <parameter name="name" value="`$ttp.name`"/>
+ <parameter name="admin-status" value="`$ttp.admin-status`"/>
+ <parameter name="oper-status" value="`$ttp.oper-status`"/>
+ <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>
+ <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+ <parameter name="protection-type" value="`$ttp.protection-type`"/>
+ <parameter name="encoding" value="`$ttp.encoding`"/>
+ <outcome value="success">
+ <block/>
+ </outcome>
+ <outcome value="failure">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">
+ <parameter name="ttp-id" value="`$unique-ttpId`"/>
+ <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>
+ <parameter name="name" value="`$ttp.name`"/>
+ <parameter name="admin-status" value="`$ttp.admin-status`"/>
+ <parameter name="oper-status" value="`$ttp.oper-status`"/>
+ <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>
+ <parameter name="switching-capability" value="`$ttp.switching-capability`"/>
+ <parameter name="protection-type" value="`$ttp.protection-type`"/>
+ <parameter name="encoding" value="`$ttp.encoding`"/>
+ </update>
+ </outcome>
+ </save>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point"/>
+ <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>
+ <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>
+ <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>
+ </save>
+ </for>
+ </outcome>
+ </switch>
+ <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">
+ <parameter name="file" value="/opt/onap/hesamlogx.txt"/>
+ <parameter name="field1" value="__TIMESTAMP__"/>
+ <parameter name="field2" value="sucess executing Hesam hesam log file"/>
+ <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>
+ <parameter name="field4" value="`$node.termination-point_length`"/>
+ </record>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>
</save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list'
- key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id'
- force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>
</save>
- <for index='tidx' start='0' end='`$node.termination-point_length`' >
- <set>
- <parameter name='tp.' value='`$node.termination-point[$tidx].`' />
- </set>
- <set>
- <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />
- </set>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
- key='pnf.pnf-name = $unique-nodeId
- AND p-interface.interface-name = $unique-ltpId' >
- <parameter name='interface-name' value='`$unique-ltpId`' />
- <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
- <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
- <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
- <parameter name='operational-status' value='`$tp.te.oper-status`' />
- <parameter name='in-maint' value="true" />
- <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
- <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
- <outcome value='success'>
- <block></block>
- </outcome>
- <outcome value='failure'>
- <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'
- key='pnf.pnf-name = $node.node-id
- AND p-interface.interface-name = $unique-ltpId' >
- <parameter name='interface-name' value='`$unique-ltpId`' />
- <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />
- <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />
- <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />
- <parameter name='operational-status' value='`$tp.te.oper-status`' />
- <parameter name='in-maint' value="true" />
- <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />
- <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />
- </update>
- </outcome>
- </save>
- <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'
- key='pnf.pnf-name = $unique-nodeId
- AND p-interface.interface-name = $unique-ltpId' force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="pnf" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-nodeId`" />
- </save>
- </for>
+ <switch test="`$node.termination-point_length`">
+ <outcome value="">
+ <block/>
+ </outcome>
+ <outcome value="0">
+ <block/>
+ </outcome>
+ <outcome value="Other">
+ <for index="tidx" start="0" end="`$node.termination-point_length`">
+ <set>
+ <parameter name="tp." value="`$node.termination-point[$tidx].`"/>
+ </set>
+ <set>
+ <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
+ <parameter name="interface-name" value="`$unique-ltpId`"/>
+ <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
+ <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+ <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+ <parameter name="operational-status" value="`$tp.te.oper-status`"/>
+ <parameter name="in-maint" value="true"/>
+ <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+ <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+ <outcome value="success">
+ <block/>
+ </outcome>
+ <outcome value="failure">
+ <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">
+ <parameter name="interface-name" value="`$unique-ltpId`"/>
+ <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>
+ <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>
+ <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>
+ <parameter name="operational-status" value="`$tp.te.oper-status`"/>
+ <parameter name="in-maint" value="true"/>
+ <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>
+ <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>
+ </update>
+ </outcome>
+ </save>
+ </for>
+ </outcome>
+ </switch>
</for>
- <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>
+ <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>
</block>
</method>
</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
index bd19efd7..e4c01a0e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json
@@ -1 +1 @@
-[{"id":"4dffc60d.5bd808","type":"dgstart","name":"DGSTART","outputs":1,"x":141.42858123779297,"y":65.71432209014893,"z":"f6902f40.5e19","wires":[["91c8160.4dcc1e8"]]},{"id":"91c8160.4dcc1e8","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":417.42858123779297,"y":66.71432209014893,"z":"f6902f40.5e19","wires":[["14bf1d36.3d8cf3"]]},{"id":"14bf1d36.3d8cf3","type":"method","name":"self-serve-vfmodule-ra-assignment","xml":"<method rpc='self-serve-vfmodule-ra-assignment' mode='sync'>\n","comments":"","outputs":1,"x":768.428581237793,"y":66.71432209014893,"z":"f6902f40.5e19","wires":[["39968a5c.ccc976"]]},{"id":"39968a5c.ccc976","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":153.92858123779297,"y":148.71432209014893,"z":"f6902f40.5e19","wires":[["7254b5cc.b6e2cc","1459f827.386618","82877888.a7fc38","9a591dc8.409ea","91c376dc.43b9f8","6fdb941c.28348c","e0d9e606.a1f3b8","a7fb3dc8.82b7b","2433b69e.9dac5a","421c7868.35b668","5a748f0d.33a49","1ffabdff.2624f2","247751ca.46435e","ca7fe006.4ef63","d2ce5f51.17499"]]},{"id":"1459f827.386618","type":"set","name":"set","xml":"<set>\n <parameter name=\"cds\" value=\"execution-service_process.\"/>\n <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n <parameter name=\"resource-type\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-type`\" /> \n <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" /> \n <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n","comments":"","x":348.7142639160156,"y":214.57146644592285,"z":"f6902f40.5e19","wires":[]},{"id":"d601ca0a.4083b8","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":643.2142333984375,"y":761.4642413854599,"z":"f6902f40.5e19","wires":[["427cc999.3bd468"]]},{"id":"9a591dc8.409ea","type":"for","name":"for vf-module-topology-operation-input","xml":"<for silentFailure='true' index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >","comments":"","outputs":1,"x":466.7143859863281,"y":458.14292430877686,"z":"f6902f40.5e19","wires":[["dfdf3542.d43a68"]]},{"id":"cf936a79.960488","type":"set","name":"set tmp.sdnc-model-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n","comments":"","x":1213.4286346435547,"y":390.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"163793cb.859cfc","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":959.4286346435547,"y":390.5714921951294,"z":"f6902f40.5e19","wires":[["cf936a79.960488"]]},{"id":"dfdf3542.d43a68","type":"switchNode","name":"switch","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n\n","comments":"","outputs":1,"x":721.4286346435547,"y":457.5714921951294,"z":"f6902f40.5e19","wires":[["163793cb.859cfc","b400f633.2e5378","da04e9fd.4674f8","177a5191.74c57e"]]},{"id":"b400f633.2e5378","type":"outcome","name":"sdnc_model_version","xml":"<outcome value='sdnc_model_version'>\n","comments":"","outputs":1,"x":962.4286346435547,"y":436.5714921951294,"z":"f6902f40.5e19","wires":[["7ebb83ae.d475ac"]]},{"id":"da04e9fd.4674f8","type":"outcome","name":"vf_module_label","xml":"<outcome value='vf_module_label'>\n","comments":"","outputs":1,"x":947.4286346435547,"y":485.5714921951294,"z":"f6902f40.5e19","wires":[["12118326.66feed"]]},{"id":"7ebb83ae.d475ac","type":"set","name":"set tmp.sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-version' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n","comments":"","x":1217.4286346435547,"y":436.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"12118326.66feed","type":"set","name":"set tmp.vf-module-label","xml":"<set>\n<parameter name='tmp.vf-module-label' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n","comments":"","x":1199.4286346435547,"y":485.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"efbc62cb.48e09","type":"set","name":"set name-value other JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name + '&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n","comments":"","x":1217.4286346435547,"y":536.5714921951294,"z":"f6902f40.5e19","wires":[]},{"id":"177a5191.74c57e","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":919.4286346435547,"y":536.5714921951294,"z":"f6902f40.5e19","wires":[["efbc62cb.48e09"]]},{"id":"91c376dc.43b9f8","type":"set","name":"set configAssignment JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`\"/>","comments":"","x":443.00003814697266,"y":973.7143392562866,"z":"f6902f40.5e19","wires":[]},{"id":"6fdb941c.28348c","type":"execute","name":"execute BlueprintProcessingClient","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n <parameter name='restapiUser' value='`$prop.cds.user`' />\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />","comments":"","outputs":1,"x":445.1904296875,"y":1143.7142820358276,"z":"f6902f40.5e19","wires":[["594be503.f419ac","3419422c.24830e"]]},{"id":"594be503.f419ac","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":687.7618255615234,"y":1112.571475982666,"z":"f6902f40.5e19","wires":[["8edb7744.b6b238"]]},{"id":"8edb7744.b6b238","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=\"Error from ConfigAssignmentNode\" />\n","comments":"","x":861.4760818481445,"y":1141.1429405212402,"z":"f6902f40.5e19","wires":[]},{"id":"e0d9e606.a1f3b8","type":"execute","name":"execute jsonStringToCtx","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n","comments":"","outputs":1,"x":406.1428985595703,"y":1297.3333320617676,"z":"f6902f40.5e19","wires":[[]]},{"id":"7254b5cc.b6e2cc","type":"execute","name":"execute generateUUID","xml":" <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ","comments":"","outputs":1,"x":403.4285659790039,"y":149.14289474487305,"z":"f6902f40.5e19","wires":[["e24c189a.46feb8"]]},{"id":"e24c189a.46feb8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":608.4285659790039,"y":149.14289474487305,"z":"f6902f40.5e19","wires":[["39ad9c69.bcd344"]]},{"id":"39ad9c69.bcd344","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=\"generateUUID is failed\" />\n","comments":"","x":772.4285659790039,"y":149.14289474487305,"z":"f6902f40.5e19","wires":[]},{"id":"82877888.a7fc38","type":"switchNode","name":"switch vf-parameters-data.param_length","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_length`'>\n","comments":"","outputs":1,"x":472.5714340209961,"y":294.00005435943604,"z":"f6902f40.5e19","wires":[["98f386c5.e8bba8","c4516b65.17aaa8"]]},{"id":"98f386c5.e8bba8","type":"outcome","name":"null","xml":"<outcome value=''>","comments":"","outputs":1,"x":735.7143173217773,"y":261.8572072982788,"z":"f6902f40.5e19","wires":[["e77b3d83.fde56"]]},{"id":"c4516b65.17aaa8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":734.7143173217773,"y":325.8572072982788,"z":"f6902f40.5e19","wires":[["3a943829.dea268"]]},{"id":"e77b3d83.fde56","type":"set","name":"set pre service param len as 0","xml":"<set>\n <parameter name='highnum' value='0' />\n <parameter name='prehighnum' value='0'/>\n","comments":"","x":948.7143173217773,"y":261.8572072982788,"z":"f6902f40.5e19","wires":[]},{"id":"3a943829.dea268","type":"set","name":"set pre service param len","xml":"<set>\n <parameter name='highnum' value='`$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 <parameter name='prehighnum' value='`$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`' />","comments":"","x":933.7143173217773,"y":325.8572072982788,"z":"f6902f40.5e19","wires":[]},{"id":"3419422c.24830e","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":692.7618255615234,"y":1174.571475982666,"z":"f6902f40.5e19","wires":[["8edb7744.b6b238"]]},{"id":"a7fb3dc8.82b7b","type":"switchNode","name":"switch: model info == NULL","xml":"<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.vf-module-label == ''`\">\n","comments":"","outputs":1,"x":431.7856903076172,"y":761.6071313619614,"z":"f6902f40.5e19","wires":[["d601ca0a.4083b8"]]},{"id":"5ac8e4a2.4d4cdc","type":"get-resource","name":"get VF_MODEL.sdnc_model_name","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n pfx='db1.vf-model'>\n\n","comments":"","outputs":1,"x":1115.6427459716797,"y":673.8927841186523,"z":"f6902f40.5e19","wires":[["ab0217f0.3c09f8","d436a8eb.310f58","54a1f6ba.ddb6e8"]]},{"id":"ab0217f0.3c09f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1357.999885559082,"y":623.416501045227,"z":"f6902f40.5e19","wires":[["8de303f.6eea6"]]},{"id":"8de303f.6eea6","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=\"Error reading VF_MODEL table\" />\n","comments":"","x":1538.9998664855957,"y":623.5594081878662,"z":"f6902f40.5e19","wires":[]},{"id":"3aadcdf.ea01932","type":"get-resource","name":"get VF_MODULE_MODEL.vf-module-label","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT vf_module_label from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid \n \tAND vf_module_label is not null'\n pfx='db1.vf-module-model'>\n\n","comments":"","outputs":1,"x":1137.0950012207031,"y":847.0239028334618,"z":"f6902f40.5e19","wires":[["2f50f1a3.c9e7be","226785b2.b6bb5a","bc50ef9a.ee4a9"]]},{"id":"2f50f1a3.c9e7be","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1418.7377166748047,"y":794.1189783215523,"z":"f6902f40.5e19","wires":[["999b5358.3c004"]]},{"id":"999b5358.3c004","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=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1593.737648010254,"y":794.2618787884712,"z":"f6902f40.5e19","wires":[]},{"id":"226785b2.b6bb5a","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1428.9521751403809,"y":896.3810014128685,"z":"f6902f40.5e19","wires":[["596dce00.574df4"]]},{"id":"427cc999.3bd468","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":818.7380142211914,"y":761.8452372550964,"z":"f6902f40.5e19","wires":[["5ac8e4a2.4d4cdc","3aadcdf.ea01932"]]},{"id":"79398b4d.f2cf44","type":"set","name":"set sdnc-model-name, sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n\n\n\n","comments":"","x":1639.571548461914,"y":721.5356760025024,"z":"f6902f40.5e19","wires":[]},{"id":"d436a8eb.310f58","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1366.1430206298828,"y":721.8213510513306,"z":"f6902f40.5e19","wires":[["79398b4d.f2cf44"]]},{"id":"596dce00.574df4","type":"set","name":"set vf-module-label","xml":"<set>\n<parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />\n\n\n\n","comments":"","x":1622.3927268981934,"y":895.9643144011497,"z":"f6902f40.5e19","wires":[]},{"id":"54a1f6ba.ddb6e8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1370.8929252624512,"y":673.928524017334,"z":"f6902f40.5e19","wires":[["de68ea72.16eda8"]]},{"id":"de68ea72.16eda8","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=\"`'No VF_MODEL found with customization_uuid = ' + $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />","comments":"","x":1542.1429290771484,"y":673.6785249710083,"z":"f6902f40.5e19","wires":[]},{"id":"bc50ef9a.ee4a9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1429.8212661743164,"y":845.928583085537,"z":"f6902f40.5e19","wires":[["6713d4f5.791f4c"]]},{"id":"6713d4f5.791f4c","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=\"`'vf_module_label not found in VF_MODULE_MODEL WHERE customization_uuid = ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />","comments":"","x":1601.0712699890137,"y":845.6785840392113,"z":"f6902f40.5e19","wires":[]},{"id":"2433b69e.9dac5a","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=\"BEFORE BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":351.5714530944824,"y":1077.999945640564,"z":"f6902f40.5e19","wires":[[]]},{"id":"421c7868.35b668","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=\"AFTER BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":347.6190185546875,"y":1234.8571891784668,"z":"f6902f40.5e19","wires":[[]]},{"id":"1ffabdff.2624f2","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n","comments":"","outputs":1,"x":364.8214416503906,"y":1608.2144298553467,"z":"f6902f40.5e19","wires":[[]]},{"id":"5a748f0d.33a49","type":"set","name":"set pathname","xml":"<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vfmodule-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`\" />\n","comments":"","x":366.78575897216797,"y":1541.4286289215088,"z":"f6902f40.5e19","wires":[]},{"id":"247751ca.46435e","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: vfmodule-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":342.42859649658203,"y":1474.1070833206177,"z":"f6902f40.5e19","wires":[[]]},{"id":"ca7fe006.4ef63","type":"set","name":"set updateJsonPayload","xml":"<set>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n <parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n <parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n <parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.vf-module-label`' />\n <parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />","comments":"","x":409.7143096923828,"y":1029.4286937713623,"z":"f6902f40.5e19","wires":[]},{"id":"d2ce5f51.17499","type":"switchNode","name":"switch: jsonContextPrefix.resource-accumulator-resolved-data_length","xml":"<switch test=\"`$jsonContextPrefix.resource-accumulator-resolved-data_length`\">\n","comments":"","outputs":1,"x":564.2857055664062,"y":1372.8572034835815,"z":"f6902f40.5e19","wires":[["e5c38409.014558","6a1d4cbd.e5e004"]]},{"id":"e5c38409.014558","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":932.0634460449219,"y":1348.4127197265625,"z":"f6902f40.5e19","wires":[["1798f3ad.219efc"]]},{"id":"4a6d4db3.b62444","type":"call","name":"Call self-serve-process-vfmodule-template-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1241.063461303711,"y":1402.3015422821045,"z":"f6902f40.5e19","wires":[[]]},{"id":"1798f3ad.219efc","type":"call","name":"Call self-serve-process-vfmodule-mapping-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1241.3968353271484,"y":1348.4127445220947,"z":"f6902f40.5e19","wires":[[]]},{"id":"6a1d4cbd.e5e004","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":931.0634307861328,"y":1401.7461185455322,"z":"f6902f40.5e19","wires":[["4a6d4db3.b62444"]]}] \ No newline at end of file
+[{"id":"9ea93e47.d1baf","type":"dgstart","name":"DGSTART","outputs":1,"x":145,"y":67.5,"z":"a8fbfa1a.ba8768","wires":[["d2786e1f.c2dcc"]]},{"id":"d2786e1f.c2dcc","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":421,"y":68.5,"z":"a8fbfa1a.ba8768","wires":[["cbb0a774.00ebb8"]]},{"id":"cbb0a774.00ebb8","type":"method","name":"self-serve-vfmodule-ra-assignment","xml":"<method rpc='self-serve-vfmodule-ra-assignment' mode='sync'>\n","comments":"","outputs":1,"x":772,"y":68.5,"z":"a8fbfa1a.ba8768","wires":[["a1195f6b.72fc5"]]},{"id":"a1195f6b.72fc5","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":157.5,"y":150.5,"z":"a8fbfa1a.ba8768","wires":[["4d6d5854.936238","3036d3b9.88892c","c3f8369f.f359f8","6f97c12d.ffcb7","2ccd8f5f.0b0f1","88408445.ae8188","a0112dc1.4af37","1db0159f.e7762a","976ec855.a8e1c8","5c8c9aaf.662724","2d5e8121.02835e","f9c0eb64.8966a8","f5b1e151.0f621","d84162d8.9b617"]]},{"id":"3036d3b9.88892c","type":"set","name":"set","xml":"<set>\n <parameter name=\"cds\" value=\"execution-service_process.\"/>\n <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n <parameter name=\"resource-type\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-type`\" /> \n <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" /> \n <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n","comments":"","x":352.28568267822266,"y":216.35714435577393,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"c5a7fd4f.c2d3","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":646.7856521606445,"y":763.249919295311,"z":"a8fbfa1a.ba8768","wires":[["17ba093c.d7c077"]]},{"id":"6f97c12d.ffcb7","type":"for","name":"for vf-module-topology-operation-input","xml":"<for silentFailure='true' index='i' start='0' end='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`' >","comments":"","outputs":1,"x":470.28580474853516,"y":459.92860221862793,"z":"a8fbfa1a.ba8768","wires":[["4c7f9a13.947354"]]},{"id":"4f3e73d.5ca788c","type":"set","name":"set tmp.sdnc-model-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n","comments":"","x":1217.0000534057617,"y":392.35717010498047,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"47c6c666.72f248","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":963.0000534057617,"y":392.35717010498047,"z":"a8fbfa1a.ba8768","wires":[["4f3e73d.5ca788c"]]},{"id":"4c7f9a13.947354","type":"switchNode","name":"switch","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`'>\n\n","comments":"","outputs":1,"x":725.0000534057617,"y":459.35717010498047,"z":"a8fbfa1a.ba8768","wires":[["47c6c666.72f248","28beb64f.06759a","450c3cd8.795ae4","3f2f6cef.73a7f4"]]},{"id":"28beb64f.06759a","type":"outcome","name":"sdnc_model_version","xml":"<outcome value='sdnc_model_version'>\n","comments":"","outputs":1,"x":966.0000534057617,"y":438.35717010498047,"z":"a8fbfa1a.ba8768","wires":[["bc5e234c.60224"]]},{"id":"450c3cd8.795ae4","type":"outcome","name":"vf_module_label","xml":"<outcome value='vf_module_label'>\n","comments":"","outputs":1,"x":951.0000534057617,"y":487.35717010498047,"z":"a8fbfa1a.ba8768","wires":[["6015ba3a.3fe844"]]},{"id":"bc5e234c.60224","type":"set","name":"set tmp.sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-version' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n","comments":"","x":1221.0000534057617,"y":438.35717010498047,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"6015ba3a.3fe844","type":"set","name":"set tmp.vf-module-label","xml":"<set>\n<parameter name='tmp.vf-module-label' value='`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`' />\n\n","comments":"","x":1203.0000534057617,"y":487.35717010498047,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"ef61beeb.3e6bf","type":"set","name":"set name-value other JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name + '&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n","comments":"","x":1221.0000534057617,"y":538.3571701049805,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"3f2f6cef.73a7f4","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":923.0000534057617,"y":538.3571701049805,"z":"a8fbfa1a.ba8768","wires":[["ef61beeb.3e6bf"]]},{"id":"2ccd8f5f.0b0f1","type":"set","name":"set configAssignment JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vf-module-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-id&quot;:&quot;' + $vf-module-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vf-module-model-customization-uuid&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '&quot;vf-module-id&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '&quot;aic-cloud-region&quot;:&quot;' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '&quot;'`\"/>","comments":"","x":446.5714569091797,"y":975.5000171661377,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"88408445.ae8188","type":"execute","name":"execute BlueprintProcessingClient","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n <parameter name='restapiUser' value='`$prop.cds.user`' />\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name=\"responsePrefix\" value=\"raAssign\" />","comments":"","outputs":1,"x":448.76184844970703,"y":1145.4999599456787,"z":"a8fbfa1a.ba8768","wires":[["8b8b59e2.7094c8","d0a90f94.934b1"]]},{"id":"8b8b59e2.7094c8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":691.3332443237305,"y":1114.357153892517,"z":"a8fbfa1a.ba8768","wires":[["905e16.6435b1e8"]]},{"id":"905e16.6435b1e8","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=\"Error from ConfigAssignmentNode\" />\n","comments":"","x":865.0475006103516,"y":1142.9286184310913,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"4d6d5854.936238","type":"execute","name":"execute generateUUID","xml":" <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ","comments":"","outputs":1,"x":406.99998474121094,"y":150.92857265472412,"z":"a8fbfa1a.ba8768","wires":[["ae2a95b4.c2afd8"]]},{"id":"ae2a95b4.c2afd8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":611.9999847412109,"y":150.92857265472412,"z":"a8fbfa1a.ba8768","wires":[["e5a440b7.94973"]]},{"id":"e5a440b7.94973","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=\"generateUUID is failed\" />\n","comments":"","x":775.9999847412109,"y":150.92857265472412,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"c3f8369f.f359f8","type":"switchNode","name":"switch vf-parameters-data.param_length","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_length`'>\n","comments":"","outputs":1,"x":476.1428527832031,"y":295.7857322692871,"z":"a8fbfa1a.ba8768","wires":[["278e635.ddd179c","39d2c7fb.c62018"]]},{"id":"278e635.ddd179c","type":"outcome","name":"null","xml":"<outcome value=''>","comments":"","outputs":1,"x":739.2857360839844,"y":263.6428852081299,"z":"a8fbfa1a.ba8768","wires":[["4f696e32.aa379"]]},{"id":"39d2c7fb.c62018","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":738.2857360839844,"y":327.6428852081299,"z":"a8fbfa1a.ba8768","wires":[["550556cc.d56188"]]},{"id":"4f696e32.aa379","type":"set","name":"set pre service param len as 0","xml":"<set>\n <parameter name='highnum' value='0' />\n <parameter name='prehighnum' value='0'/>\n","comments":"","x":952.2857360839844,"y":263.6428852081299,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"550556cc.d56188","type":"set","name":"set pre service param len","xml":"<set>\n <parameter name='highnum' value='`$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 <parameter name='prehighnum' value='`$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`' />","comments":"","x":937.2857360839844,"y":327.6428852081299,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"d0a90f94.934b1","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":696.3332443237305,"y":1176.357153892517,"z":"a8fbfa1a.ba8768","wires":[["905e16.6435b1e8"]]},{"id":"a0112dc1.4af37","type":"switchNode","name":"switch: model info == NULL","xml":"<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.vf-module-label == ''`\">\n","comments":"","outputs":1,"x":435.3571090698242,"y":763.3928092718124,"z":"a8fbfa1a.ba8768","wires":[["c5a7fd4f.c2d3"]]},{"id":"52f69702.aac5b8","type":"get-resource","name":"get VF_MODEL.sdnc_model_name","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n pfx='db1.vf-model'>\n\n","comments":"","outputs":1,"x":1119.2141647338867,"y":675.6784620285034,"z":"a8fbfa1a.ba8768","wires":[["3f444520.5d7b7a","5dd73d06.33aa94","f68dbe38.707d"]]},{"id":"3f444520.5d7b7a","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1361.571304321289,"y":625.2021789550781,"z":"a8fbfa1a.ba8768","wires":[["a37d35a7.578bb8"]]},{"id":"a37d35a7.578bb8","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=\"Error reading VF_MODEL table\" />\n","comments":"","x":1542.5712852478027,"y":625.3450860977173,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"1c64759c.49da2a","type":"get-resource","name":"get VF_MODULE_MODEL.vf-module-label","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT vf_module_label from VF_MODULE_MODEL WHERE customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid \n \tAND vf_module_label is not null'\n pfx='db1.vf-module-model'>\n\n","comments":"","outputs":1,"x":1140.6664199829102,"y":848.8095807433128,"z":"a8fbfa1a.ba8768","wires":[["85a473e7.4f297","bc3bfe80.99a32","fbdb5540.30d358"]]},{"id":"85a473e7.4f297","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1422.3091354370117,"y":795.9046562314034,"z":"a8fbfa1a.ba8768","wires":[["83ade5b3.1af888"]]},{"id":"83ade5b3.1af888","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=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1597.309066772461,"y":796.0475566983223,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"bc3bfe80.99a32","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1432.523593902588,"y":898.1666793227196,"z":"a8fbfa1a.ba8768","wires":[["771c825d.9a77cc"]]},{"id":"17ba093c.d7c077","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":822.3094329833984,"y":763.6309151649475,"z":"a8fbfa1a.ba8768","wires":[["52f69702.aac5b8","1c64759c.49da2a"]]},{"id":"f9eef446.bfc1b8","type":"set","name":"set sdnc-model-name, sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n\n\n\n","comments":"","x":1643.142967224121,"y":723.3213539123535,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"5dd73d06.33aa94","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1369.7144393920898,"y":723.6070289611816,"z":"a8fbfa1a.ba8768","wires":[["f9eef446.bfc1b8"]]},{"id":"771c825d.9a77cc","type":"set","name":"set vf-module-label","xml":"<set>\n<parameter name='tmp.vf-module-label' value='`$db1.vf-module-model.vf-module-label`' />\n\n\n\n","comments":"","x":1625.9641456604004,"y":897.7499923110008,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"f68dbe38.707d","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1374.4643440246582,"y":675.7142019271851,"z":"a8fbfa1a.ba8768","wires":[["51a9602f.b32aa"]]},{"id":"51a9602f.b32aa","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=\"`'No VF_MODEL found with customization_uuid = ' + $vf-module-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`\" />","comments":"","x":1545.7143478393555,"y":675.4642028808594,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"fbdb5540.30d358","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1433.3926849365234,"y":847.714260995388,"z":"a8fbfa1a.ba8768","wires":[["491e9233.e7c08c"]]},{"id":"491e9233.e7c08c","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=\"`'vf_module_label not found in VF_MODULE_MODEL WHERE customization_uuid = ' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`\" />","comments":"","x":1604.6426887512207,"y":847.4642619490623,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"1db0159f.e7762a","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=\"BEFORE BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":355.14287185668945,"y":1079.785623550415,"z":"a8fbfa1a.ba8768","wires":[[]]},{"id":"976ec855.a8e1c8","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=\"AFTER BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":351.19043731689453,"y":1236.6428670883179,"z":"a8fbfa1a.ba8768","wires":[[]]},{"id":"2d5e8121.02835e","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n","comments":"","outputs":1,"x":366.1428527832031,"y":1715.0000689029694,"z":"a8fbfa1a.ba8768","wires":[[]]},{"id":"5c8c9aaf.662724","type":"set","name":"set pathname","xml":"<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vfmodule-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.vf-module-id + '.log'`\" />\n","comments":"","x":372.10717010498047,"y":1648.2142679691315,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"f9c0eb64.8966a8","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: vfmodule-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":344.75000762939453,"y":1580.8927223682404,"z":"a8fbfa1a.ba8768","wires":[[]]},{"id":"f5b1e151.0f621","type":"set","name":"set updateJsonPayload","xml":"<set>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n <parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n <parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n <parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.vf-module-label`' />\n <parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />","comments":"","x":413.28572845458984,"y":1031.2143716812134,"z":"a8fbfa1a.ba8768","wires":[]},{"id":"beefedee.f9d4e","type":"call","name":"Call self-serve-process-vfmodule-template-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1614.6348114013672,"y":1439.8371772766113,"z":"a8fbfa1a.ba8768","wires":[[]]},{"id":"3e2d3645.000e4a","type":"call","name":"Call self-serve-process-vfmodule-mapping-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1054.9683074951172,"y":1293.6983823776245,"z":"a8fbfa1a.ba8768","wires":[[]]},{"id":"d84162d8.9b617","type":"execute","name":"execute jsonStringToCtx - resolved-data","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.vf-module-label`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"true\" />\n\n","comments":"","outputs":1,"x":462.5,"y":1348.722412109375,"z":"a8fbfa1a.ba8768","wires":[["bde04434.054e68","79774eda.1c727"]]},{"id":"bde04434.054e68","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":736.2499809265137,"y":1293.722412109375,"z":"a8fbfa1a.ba8768","wires":[["3e2d3645.000e4a"]]},{"id":"79774eda.1c727","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":729.4999809265137,"y":1402.2224140167236,"z":"a8fbfa1a.ba8768","wires":[["fa243f7d.8e03b"]]},{"id":"fa243f7d.8e03b","type":"execute","name":"execute jsonStringToCtx - meshed-template","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"true\" />\n\n","comments":"","outputs":1,"x":1008.7500419616699,"y":1402.4724130630493,"z":"a8fbfa1a.ba8768","wires":[["d19cbbbe.2c9da8","b1fc338b.0ad94"]]},{"id":"b1fc338b.0ad94","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1297.5000495910645,"y":1439.972412109375,"z":"a8fbfa1a.ba8768","wires":[["beefedee.f9d4e"]]},{"id":"d19cbbbe.2c9da8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1290.7500457763672,"y":1363.7224111557007,"z":"a8fbfa1a.ba8768","wires":[["be17bf40.3815"]]},{"id":"be17bf40.3815","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=\"Failed to parse RA respose from mapping or meshed-template\" />\n","comments":"","x":1467.99995803833,"y":1363.9723930358887,"z":"a8fbfa1a.ba8768","wires":[]}] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
index abca12da..b1849b7c 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json
@@ -1 +1 @@
-[{"id":"3501e5a2.675aea","type":"dgstart","name":"DGSTART","outputs":1,"x":91,"y":33.5,"z":"8334cfbf.1dbfc","wires":[["b5f22dfe.6e31"]]},{"id":"b5f22dfe.6e31","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":367,"y":34.5,"z":"8334cfbf.1dbfc","wires":[["547f0019.d0fa3"]]},{"id":"547f0019.d0fa3","type":"method","name":"self-serve-vnf-ra-assignment","xml":"<method rpc='self-serve-vnf-ra-assignment' mode='sync'>\n","comments":"","outputs":1,"x":210.07144165039062,"y":91.46428775787354,"z":"8334cfbf.1dbfc","wires":[["2e63ff2b.561f1"]]},{"id":"2e63ff2b.561f1","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":204.4523468017578,"y":158.04761695861816,"z":"8334cfbf.1dbfc","wires":[["96155f36.4dee","ecd8ee9b.c02a9","1f066148.408b8f","694896b0.6ae8c8","bc33905f.8bba6","9226252e.e39d18","16b37854.35c298","1c416f3d.add001","8bd3a596.34f178","be4e75b8.3ec5d8","7ff74048.c7318","6a301448.38917c","5d4647a7.c772e8","363fca1c.bf8736","e7b4ac15.b3f62"]]},{"id":"ecd8ee9b.c02a9","type":"set","name":"set","xml":"<set>\n <parameter name=\"cds\" value=\"execution-service_process.\"/>\n <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n <parameter name=\"resource-type\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-type`\" /> \n <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" /> \n <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n","comments":"","x":385.2023696899414,"y":226.5476131439209,"z":"8334cfbf.1dbfc","wires":[]},{"id":"eba7814c.4e099","type":"get-resource","name":"get-resource VF_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n pfx='db1.vf-model'>\n \n\n","comments":"","outputs":1,"x":943.8173675537109,"y":689.611005783081,"z":"8334cfbf.1dbfc","wires":[["c763b60b.7a9018","40f3797c.5f4068","93c98739.415188"]]},{"id":"c763b60b.7a9018","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1188.8174667358398,"y":638.8967294692993,"z":"8334cfbf.1dbfc","wires":[["c002a60.b907d58"]]},{"id":"c002a60.b907d58","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=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1361.8174667358398,"y":638.8967294692993,"z":"8334cfbf.1dbfc","wires":[]},{"id":"cc998536.46b198","type":"set","name":"set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n<parameter name='tmp.sdnc-artifact-name' value='`$db1.vf-model.sdnc-artifact-name`' />\n\n\n\n\n","comments":"","x":1587.2459678649902,"y":739.0395336151123,"z":"8334cfbf.1dbfc","wires":[]},{"id":"357da513.c5218a","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=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1371.8174667358398,"y":687.8967294692993,"z":"8334cfbf.1dbfc","wires":[]},{"id":"bc33905f.8bba6","type":"switchNode","name":"switch: model info == NULL","xml":"<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.sdnc-artifact-name == ''`\">\n","comments":"","outputs":1,"x":461.81736755371094,"y":690.611005783081,"z":"8334cfbf.1dbfc","wires":[["ffaf5b0c.1fedc8"]]},{"id":"40f3797c.5f4068","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1194.8174667358398,"y":687.8967294692993,"z":"8334cfbf.1dbfc","wires":[["357da513.c5218a"]]},{"id":"ffaf5b0c.1fedc8","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":713.8173675537109,"y":690.611005783081,"z":"8334cfbf.1dbfc","wires":[["eba7814c.4e099"]]},{"id":"694896b0.6ae8c8","type":"for","name":"for vnf-topology-operation-input","xml":"<for silentFailure='true' index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >","comments":"","outputs":1,"x":473.4523468017578,"y":476.29761695861816,"z":"8334cfbf.1dbfc","wires":[["f14b9f13.ca1ba"]]},{"id":"f14b9f13.ca1ba","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":734.4523468017578,"y":476.29761695861816,"z":"8334cfbf.1dbfc","wires":[["38dc7b1c.057fc4"]]},{"id":"a24519d6.9da8a8","type":"set","name":"set tmp.sdnc-model-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n","comments":"","x":1383.4523468017578,"y":398.29761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"8c31b1c4.f2bee","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":1129.4523468017578,"y":398.29761695861816,"z":"8334cfbf.1dbfc","wires":[["a24519d6.9da8a8"]]},{"id":"38dc7b1c.057fc4","type":"switchNode","name":"switch","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n\n","comments":"","outputs":1,"x":908.4523468017578,"y":476.29761695861816,"z":"8334cfbf.1dbfc","wires":[["8c31b1c4.f2bee","6ab00d80.fca704","a9ef8550.572b88","8245db44.d86468"]]},{"id":"6ab00d80.fca704","type":"outcome","name":"sdnc_model_version","xml":"<outcome value='sdnc_model_version'>\n","comments":"","outputs":1,"x":1132.4523468017578,"y":444.29761695861816,"z":"8334cfbf.1dbfc","wires":[["8358a2cb.5dc06"]]},{"id":"a9ef8550.572b88","type":"outcome","name":"sdnc_artifact_name","xml":"<outcome value='sdnc_artifact_name'>\n","comments":"","outputs":1,"x":1131.4523468017578,"y":493.29761695861816,"z":"8334cfbf.1dbfc","wires":[["a9c04e60.ef2f8"]]},{"id":"8358a2cb.5dc06","type":"set","name":"set tmp.sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-version' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n","comments":"","x":1387.4523468017578,"y":444.29761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"a9c04e60.ef2f8","type":"set","name":"set tmp.sdnc-artifact-name","xml":"<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n","comments":"","x":1383.4523468017578,"y":493.29761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"86fadb38.c81f38","type":"set","name":"set name-value other JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + '&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n","comments":"","x":1399.4523468017578,"y":542.2976169586182,"z":"8334cfbf.1dbfc","wires":[]},{"id":"8245db44.d86468","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1091.4523544311523,"y":542.8690376281738,"z":"8334cfbf.1dbfc","wires":[["86fadb38.c81f38"]]},{"id":"9226252e.e39d18","type":"set","name":"set configAssignment JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vnf-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`\"/>\n","comments":"","x":475.0079040527344,"y":749.9920196533203,"z":"8334cfbf.1dbfc","wires":[]},{"id":"16b37854.35c298","type":"execute","name":"execute BlueprintProcessingClient","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n <parameter name='restapiUser' value='`$prop.cds.user`' />\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />","comments":"","outputs":1,"x":477.8968048095703,"y":968.4364633560181,"z":"8334cfbf.1dbfc","wires":[["dd7f5eae.cd01d","f7ecbf9b.1b1ca"]]},{"id":"dd7f5eae.cd01d","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":717.8968048095703,"y":942.4364633560181,"z":"8334cfbf.1dbfc","wires":[["11e08758.03b3a9"]]},{"id":"11e08758.03b3a9","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=\"Error from ConfigAssignmentNode\" />\n","comments":"","x":899.8968048095703,"y":963.4364633560181,"z":"8334cfbf.1dbfc","wires":[]},{"id":"96155f36.4dee","type":"execute","name":"execute generateUUID","xml":" <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ","comments":"","outputs":1,"x":441.9523468017578,"y":158.04761695861816,"z":"8334cfbf.1dbfc","wires":[["42941485.41dd1c"]]},{"id":"42941485.41dd1c","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":653.9523468017578,"y":157.04761695861816,"z":"8334cfbf.1dbfc","wires":[["44726b34.9c6614"]]},{"id":"44726b34.9c6614","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=\"generateUUID is failed\" />\n","comments":"","x":829.9523468017578,"y":157.04761695861816,"z":"8334cfbf.1dbfc","wires":[]},{"id":"1f066148.408b8f","type":"switchNode","name":"switch vnf-parameters-data.param_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n","comments":"","outputs":1,"x":510.2023468017578,"y":304.79764461517334,"z":"8334cfbf.1dbfc","wires":[["7aad0ce7.e8e6c4","35092a50.a68416"]]},{"id":"7aad0ce7.e8e6c4","type":"outcome","name":"null","xml":"<outcome value=''>","comments":"","outputs":1,"x":777.2023468017578,"y":272.79764461517334,"z":"8334cfbf.1dbfc","wires":[["5d9fd2c5.25f81c"]]},{"id":"35092a50.a68416","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":776.2023468017578,"y":336.79764461517334,"z":"8334cfbf.1dbfc","wires":[["848e04b8.ce3208"]]},{"id":"5d9fd2c5.25f81c","type":"set","name":"set pre service param len as 0","xml":"<set>\n <parameter name='highnum' value='0' />\n <parameter name='prehighnum' value='0'/>\n","comments":"","x":990.2023468017578,"y":272.79764461517334,"z":"8334cfbf.1dbfc","wires":[]},{"id":"848e04b8.ce3208","type":"set","name":"set pre service param len","xml":"<set>\n <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />\n <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />","comments":"","x":975.2023468017578,"y":336.79764461517334,"z":"8334cfbf.1dbfc","wires":[]},{"id":"f7ecbf9b.1b1ca","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":722.8968048095703,"y":1004.4364633560181,"z":"8334cfbf.1dbfc","wires":[["11e08758.03b3a9"]]},{"id":"93c98739.415188","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1190.9602699279785,"y":738.8967018127441,"z":"8334cfbf.1dbfc","wires":[["cc998536.46b198"]]},{"id":"1c416f3d.add001","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=\"BEFORE BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":381.67456436157227,"y":894.2143058776855,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"8bd3a596.34f178","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=\"AFTER BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":383.8968200683594,"y":1078.1031112670898,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"be4e75b8.3ec5d8","type":"set","name":"set updateJsonPayload","xml":"<set>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />","comments":"","x":440.4523468017578,"y":822.2143030166626,"z":"8334cfbf.1dbfc","wires":[]},{"id":"7ff74048.c7318","type":"execute","name":"execute jsonStringToCtx","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"false\" />\n\n","comments":"","outputs":1,"x":443.8888702392578,"y":1143.3332748413086,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"6a301448.38917c","type":"switchNode","name":"switch: jsonContextPrefix.resource-accumulator-resolved-data_length","xml":"<switch test=\"`$jsonContextPrefix.resource-accumulator-resolved-data_length`\">\n","comments":"","outputs":1,"x":601.8888854980469,"y":1233.3332777023315,"z":"8334cfbf.1dbfc","wires":[["cd8908db.761938","251a76.7423158a"]]},{"id":"cd8908db.761938","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":969.6666259765625,"y":1208.8887939453125,"z":"8334cfbf.1dbfc","wires":[["2fd0fd65.b23da2"]]},{"id":"f8ea61ad.0fe5b","type":"call","name":"Call self-serve-process-vnf-template-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1262.6666412353516,"y":1262.7776165008545,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"2fd0fd65.b23da2","type":"call","name":"Call self-serve-process-vnf-mapping-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1263.000015258789,"y":1208.8888187408447,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"251a76.7423158a","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":968.6666107177734,"y":1262.2221927642822,"z":"8334cfbf.1dbfc","wires":[["f8ea61ad.0fe5b"]]},{"id":"e7b4ac15.b3f62","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n","comments":"","outputs":1,"x":397.5,"y":1432.5,"z":"8334cfbf.1dbfc","wires":[[]]},{"id":"363fca1c.bf8736","type":"set","name":"set pathname","xml":"<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vnf-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\" />\n","comments":"","x":402.75,"y":1379.9999980926514,"z":"8334cfbf.1dbfc","wires":[]},{"id":"5d4647a7.c772e8","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-vnf-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":378.24999618530273,"y":1329.7499980926514,"z":"8334cfbf.1dbfc","wires":[[]]}] \ No newline at end of file
+[{"id":"63c6d4ad.9f7fdc","type":"dgstart","name":"DGSTART","outputs":1,"x":105,"y":60,"z":"9c9d6788.9ad478","wires":[["c9ec4200.9fbe"]]},{"id":"c9ec4200.9fbe","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":381,"y":61,"z":"9c9d6788.9ad478","wires":[["9dfa437.8ea91c"]]},{"id":"9dfa437.8ea91c","type":"method","name":"self-serve-vnf-ra-assignment","xml":"<method rpc='self-serve-vnf-ra-assignment' mode='sync'>\n","comments":"","outputs":1,"x":224.07144165039062,"y":117.96428775787354,"z":"9c9d6788.9ad478","wires":[["2d7abfcd.2faa6"]]},{"id":"2d7abfcd.2faa6","type":"block","name":"block atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":218.4523468017578,"y":184.54761695861816,"z":"9c9d6788.9ad478","wires":[["4d21efd2.5e5ff","ab54238d.24ce5","8b575074.f108d","bc2286aa.e94c88","d4b38f52.e612d","a657e5a1.4f2038","2de3e1e7.11b9de","76f1b778.049d28","8217d55.d112b28","f43af4c9.1c8338","c77c96b3.9671d8","25ebf820.dd8c48","989ba1d5.b7504","3dd11a72.581e76"]]},{"id":"ab54238d.24ce5","type":"set","name":"set","xml":"<set>\n <parameter name=\"cds\" value=\"execution-service_process.\"/>\n <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.vnf-se-serv-uuid`\"/>\n <parameter name=\"resource-type\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-type`\" /> \n <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" /> \n <parameter name=\"`$cds + 'actionIdentifiers.actionName'`\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n <parameter name=\"`$cds + 'isNonAppend'`\" value=\"true\"/>\n <parameter name=\"`$cds + 'commonHeader.originatorId'`\" value=\"SDNC_DG\"/>\n <parameter name=\"`$cds + 'actionIdentifiers.mode'`\" value=\"sync\"/>\n","comments":"","x":399.2023696899414,"y":253.0476131439209,"z":"9c9d6788.9ad478","wires":[]},{"id":"a14536c0.6d3618","type":"get-resource","name":"get-resource VF_MODEL","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n key='SELECT * from VF_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'\n pfx='db1.vf-model'>\n \n\n","comments":"","outputs":1,"x":957.8173675537109,"y":716.111005783081,"z":"9c9d6788.9ad478","wires":[["cfe4a3cc.64f95","e22771c4.b1ea3","bf4a0272.ac394"]]},{"id":"cfe4a3cc.64f95","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1202.8174667358398,"y":665.3967294692993,"z":"9c9d6788.9ad478","wires":[["f292357e.bbd1a8"]]},{"id":"f292357e.bbd1a8","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=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1375.8174667358398,"y":665.3967294692993,"z":"9c9d6788.9ad478","wires":[]},{"id":"b5950127.c7e1c","type":"set","name":"set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$db1.vf-model.sdnc-model-name`' />\n<parameter name='tmp.sdnc-model-version' value='`$db1.vf-model.sdnc-model-version`' />\n<parameter name='tmp.sdnc-artifact-name' value='`$db1.vf-model.sdnc-artifact-name`' />\n\n\n\n\n","comments":"","x":1601.2459678649902,"y":765.5395336151123,"z":"9c9d6788.9ad478","wires":[]},{"id":"11e64d9f.7666f2","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=\"Error reading VF_MODULE_MODEL table\" />\n","comments":"","x":1385.8174667358398,"y":714.3967294692993,"z":"9c9d6788.9ad478","wires":[]},{"id":"d4b38f52.e612d","type":"switchNode","name":"switch: model info == NULL","xml":"<switch test=\"`$tmp.sdnc-model-name == '' or $tmp.sdnc-model-version == '' or $tmp.sdnc-artifact-name == ''`\">\n","comments":"","outputs":1,"x":475.81736755371094,"y":717.111005783081,"z":"9c9d6788.9ad478","wires":[["50bfe883.896158"]]},{"id":"e22771c4.b1ea3","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1208.8174667358398,"y":714.3967294692993,"z":"9c9d6788.9ad478","wires":[["11e64d9f.7666f2"]]},{"id":"50bfe883.896158","type":"outcome","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":727.8173675537109,"y":717.111005783081,"z":"9c9d6788.9ad478","wires":[["a14536c0.6d3618"]]},{"id":"bc2286aa.e94c88","type":"for","name":"for vnf-topology-operation-input","xml":"<for silentFailure='true' index='i' start='0' end='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`' >","comments":"","outputs":1,"x":487.4523468017578,"y":502.79761695861816,"z":"9c9d6788.9ad478","wires":[["19d21bae.1c2954"]]},{"id":"19d21bae.1c2954","type":"block","name":"block atomic","xml":"<block atomic=\"true\">","atomic":"false","comments":"","outputs":1,"x":748.4523468017578,"y":502.79761695861816,"z":"9c9d6788.9ad478","wires":[["a444ea28.08f138"]]},{"id":"bf9fd0c8.a829d","type":"set","name":"set tmp.sdnc-model-name","xml":"<set>\n<parameter name='tmp.sdnc-model-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n","comments":"","x":1397.4523468017578,"y":424.79761695861816,"z":"9c9d6788.9ad478","wires":[]},{"id":"94e35222.f28a4","type":"outcome","name":"sdnc_model_name","xml":"<outcome value='sdnc_model_name'>\n","comments":"","outputs":1,"x":1143.4523468017578,"y":424.79761695861816,"z":"9c9d6788.9ad478","wires":[["bf9fd0c8.a829d"]]},{"id":"a444ea28.08f138","type":"switchNode","name":"switch","xml":"<switch test='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name`'>\n\n","comments":"","outputs":1,"x":922.4523468017578,"y":502.79761695861816,"z":"9c9d6788.9ad478","wires":[["94e35222.f28a4","729b92d8.96607c","2b571743.3f9948","8a545dd3.88e11"]]},{"id":"729b92d8.96607c","type":"outcome","name":"sdnc_model_version","xml":"<outcome value='sdnc_model_version'>\n","comments":"","outputs":1,"x":1146.4523468017578,"y":470.79761695861816,"z":"9c9d6788.9ad478","wires":[["77facf86.b921f"]]},{"id":"2b571743.3f9948","type":"outcome","name":"sdnc_artifact_name","xml":"<outcome value='sdnc_artifact_name'>\n","comments":"","outputs":1,"x":1145.4523468017578,"y":519.7976169586182,"z":"9c9d6788.9ad478","wires":[["784205a5.281cac"]]},{"id":"77facf86.b921f","type":"set","name":"set tmp.sdnc-model-version","xml":"<set>\n<parameter name='tmp.sdnc-model-version' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n","comments":"","x":1401.4523468017578,"y":470.79761695861816,"z":"9c9d6788.9ad478","wires":[]},{"id":"784205a5.281cac","type":"set","name":"set tmp.sdnc-artifact-name","xml":"<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value`' />\n\n","comments":"","x":1397.4523468017578,"y":519.7976169586182,"z":"9c9d6788.9ad478","wires":[]},{"id":"f57a1ff1.c4263","type":"set","name":"set name-value other JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + '&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value + '&quot;,'`\"/>\n\n","comments":"","x":1413.4523468017578,"y":568.7976169586182,"z":"9c9d6788.9ad478","wires":[]},{"id":"8a545dd3.88e11","type":"outcome","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1105.4523544311523,"y":569.3690376281738,"z":"9c9d6788.9ad478","wires":[["f57a1ff1.c4263"]]},{"id":"a657e5a1.4f2038","type":"set","name":"set configAssignment JsonString","xml":"<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '&quot;service-instance-id&quot;:&quot;' + $vnf-topology-operation-input.service-information.service-instance-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '&quot;vnf-model-customization-uuid&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '&quot;vnf-id&quot;:&quot;' + $vnf-topology-operation-input.vnf-information.vnf-id + '&quot;,'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '&quot;aic-cloud-region&quot;:&quot;' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '&quot;'`\"/>\n","comments":"","x":489.0079040527344,"y":776.4920196533203,"z":"9c9d6788.9ad478","wires":[]},{"id":"2de3e1e7.11b9de","type":"execute","name":"execute BlueprintProcessingClient","xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\n <parameter name='restapiUser' value='`$prop.cds.user`' />\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='POST' />\n <parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n <parameter name=\"responsePrefix\" value=\"raAssign\" />","comments":"","outputs":1,"x":491.8968048095703,"y":996.9364633560181,"z":"9c9d6788.9ad478","wires":[["72272799.6f87e8","94ab143.1d302e8"]]},{"id":"72272799.6f87e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":731.8968048095703,"y":968.9364633560181,"z":"9c9d6788.9ad478","wires":[["d75bb620.442198"]]},{"id":"d75bb620.442198","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=\"Error from BlueprintProcessingClient\" />\n","comments":"","x":920.8968048095703,"y":989.9364633560181,"z":"9c9d6788.9ad478","wires":[]},{"id":"4d21efd2.5e5ff","type":"execute","name":"execute generateUUID","xml":" <execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"generateUUID\" > \n <parameter name=\"ctx-destination\" value=\"tmp.return.generate.vnf-se-serv-uuid\" /> \n ","comments":"","outputs":1,"x":455.9523468017578,"y":184.54761695861816,"z":"9c9d6788.9ad478","wires":[["4b9937da.942858"]]},{"id":"4b9937da.942858","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":667.9523468017578,"y":183.54761695861816,"z":"9c9d6788.9ad478","wires":[["a3737477.348b98"]]},{"id":"a3737477.348b98","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=\"generateUUID is failed\" />\n","comments":"","x":843.9523468017578,"y":183.54761695861816,"z":"9c9d6788.9ad478","wires":[]},{"id":"8b575074.f108d","type":"switchNode","name":"switch vnf-parameters-data.param_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n","comments":"","outputs":1,"x":524.2023468017578,"y":331.29764461517334,"z":"9c9d6788.9ad478","wires":[["2de664b1.86a3cc","ce207255.cb9e6"]]},{"id":"2de664b1.86a3cc","type":"outcome","name":"null","xml":"<outcome value=''>","comments":"","outputs":1,"x":791.2023468017578,"y":299.29764461517334,"z":"9c9d6788.9ad478","wires":[["163e5ecc.ddef61"]]},{"id":"ce207255.cb9e6","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":790.2023468017578,"y":363.29764461517334,"z":"9c9d6788.9ad478","wires":[["aa3c70c4.b7cd6"]]},{"id":"163e5ecc.ddef61","type":"set","name":"set pre service param len as 0","xml":"<set>\n <parameter name='highnum' value='0' />\n <parameter name='prehighnum' value='0'/>\n","comments":"","x":1004.2023468017578,"y":299.29764461517334,"z":"9c9d6788.9ad478","wires":[]},{"id":"aa3c70c4.b7cd6","type":"set","name":"set pre service param len","xml":"<set>\n <parameter name='highnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />\n <parameter name='prehighnum' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' />","comments":"","x":989.2023468017578,"y":363.29764461517334,"z":"9c9d6788.9ad478","wires":[]},{"id":"94ab143.1d302e8","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":742.8968048095703,"y":1030.936463356018,"z":"9c9d6788.9ad478","wires":[["d75bb620.442198"]]},{"id":"bf4a0272.ac394","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1204.9602699279785,"y":765.3967018127441,"z":"9c9d6788.9ad478","wires":[["b5950127.c7e1c"]]},{"id":"76f1b778.049d28","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=\"BEFORE BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":395.67456436157227,"y":920.7143058776855,"z":"9c9d6788.9ad478","wires":[[]]},{"id":"8217d55.d112b28","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=\"AFTER BlueprintProcessingClient\"/>\n\n","comments":"","outputs":1,"x":397.8968200683594,"y":1104.6031112670898,"z":"9c9d6788.9ad478","wires":[[]]},{"id":"f43af4c9.1c8338","type":"set","name":"set updateJsonPayload","xml":"<set>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintName'`\" value='`$tmp.sdnc-model-name`' />\n<parameter name=\"`$cds + 'actionIdentifiers.blueprintVersion'`\" value='`$tmp.sdnc-model-version`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.template-prefix[0]'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />","comments":"","x":454.4523468017578,"y":848.7143030166626,"z":"9c9d6788.9ad478","wires":[]},{"id":"809d6195.590c7","type":"call","name":"Call self-serve-process-vnf-template-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1641.1666946411133,"y":1324.0276069641113,"z":"9c9d6788.9ad478","wires":[[]]},{"id":"16e7a11.046735f","type":"call","name":"Call self-serve-process-vnf-mapping-ra-response","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' >\n","comments":"","outputs":1,"x":1082.000015258789,"y":1177.8888149261475,"z":"9c9d6788.9ad478","wires":[[]]},{"id":"989ba1d5.b7504","type":"execute","name":"printContext","xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='`$pathname`' />\n","comments":"","outputs":1,"x":417.7500114440918,"y":1532.7500228881836,"z":"9c9d6788.9ad478","wires":[[]]},{"id":"25ebf820.dd8c48","type":"set","name":"set pathname","xml":"<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-vnf-ra-assignment-' + \n\t$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id + '.log'`\" />\n","comments":"","x":423.0000114440918,"y":1480.250020980835,"z":"9c9d6788.9ad478","wires":[]},{"id":"c77c96b3.9671d8","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-vnf-ra-assignment\"/>\n\n","comments":"","outputs":1,"x":398.50000762939453,"y":1430.000020980835,"z":"9c9d6788.9ad478","wires":[[]]},{"id":"3dd11a72.581e76","type":"execute","name":"execute jsonStringToCtx - resolved-data","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"true\" />\n\n","comments":"","outputs":1,"x":510.2500915527344,"y":1232.7500190734863,"z":"9c9d6788.9ad478","wires":[["2788fff6.944b9","13b73d7.3420cc3"]]},{"id":"2788fff6.944b9","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":784.000072479248,"y":1177.7500190734863,"z":"9c9d6788.9ad478","wires":[["16e7a11.046735f"]]},{"id":"13b73d7.3420cc3","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":777.250072479248,"y":1286.250020980835,"z":"9c9d6788.9ad478","wires":[["4b9abfd.ef1ff4"]]},{"id":"4b9abfd.ef1ff4","type":"execute","name":"execute jsonStringToCtx - meshed-template","xml":"<execute plugin=\"org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils\" method=\"jsonStringToCtx\">\n\t<parameter name=\"source\" value=\"`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`\" />\n\t<parameter name=\"outputPath\" value=\"jsonContextPrefix\" />\n\t<parameter name=\"isEscaped\" value=\"true\" />\n\n","comments":"","outputs":1,"x":1056.5001335144043,"y":1286.5000200271606,"z":"9c9d6788.9ad478","wires":[["8cc2bc38.60658","672e4e41.d3303"]]},{"id":"672e4e41.d3303","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1345.2501411437988,"y":1324.0000190734863,"z":"9c9d6788.9ad478","wires":[["809d6195.590c7"]]},{"id":"8cc2bc38.60658","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1338.5001373291016,"y":1247.750018119812,"z":"9c9d6788.9ad478","wires":[["ac6070e3.05c52"]]},{"id":"ac6070e3.05c52","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=\"Failed to parse RA respose from mapping or meshed-template\" />\n","comments":"","x":1515.7500495910645,"y":1248,"z":"9c9d6788.9ad478","wires":[]}] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
index b1486e22..9038e678 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml
@@ -142,7 +142,7 @@
<parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
<parameter name='format' value='json' />
<parameter name='httpMethod' value='POST' />
- <parameter name="responsePrefix" value="`$responsePrefix`" />
+ <parameter name="responsePrefix" value="raAssign" />
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -163,18 +163,30 @@
<parameter name="field1" value="AFTER BlueprintProcessingClient"/>
</record>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`" />
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.vf-module-label`" />
<parameter name="outputPath" value="jsonContextPrefix" />
- <parameter name="isEscaped" value="false" />
- </execute>
- <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">
- <outcome value=''>
+ <parameter name="isEscaped" value="true" />
+ <outcome value='success'>
<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-mapping-ra-response' mode='sync' ></call>
</outcome>
- <outcome value='Other'>
- <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' ></call>
+ <outcome value='failure'>
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.vf-module-label`" />
+ <parameter name="outputPath" value="jsonContextPrefix" />
+ <parameter name="isEscaped" value="true" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Failed to parse RA respose from mapping or meshed-template" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vfmodule-template-ra-response' mode='sync' ></call>
+ </outcome>
+ </execute>
</outcome>
- </switch>
+ </execute>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
<parameter name="field1" value="DONE: vfmodule-ra-assignment"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
index 494fe4a4..420bdf32 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml
@@ -117,19 +117,19 @@
<parameter name='format' value='json' />
<parameter name='httpMethod' value='POST' />
<parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
- <parameter name="responsePrefix" value="`$responsePrefix`" />
+ <parameter name="responsePrefix" value="raAssign" />
<outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error from ConfigAssignmentNode" />
+ <parameter name="error-message" value="Error from BlueprintProcessingClient" />
</return>
</outcome>
<outcome value='not-found'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error from ConfigAssignmentNode" />
+ <parameter name="error-message" value="Error from BlueprintProcessingClient" />
</return>
</outcome>
</execute>
@@ -138,18 +138,30 @@
<parameter name="field1" value="AFTER BlueprintProcessingClient"/>
</record>
<execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
- <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`" />
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-response.resolved-data.' + $tmp.sdnc-artifact-name`" />
<parameter name="outputPath" value="jsonContextPrefix" />
- <parameter name="isEscaped" value="false" />
- </execute>
- <switch test="`$jsonContextPrefix.resource-accumulator-resolved-data_length`">
- <outcome value=''>
+ <parameter name="isEscaped" value="true" />
+ <outcome value='success'>
<call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-mapping-ra-response' mode='sync' ></call>
</outcome>
- <outcome value='Other'>
- <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' ></call>
+ <outcome value='failure'>
+ <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils" method="jsonStringToCtx">
+ <parameter name="source" value="`'raAssign.payload.resource-assignment-response.meshed-template.' + $tmp.sdnc-artifact-name`" />
+ <parameter name="outputPath" value="jsonContextPrefix" />
+ <parameter name="isEscaped" value="true" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Failed to parse RA respose from mapping or meshed-template" />
+ </return>
+ </outcome>
+ <outcome value='success'>
+ <call module='GENERIC-RESOURCE-API' rpc='self-serve-process-vnf-template-ra-response' mode='sync' ></call>
+ </outcome>
+ </execute>
</outcome>
- </switch>
+ </execute>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
<parameter name="field1" value="DONE: self-serve-vnf-ra-assignment"/>