diff options
author | janani <janani.b@huawei.com> | 2019-05-28 20:41:32 +0530 |
---|---|---|
committer | janani <janani.b@huawei.com> | 2019-05-28 20:41:32 +0530 |
commit | e2ec794bd50931eab49a966aa5e3edd0915bd28d (patch) | |
tree | 35b69d4c0b21100bb76215b0687eead102fa808f /platform-logic | |
parent | 80b66c8bc1df1906764bb9ccaec83dfa61000d93 (diff) |
Bug fix in self-serve api1.5.2
Yang change for DG
Change-Id: I9879b1f371a501ed66db8efe7ec1c8f43c6258dd
Issue-ID: CCSDK-1344
Signed-off-by: janani <janani.b@huawei.com>
Former-commit-id: fb0b64e050d61ad3d089cbc481af4ef2a323f2cd
Diffstat (limited to 'platform-logic')
7 files changed, 1265 insertions, 1156 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json index b483f84d..de0dfdf5 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json @@ -1,20 +1,20 @@ [
{
- "id": "a5295fa5.2cebc",
+ "id": "f0a981bd.88fcb",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 105,
- "y": 31,
- "z": "b3572fdc.57a7c",
+ "x": 117,
+ "y": 75,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "91ec004b.fde43"
+ "a665a331.b55d"
]
]
},
{
- "id": "91ec004b.fde43",
+ "id": "a665a331.b55d",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1053 +22,1065 @@ "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": 32,
- "z": "b3572fdc.57a7c",
+ "x": 393,
+ "y": 76,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "8873b97.77d8048"
+ "c81bde26.d0259"
]
]
},
{
- "id": "8873b97.77d8048",
+ "id": "c81bde26.d0259",
"type": "method",
"name": "self-serve-pnf-ra-assignment",
"xml": "<method rpc='self-serve-pnf-ra-assignment' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 237,
- "y": 82,
- "z": "b3572fdc.57a7c",
+ "x": 250.00001525878906,
+ "y": 129.00000762939453,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "871f97d8.236f68"
+ "55728079.b669b"
]
]
},
{
- "id": "871f97d8.236f68",
+ "id": "55728079.b669b",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 200.16664123535156,
- "y": 133.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 212.16664123535156,
+ "y": 177.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "1d7f791b.bbebb7",
- "809ef1f2.9d13a",
- "dfab7c99.217af",
- "e9a6ef1b.98436",
- "36dea652.27073a",
- "937d5326.69965",
- "e221b302.f0199",
- "864aa7c9.1f7118",
- "2ad3fcee.93df44",
- "3461757d.afec6a",
- "b7b3409c.b7131",
- "cb318b66.0796c8",
- "3d6976b6.27f80a",
- "94bf3501.be3848",
- "a566a00c.4994a"
+ "ded0fa5f.1cc958",
+ "da49825b.f212e",
+ "e804e40a.3348d8",
+ "c602f6a.b7d2b08",
+ "110c1be6.299a84",
+ "11ca6e3a.745ed2",
+ "3087bf64.dce3e",
+ "3cae11e4.851bfe",
+ "83f9cf68.29fa4",
+ "59d259e0.595458",
+ "7696cfe3.25742",
+ "906be4e1.f2f3b8",
+ "59d1a840.b9e3b8",
+ "7eebfe0.8659a04",
+ "9f59e925.e7ed18",
+ "c4d5f704.d66b18"
]
]
},
{
- "id": "809ef1f2.9d13a",
+ "id": "da49825b.f212e",
"type": "set",
"name": "set",
- "xml": "<set>\n <parameter name=\"request-id\" value=\"`$tmp.return.generate.pnf-se-serv-uuid`\"/>\n <parameter name=\"resource-type\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-type`\" /> \n <parameter name=\"resource-id\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-id`\" /> \n <parameter name=\"action-name\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n",
+ "xml": "<set>\n <parameter name=\"cds\" value=\"execution-service_process.\"/> \n <parameter name=\"`$cds + 'commonHeader.requestId'`\" value=\"`$tmp.return.generate.pnf-se-serv-uuid`\"/>\n <parameter name=\"resource-type\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-type`\" /> \n <parameter name=\"`$cds + 'commonHeader.subRequestId'`\" value=\"`$pnf-topology-operation-input.pnf-details.pnf-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.9166603088379,
- "y": 178.08333015441895,
- "z": "b3572fdc.57a7c",
+ "x": 397.9166603088379,
+ "y": 222.08333015441895,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "961e1d7.52131e",
+ "id": "fc9300fc.e62da",
"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 = $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid'\n pfx='db1.vf-model'>\n \n\n",
"comments": "",
"outputs": 1,
- "x": 924.8094635009766,
- "y": 569.6189861297607,
- "z": "b3572fdc.57a7c",
+ "x": 936.8094635009766,
+ "y": 613.6189861297607,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "d57245a1.3d8f88",
- "b3bcf1b9.7736d",
- "8b4b4f46.8310f"
+ "27e699d9.486f86",
+ "3868ab1a.84cf94",
+ "c4b3e20a.976c9"
]
]
},
{
- "id": "d57245a1.3d8f88",
+ "id": "27e699d9.486f86",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1169.8095626831055,
- "y": 518.904709815979,
- "z": "b3572fdc.57a7c",
+ "x": 1181.8095626831055,
+ "y": 562.904709815979,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "e952f42f.db9b58"
+ "980d344b.b7a248"
]
]
},
{
- "id": "e952f42f.db9b58",
+ "id": "980d344b.b7a248",
"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": 1342.8095626831055,
- "y": 517.904709815979,
- "z": "b3572fdc.57a7c",
+ "x": 1354.8095626831055,
+ "y": 561.904709815979,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "d8999389.3a4ec",
+ "id": "c69ac6a5.a782c8",
"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": 1545.2380638122559,
- "y": 619.047513961792,
- "z": "b3572fdc.57a7c",
+ "x": 1557.2380638122559,
+ "y": 663.047513961792,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "a316c173.c965a",
+ "id": "64c18674.de26f8",
"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 where customization_uuid = ' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid`\" />\n",
"comments": "",
- "x": 1344.8095626831055,
- "y": 566.904709815979,
- "z": "b3572fdc.57a7c",
+ "x": 1356.8095626831055,
+ "y": 610.904709815979,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "36dea652.27073a",
+ "id": "110c1be6.299a84",
"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": 445.80946350097656,
- "y": 570.6189861297607,
- "z": "b3572fdc.57a7c",
+ "x": 457.80946350097656,
+ "y": 614.6189861297607,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "ea42d6d6.3100d8"
+ "5004e54f.2514ac"
]
]
},
{
- "id": "b3bcf1b9.7736d",
+ "id": "3868ab1a.84cf94",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1175.8095626831055,
- "y": 567.904709815979,
- "z": "b3572fdc.57a7c",
+ "x": 1187.8095626831055,
+ "y": 611.904709815979,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "a316c173.c965a"
+ "64c18674.de26f8"
]
]
},
{
- "id": "ea42d6d6.3100d8",
+ "id": "5004e54f.2514ac",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>",
"comments": "",
"outputs": 1,
- "x": 694.8094635009766,
- "y": 570.6189861297607,
- "z": "b3572fdc.57a7c",
+ "x": 706.8094635009766,
+ "y": 614.6189861297607,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "961e1d7.52131e"
+ "fc9300fc.e62da"
]
]
},
{
- "id": "e9a6ef1b.98436",
+ "id": "c602f6a.b7d2b08",
"type": "for",
"name": "for pnf-topology-operation-input",
"xml": "<for silentFailure='true' index='i' start='0' end='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param_length`' >",
"comments": "",
"outputs": 1,
- "x": 461.66664123535156,
- "y": 370.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 473.66664123535156,
+ "y": 414.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "13eb53e4.18313c"
+ "8c0bf6a3.a5bba8"
]
]
},
{
- "id": "13eb53e4.18313c",
+ "id": "8c0bf6a3.a5bba8",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 683.6666412353516,
- "y": 369.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 695.6666412353516,
+ "y": 413.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "b51d5848.247668"
+ "aaf46ed5.322dd"
]
]
},
{
- "id": "9d71fcdf.711af",
+ "id": "6da0f254.b738bc",
"type": "set",
"name": "set tmp.sdnc-model-name",
"xml": "<set>\n<parameter name='tmp.sdnc-model-name' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n",
"comments": "",
- "x": 1334.6666412353516,
- "y": 302.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 1346.6666412353516,
+ "y": 346.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "6bfa0dba.32b084",
+ "id": "870f2532.302988",
"type": "outcome",
"name": "sdnc_model_name",
"xml": "<outcome value='sdnc_model_name'>\n",
"comments": "",
"outputs": 1,
- "x": 1080.6666412353516,
- "y": 302.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 1092.6666412353516,
+ "y": 346.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "9d71fcdf.711af"
+ "6da0f254.b738bc"
]
]
},
{
- "id": "b51d5848.247668",
+ "id": "aaf46ed5.322dd",
"type": "switchNode",
"name": "switch",
"xml": "<switch test='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].name`'>\n\n",
"comments": "",
"outputs": 1,
- "x": 842.6666412353516,
- "y": 369.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 854.6666412353516,
+ "y": 413.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "6bfa0dba.32b084",
- "51d582d0.51e8dc",
- "3cc10349.41b40c",
- "3f7b410a.8138ce"
+ "870f2532.302988",
+ "c69b064d.42d558",
+ "360ea5f2.3aba6a",
+ "51becd83.b90354"
]
]
},
{
- "id": "51d582d0.51e8dc",
+ "id": "c69b064d.42d558",
"type": "outcome",
"name": "sdnc_model_version",
"xml": "<outcome value='sdnc_model_version'>\n",
"comments": "",
"outputs": 1,
- "x": 1083.6666412353516,
- "y": 348.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 1095.6666412353516,
+ "y": 392.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "86fc17c4.fccda8"
+ "4c9f2347.0813ec"
]
]
},
{
- "id": "3cc10349.41b40c",
+ "id": "360ea5f2.3aba6a",
"type": "outcome",
"name": "sdnc_artifact_name",
"xml": "<outcome value='sdnc_artifact_name'>\n",
"comments": "",
"outputs": 1,
- "x": 1082.6666412353516,
- "y": 397.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 1094.6666412353516,
+ "y": 441.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "259cc042.9d044"
+ "b1d9cd42.816"
]
]
},
{
- "id": "86fc17c4.fccda8",
+ "id": "4c9f2347.0813ec",
"type": "set",
"name": "set tmp.sdnc-model-version",
- "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n\n",
+ "xml": "<set>\n<parameter name='tmp.sdnc-model-version' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n",
"comments": "",
- "x": 1338.6666412353516,
- "y": 348.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 1350.6666412353516,
+ "y": 392.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "259cc042.9d044",
+ "id": "b1d9cd42.816",
"type": "set",
"name": "set tmp.sdnc-artifact-name",
"xml": "<set>\n<parameter name='tmp.sdnc-artifact-name' value='`$pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value`' />\n\n",
"comments": "",
- "x": 1334.6666412353516,
- "y": 397.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 1346.6666412353516,
+ "y": 441.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "11646aa2.a63495",
+ "id": "44b0c539.9ab1fc",
"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 + '"' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].name + '":"' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value + '",'`\"/>\n\n",
+ "xml": "<set>\n<parameter name=\"tmp.config-name-value-other-payload\" value=\"`$tmp.config-name-value-other-payload + '"' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].name + '":"' + $pnf-topology-operation-input.pnf-request-input.pnf-input-parameters.param[$i].value + '",'`\"/>\n",
"comments": "",
- "x": 1251.916648864746,
- "y": 448.83335041999817,
- "z": "b3572fdc.57a7c",
+ "x": 1263.916648864746,
+ "y": 492.83335041999817,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "3f7b410a.8138ce",
+ "id": "51becd83.b90354",
"type": "outcome",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1042.666648864746,
- "y": 446.9047546386719,
- "z": "b3572fdc.57a7c",
+ "x": 1054.666648864746,
+ "y": 490.9047546386719,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "11646aa2.a63495"
+ "44b0c539.9ab1fc"
]
]
},
{
- "id": "937d5326.69965",
+ "id": "11ca6e3a.745ed2",
"type": "set",
"name": "set configAssignment JsonString",
- "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '"service-instance-id":"' + $pnf-topology-operation-input.service-information.service-instance-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '"pnf-model-customization-uuid":"' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '"pnf-id":"' + $pnf-topology-operation-input.pnf-details.pnf-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $pnf-topology-operation-input.pnf-request-input.aic-cloud-region + '"'`\"/>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />",
+ "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '"service-instance-id":"' + $pnf-topology-operation-input.service-information.service-instance-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '"pnf-model-customization-uuid":"' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '"pnf-id":"' + $pnf-topology-operation-input.pnf-details.pnf-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $pnf-topology-operation-input.pnf-request-input.aic-cloud-region + '"'`\"/>\n",
"comments": "",
- "x": 455.66664123535156,
- "y": 689.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 478.6666564941406,
+ "y": 682.3333568572998,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "e221b302.f0199",
+ "id": "3087bf64.dce3e",
"type": "execute",
"name": "execute BlueprintProcessingClient",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/cds-processor-payload.json'`\" />\r\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\r\n <parameter name='restapiUser' value='`$prop.cds.user`' />\r\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r\n <parameter name='format' value='json' />\r\n <parameter name='httpMethod' value='POST' />\r\n <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />",
+ "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": 463.33331298828125,
- "y": 844,
- "z": "b3572fdc.57a7c",
+ "x": 475.33331298828125,
+ "y": 888,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "ca21c8f3.691628",
- "1cca5644.52e2da"
+ "d361485e.79ff28",
+ "8b7ec47b.a1ed38"
]
]
},
{
- "id": "ca21c8f3.691628",
+ "id": "d361485e.79ff28",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 703.3333129882812,
- "y": 818,
- "z": "b3572fdc.57a7c",
+ "x": 715.3333129882812,
+ "y": 862,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "cbb84843.6aa378"
+ "f00d65b.058a198"
]
]
},
{
- "id": "cbb84843.6aa378",
+ "id": "f00d65b.058a198",
"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": 885.3333129882812,
- "y": 839,
- "z": "b3572fdc.57a7c",
+ "x": 897.3333129882812,
+ "y": 883,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "2ad3fcee.93df44",
+ "id": "83f9cf68.29fa4",
"type": "for",
"name": "for resource-accumulator-resolved-data loop",
"xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 487.66664123535156,
- "y": 1061.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 499.66664123535156,
+ "y": 1105.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "2c3ea9bb.7f7946"
+ "326b7e58.3b8352"
]
]
},
{
- "id": "9d41528b.93ca8",
+ "id": "b2f73366.8118d",
"type": "set",
"name": "set from resource-accumulator-resolved-data",
"xml": "<set>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n",
"comments": "",
- "x": 1717.6666412353516,
- "y": 1113.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1729.6666412353516,
+ "y": 1157.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "3461757d.afec6a",
+ "id": "59d259e0.595458",
"type": "for",
"name": "for capability-data",
"xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 412.66664123535156,
- "y": 1403.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 424.66664123535156,
+ "y": 1447.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "d627a27f.2cb5b"
+ "abe63410.577b08"
]
]
},
{
- "id": "d627a27f.2cb5b",
+ "id": "abe63410.577b08",
"type": "for",
"name": "for key-mapping",
"xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >",
"comments": "",
"outputs": 1,
- "x": 621.6666412353516,
- "y": 1403.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 633.6666412353516,
+ "y": 1447.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "216ffe0c.205142"
+ "22c99553.60eefa"
]
]
},
{
- "id": "864aa7c9.1f7118",
+ "id": "3cae11e4.851bfe",
"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": 431.66664123535156,
- "y": 982.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 443.66664123535156,
+ "y": 1026.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[]
]
},
{
- "id": "1d7f791b.bbebb7",
+ "id": "ded0fa5f.1cc958",
"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.pnf-se-serv-uuid\" /> \n ",
"comments": "",
"outputs": 1,
- "x": 437.66664123535156,
- "y": 133.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 449.66664123535156,
+ "y": 177.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "760c8db3.569a74"
+ "18c0cf9e.15786"
]
]
},
{
- "id": "760c8db3.569a74",
+ "id": "18c0cf9e.15786",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 615.6666412353516,
- "y": 131.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 627.6666412353516,
+ "y": 175.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "7161cbe8.334ea4"
+ "3e720596.bd100a"
]
]
},
{
- "id": "7161cbe8.334ea4",
+ "id": "3e720596.bd100a",
"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": 762.6666412353516,
- "y": 132.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 774.6666412353516,
+ "y": 176.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "3ddac87b.4f3da8",
+ "id": "44191ec0.ea1e9",
"type": "for",
"name": "for pnf-parameters-data.param[]",
"xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 1460.6666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1472.6666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "20ea2728.c6c858"
+ "9c0ff949.cfd6d8"
]
]
},
{
- "id": "2c3ea9bb.7f7946",
+ "id": "326b7e58.3b8352",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 766.6666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 778.6666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "c9a47a5b.74ce78",
- "704f5605.ef2be8",
- "e738ca50.9bb188"
+ "2e3037b5.bead58",
+ "af1ab131.f6b7a",
+ "319ebff5.0b18b"
]
]
},
{
- "id": "dfab7c99.217af",
+ "id": "e804e40a.3348d8",
"type": "switchNode",
"name": "switch pnf-parameters-data.param_length",
"xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 489.66664123535156,
- "y": 231.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 501.66664123535156,
+ "y": 275.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "6b291f06.ba442",
- "d14aa673.b0f938"
+ "3011eef2.7f3872",
+ "abb635bf.35df38"
]
]
},
{
- "id": "6b291f06.ba442",
+ "id": "3011eef2.7f3872",
"type": "outcome",
"name": "null",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 727.6666412353516,
- "y": 199.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 739.6666412353516,
+ "y": 243.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "c7a81447.af0e28"
+ "a428765d.4325f8"
]
]
},
{
- "id": "d14aa673.b0f938",
+ "id": "abb635bf.35df38",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 726.6666412353516,
- "y": 263.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 738.6666412353516,
+ "y": 307.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "8406cee0.8a168"
+ "a82baf5c.81017"
]
]
},
{
- "id": "c7a81447.af0e28",
+ "id": "a428765d.4325f8",
"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": 940.6666412353516,
- "y": 199.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 952.6666412353516,
+ "y": 243.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "8406cee0.8a168",
+ "id": "a82baf5c.81017",
"type": "set",
"name": "set pre service param len",
"xml": "<set>\n <parameter name='highnum' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' />\n <parameter name='prehighnum' value='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' />",
"comments": "",
- "x": 925.6666412353516,
- "y": 263.3333339691162,
- "z": "b3572fdc.57a7c",
+ "x": 937.6666412353516,
+ "y": 307.3333339691162,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "20ea2728.c6c858",
+ "id": "9c0ff949.cfd6d8",
"type": "switchNode",
"name": "switch param[].name - input vs. jsonContextPrefix",
"xml": "<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n",
"comments": "",
"outputs": 1,
- "x": 1839.6666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1851.6666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "1f97b8fe.14f627"
+ "3d278d5e.539d72"
]
]
},
{
- "id": "1f97b8fe.14f627",
+ "id": "3d278d5e.539d72",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2123.6666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 2135.6666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "cfd1df65.8c421"
+ "780e9758.f7fea8"
]
]
},
{
- "id": "cfd1df65.8c421",
+ "id": "780e9758.f7fea8",
"type": "set",
"name": "set for existing param name",
"xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n",
"comments": "",
- "x": 2333.6666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 2345.6666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "e738ca50.9bb188",
+ "id": "319ebff5.0b18b",
"type": "switchNode",
"name": "switch tmp.mso.param.found",
"xml": "<switch test='`$tmp.mso.param.found`'>\n",
"comments": "",
"outputs": 1,
- "x": 1008.6666412353516,
- "y": 1114.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1020.6666412353516,
+ "y": 1158.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "5d54064f.f0a378"
+ "51c6e9e.96e2e18"
]
]
},
{
- "id": "5d54064f.f0a378",
+ "id": "51c6e9e.96e2e18",
"type": "not-found",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1242.6666412353516,
- "y": 1113.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1254.6666412353516,
+ "y": 1157.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "91cea0a0.32463"
+ "8a90fcb6.f7a9d"
]
]
},
{
- "id": "c9a47a5b.74ce78",
+ "id": "2e3037b5.bead58",
"type": "set",
"name": "set for existing param name",
"xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n",
"comments": "",
- "x": 990.1666412353516,
- "y": 1000.8333282470703,
- "z": "b3572fdc.57a7c",
+ "x": 1002.1666412353516,
+ "y": 1044.8333282470703,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "704f5605.ef2be8",
+ "id": "af1ab131.f6b7a",
"type": "switchNode",
"name": "switch check length > 0",
"xml": "<switch test='`$prehighnum > 0`'>\n",
"comments": "",
"outputs": 1,
- "x": 985.1666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 997.1666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "82f274ba.e58e48"
+ "a1472e40.a778d"
]
]
},
{
- "id": "82f274ba.e58e48",
+ "id": "a1472e40.a778d",
"type": "not-found",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1232.1666412353516,
- "y": 1062.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1244.1666412353516,
+ "y": 1106.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "3ddac87b.4f3da8"
+ "44191ec0.ea1e9"
]
]
},
{
- "id": "c2b9329e.7b7fe",
+ "id": "14c96642.2bd2ba",
"type": "for",
"name": "for payload",
"xml": "<for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >",
"comments": "",
"outputs": 1,
- "x": 1803.6666412353516,
- "y": 1421.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1815.6666412353516,
+ "y": 1465.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "1973b2f9.8576bd"
+ "75923618.437e88"
]
]
},
{
- "id": "9263a471.304a78",
+ "id": "8660981d.5c4d68",
"type": "set",
"name": "set resource-key",
"xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\n",
"comments": "",
- "x": 2152.6666412353516,
- "y": 1357.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 2164.6666412353516,
+ "y": 1401.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "bdc6e9e5.246078",
+ "id": "d0968145.fc2fe",
"type": "set",
"name": "set output-data ",
"xml": "<set>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />",
"comments": "",
- "x": 1376.6666412353516,
- "y": 1301.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1388.6666412353516,
+ "y": 1345.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "216ffe0c.205142",
+ "id": "22c99553.60eefa",
"type": "for",
"name": "for output-key-mapping",
"xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >",
"comments": "",
"outputs": 1,
- "x": 844.6666412353516,
- "y": 1403.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 856.6666412353516,
+ "y": 1447.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "d332f89d.5d7ed8"
+ "dc9f6311.0ad25"
]
]
},
{
- "id": "d332f89d.5d7ed8",
+ "id": "dc9f6311.0ad25",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1095.6666412353516,
- "y": 1403.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1107.6666412353516,
+ "y": 1447.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "bdc6e9e5.246078",
- "9a22b4d.28af748",
- "14d775fb.50189a",
- "d1982b17.6b7748"
+ "d0968145.fc2fe",
+ "aa6c039b.482f3",
+ "90cc12a2.1a5b1",
+ "d40d407c.44133"
]
]
},
{
- "id": "9a22b4d.28af748",
+ "id": "aa6c039b.482f3",
"type": "set",
"name": "set length",
"xml": "<set>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`' value='`$highnum + 1`'/>\n",
"comments": "",
- "x": 1364.6666412353516,
- "y": 1439.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1376.6666412353516,
+ "y": 1483.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "1cca5644.52e2da",
+ "id": "8b7ec47b.a1ed38",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 708.3333129882812,
- "y": 880,
- "z": "b3572fdc.57a7c",
+ "x": 720.3333129882812,
+ "y": 924,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "cbb84843.6aa378"
+ "f00d65b.058a198"
]
]
},
{
- "id": "14d775fb.50189a",
+ "id": "90cc12a2.1a5b1",
"type": "switchNode",
"name": "switch payload_length",
"xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n",
"comments": "",
"outputs": 1,
- "x": 1400.6666412353516,
- "y": 1372.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1412.6666412353516,
+ "y": 1416.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "abcb7f77.07548",
- "2376e062.61cda"
+ "666568c4.95c698",
+ "c52ff329.5425"
]
]
},
{
- "id": "abcb7f77.07548",
+ "id": "666568c4.95c698",
"type": "outcome",
"name": "true",
"xml": "<outcome value='true'>",
"comments": "",
"outputs": 1,
- "x": 1621.6666412353516,
- "y": 1303.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1633.6666412353516,
+ "y": 1347.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[]
]
},
{
- "id": "2376e062.61cda",
+ "id": "c52ff329.5425",
"type": "other",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1628.6666412353516,
- "y": 1421.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1640.6666412353516,
+ "y": 1465.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "c2b9329e.7b7fe"
+ "14c96642.2bd2ba"
]
]
},
{
- "id": "8b4b4f46.8310f",
+ "id": "c4b3e20a.976c9",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1171.9523658752441,
- "y": 618.9046821594238,
- "z": "b3572fdc.57a7c",
+ "x": 1183.9523658752441,
+ "y": 662.9046821594238,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "d8999389.3a4ec"
+ "c69ac6a5.a782c8"
]
]
},
{
- "id": "6b7f75ff.e599ec",
+ "id": "f3c41dd.4705be",
"type": "set",
"name": "set length",
"xml": "<set>\n\t<parameter name='`service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n",
"comments": "",
- "x": 2141.6666412353516,
- "y": 1421.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 2153.6666412353516,
+ "y": 1465.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "adccc85e.eca3a8",
+ "id": "a26d3950.c7a1e8",
"type": "set",
"name": "increment length",
"xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n",
"comments": "",
- "x": 2159.6666412353516,
- "y": 1495.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 2171.6666412353516,
+ "y": 1539.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "d1982b17.6b7748",
+ "id": "d40d407c.44133",
"type": "set",
"name": "increment length",
"xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n\n",
"comments": "",
- "x": 1385.6666412353516,
- "y": 1506.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1397.6666412353516,
+ "y": 1550.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "91cea0a0.32463",
+ "id": "8a90fcb6.f7a9d",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic='true'>",
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1419.6666412353516,
- "y": 1112.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1431.6666412353516,
+ "y": 1156.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "9d41528b.93ca8",
- "2b6854a1.91680c"
+ "b2f73366.8118d",
+ "e0efad2.feb625"
]
]
},
{
- "id": "2b6854a1.91680c",
+ "id": "e0efad2.feb625",
"type": "set",
"name": "increment length",
"xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n",
"comments": "",
- "x": 1634.6666412353516,
- "y": 1172.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1646.6666412353516,
+ "y": 1216.333324432373,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "1973b2f9.8576bd",
+ "id": "75923618.437e88",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1959.6666412353516,
- "y": 1422.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 1971.6666412353516,
+ "y": 1466.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[
- "9263a471.304a78",
- "6b7f75ff.e599ec",
- "adccc85e.eca3a8"
+ "8660981d.5c4d68",
+ "f3c41dd.4705be",
+ "a26d3950.c7a1e8"
]
]
},
{
- "id": "b7b3409c.b7131",
+ "id": "7696cfe3.25742",
"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": 385.9999809265137,
- "y": 765.333324432373,
- "z": "b3572fdc.57a7c",
+ "x": 397.9999809265137,
+ "y": 809.333324432373,
+ "z": "cfe922a8.7a91",
"wires": [
[]
]
},
{
- "id": "cb318b66.0796c8",
+ "id": "906be4e1.f2f3b8",
"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": 382.6666488647461,
- "y": 920.3333320617676,
- "z": "b3572fdc.57a7c",
+ "x": 394.6666488647461,
+ "y": 964.3333320617676,
+ "z": "cfe922a8.7a91",
"wires": [
[]
]
},
{
- "id": "94bf3501.be3848",
+ "id": "7eebfe0.8659a04",
"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": 391.00000762939453,
- "y": 1724.5000267028809,
- "z": "b3572fdc.57a7c",
+ "x": 403.00000762939453,
+ "y": 1768.5000267028809,
+ "z": "cfe922a8.7a91",
"wires": [
[]
]
},
{
- "id": "3d6976b6.27f80a",
+ "id": "59d1a840.b9e3b8",
"type": "set",
"name": "set pathname",
"xml": "<set>\n<parameter name='pathname' \n\tvalue=\"`'/var/tmp/ss-pnf-ra-assignment-' + \n\t$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-details.pnf-id + '.log'`\" />\n",
"comments": "",
- "x": 397.25000762939453,
- "y": 1672.0000247955322,
- "z": "b3572fdc.57a7c",
+ "x": 409.25000762939453,
+ "y": 1716.0000247955322,
+ "z": "cfe922a8.7a91",
"wires": []
},
{
- "id": "a566a00c.4994a",
+ "id": "9f59e925.e7ed18",
"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: pnf-ra-assignment\"/>\n\n",
"comments": "",
"outputs": 1,
- "x": 374.75000381469727,
- "y": 1625.7500247955322,
- "z": "b3572fdc.57a7c",
+ "x": 386.75000381469727,
+ "y": 1669.7500247955322,
+ "z": "cfe922a8.7a91",
"wires": [
[]
]
+ },
+ {
+ "id": "c4d5f704.d66b18",
+ "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.template-prefix'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />",
+ "comments": "",
+ "x": 451.00003814697266,
+ "y": 732.3333587646484,
+ "z": "cfe922a8.7a91",
+ "wires": []
}
]
\ 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 5d4d6e05..74bd7b78 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,20 +1,20 @@ [ { - "id": "62b4ac2.a95e9d4", + "id": "eef285aa.adcf08", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 103, - "y": 69, - "z": "25457e3a.564dda", + "x": 112, + "y": 56, + "z": "37ca9f86.ffaea", "wires": [ [ - "391f2cc4.ebd754" + "7fa82770.3d11a8" ] ] }, { - "id": "391f2cc4.ebd754", + "id": "7fa82770.3d11a8", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1152 +22,1164 @@ "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": 379, - "y": 70, - "z": "25457e3a.564dda", + "x": 388, + "y": 57, + "z": "37ca9f86.ffaea", "wires": [ [ - "90a983eb.65fd9" + "4815508b.fe2d3" ] ] }, { - "id": "90a983eb.65fd9", + "id": "4815508b.fe2d3", "type": "method", "name": "self-serve-vfmodule-ra-assignment", "xml": "<method rpc='self-serve-vfmodule-ra-assignment' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 730, - "y": 70, - "z": "25457e3a.564dda", + "x": 739, + "y": 57, + "z": "37ca9f86.ffaea", "wires": [ [ - "f81932d4.e701e" + "8883fb88.18b918" ] ] }, { - "id": "f81932d4.e701e", + "id": "8883fb88.18b918", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 115.5, - "y": 152, - "z": "25457e3a.564dda", + "x": 124.5, + "y": 139, + "z": "37ca9f86.ffaea", "wires": [ [ - "15b6f898.c038a7", - "75ce745c.c90274", - "2178fdaa.9f4722", - "41638aa2.6a574c", - "7f7fcb9e.5c0444", - "eb354f8e.b9f91", - "b3fed148.ab4d6", - "82beaa2.c0b24d8", - "5224ef9f.f95998", - "f02efea4.67e1a8", - "fc28f089.d04e38", - "a7a9673d.8c8648", - "6f10c8a6.d01ab", - "f4313dca.a2ef98", - "6ddd33ca.15d1fc" + "b71ab664.30d0b8", + "664b49d9.a8ed68", + "b69a7caa.2ef72", + "fd0f0fe.b870bf", + "4556977.80dab68", + "f4d2dad9.651818", + "c1dc247a.f59bd8", + "1584a1f4.77616e", + "d7fdb480.d92b28", + "34d4733f.ad277c", + "1f798081.68b1ef", + "860049fc.959878", + "53829451.b6abdc", + "f39abee0.7b55a", + "5ee34dfd.0df884", + "a487406b.42d53" ] ] }, { - "id": "75ce745c.c90274", + "id": "664b49d9.a8ed68", "type": "set", "name": "set", - "xml": "<set>\n <parameter name=\"request-id\" 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=\"resource-id\" value=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\" /> \n <parameter name=\"action-name\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n", + "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": 300, - "y": 198, - "z": "25457e3a.564dda", + "x": 309, + "y": 185, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "730e137.b92b2ec", + "id": "f8be6bf3.459048", "type": "outcome", "name": "true", "xml": "<outcome value='true'>", "comments": "", "outputs": 1, - "x": 576.2142486572266, - "y": 550.4642963409424, - "z": "25457e3a.564dda", + "x": 585.2142486572266, + "y": 537.4642963409424, + "z": "37ca9f86.ffaea", "wires": [ [ - "69655b75.0e578c" + "70a816d3.209488" ] ] }, { - "id": "41638aa2.6a574c", + "id": "fd0f0fe.b870bf", "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": 399.71431732177734, - "y": 415.7143135070801, - "z": "25457e3a.564dda", + "x": 408.71431732177734, + "y": 402.7143135070801, + "z": "37ca9f86.ffaea", "wires": [ [ - "f207181d.dc00e8" + "43cc66c7.9e4908" ] ] }, { - "id": "984d45d2.2050e8", + "id": "48b337df.0e22f8", "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": 1146.428565979004, - "y": 348.1428813934326, - "z": "25457e3a.564dda", + "x": 1155.428565979004, + "y": 335.1428813934326, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "a40d4738.46ee6", + "id": "31ed0071.fe8b9", "type": "outcome", "name": "sdnc_model_name", "xml": "<outcome value='sdnc_model_name'>\n", "comments": "", "outputs": 1, - "x": 892.4285659790039, - "y": 348.1428813934326, - "z": "25457e3a.564dda", + "x": 901.4285659790039, + "y": 335.1428813934326, + "z": "37ca9f86.ffaea", "wires": [ [ - "984d45d2.2050e8" + "48b337df.0e22f8" ] ] }, { - "id": "f207181d.dc00e8", + "id": "43cc66c7.9e4908", "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": 654.4285659790039, - "y": 415.1428813934326, - "z": "25457e3a.564dda", + "x": 663.4285659790039, + "y": 402.1428813934326, + "z": "37ca9f86.ffaea", "wires": [ [ - "a40d4738.46ee6", - "6b0ee766.140a", - "88e9a62a.e66e", - "21483ce9.b05d14" + "31ed0071.fe8b9", + "44279893.74a9d8", + "67bd2926.b30418", + "a154fcf0.3dc44" ] ] }, { - "id": "6b0ee766.140a", + "id": "44279893.74a9d8", "type": "outcome", "name": "sdnc_model_version", "xml": "<outcome value='sdnc_model_version'>\n", "comments": "", "outputs": 1, - "x": 895.4285659790039, - "y": 394.1428813934326, - "z": "25457e3a.564dda", + "x": 904.4285659790039, + "y": 381.1428813934326, + "z": "37ca9f86.ffaea", "wires": [ [ - "88addd0a.9ca868" + "cf17488c.4f8388" ] ] }, { - "id": "88e9a62a.e66e", + "id": "67bd2926.b30418", "type": "outcome", "name": "vf_module_label", "xml": "<outcome value='vf_module_label'>\n", "comments": "", "outputs": 1, - "x": 880.4285659790039, - "y": 443.1428813934326, - "z": "25457e3a.564dda", + "x": 889.4285659790039, + "y": 430.1428813934326, + "z": "37ca9f86.ffaea", "wires": [ [ - "b46339a.f490748" + "c0c56190.d3b15" ] ] }, { - "id": "88addd0a.9ca868", + "id": "cf17488c.4f8388", "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": 1150.428565979004, - "y": 394.1428813934326, - "z": "25457e3a.564dda", + "x": 1159.428565979004, + "y": 381.1428813934326, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "b46339a.f490748", + "id": "c0c56190.d3b15", "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": 1132.428565979004, - "y": 443.1428813934326, - "z": "25457e3a.564dda", + "x": 1141.428565979004, + "y": 430.1428813934326, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "7a186b3.6673414", + "id": "e897fa08.d5bf28", "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 + '"' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name + '":"' + $vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value + '",'`\"/>\n\n", "comments": "", - "x": 1150.428565979004, - "y": 494.1428813934326, - "z": "25457e3a.564dda", + "x": 1159.428565979004, + "y": 481.1428813934326, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "21483ce9.b05d14", + "id": "a154fcf0.3dc44", "type": "outcome", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 852.4285659790039, - "y": 494.1428813934326, - "z": "25457e3a.564dda", + "x": 861.4285659790039, + "y": 481.1428813934326, + "z": "37ca9f86.ffaea", "wires": [ [ - "7a186b3.6673414" + "e897fa08.d5bf28" ] ] }, { - "id": "7f7fcb9e.5c0444", + "id": "4556977.80dab68", "type": "set", "name": "set configAssignment JsonString", - "xml": "<set>\n\t<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '"service-instance-id":"' + $vf-module-topology-operation-input.service-information.service-instance-id + '",'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '"vnf-id":"' + $vf-module-topology-operation-input.vnf-information.vnf-id + '",'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '"vf-module-model-customization-uuid":"' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '",'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '"vnf-model-customization-uuid":"' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '",'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '"vf-module-id":"' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '",'`\"/>\n\t<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '"aic-cloud-region":"' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '"'`\"/>\n\t<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload9 + '}'`\" />\n\t\n", + "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '"service-instance-id":"' + $vf-module-topology-operation-input.service-information.service-instance-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '"vnf-id":"' + $vf-module-topology-operation-input.vnf-information.vnf-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '"vf-module-model-customization-uuid":"' + $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '"vnf-model-customization-uuid":"' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload8\" value=\"`$tmp.config-name-value-payload7 + '"vf-module-id":"' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload9\" value=\"`$tmp.config-name-value-payload8 + '"aic-cloud-region":"' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '"'`\"/>", "comments": "", - "x": 371, - "y": 708, - "z": "25457e3a.564dda", + "x": 395.0000190734863, + "y": 651, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "eb354f8e.b9f91", + "id": "f4d2dad9.651818", "type": "execute", "name": "execute BlueprintProcessingClient", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/cds-processor-payload.json'`\" />\r\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\r\n <parameter name='restapiUser' value='`$prop.cds.user`' />\r\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r\n <parameter name='format' value='json' />\r\n <parameter name='httpMethod' value='POST' />\r\n <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />", + "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": 385.33331298828125, - "y": 885, - "z": "25457e3a.564dda", + "x": 397.3333435058594, + "y": 869.000057220459, + "z": "37ca9f86.ffaea", "wires": [ [ - "5c78e84c.ba8ec", - "27108109.bca146" + "8233e320.47afe", + "6398d565.0d7bec" ] ] }, { - "id": "5c78e84c.ba8ec", + "id": "8233e320.47afe", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 609.3333129882812, - "y": 851, - "z": "25457e3a.564dda", + "x": 618.3333129882812, + "y": 838, + "z": "37ca9f86.ffaea", "wires": [ [ - "37ca0be9.afa37c" + "ad5923cd.d6bbb" ] ] }, { - "id": "37ca0be9.afa37c", + "id": "ad5923cd.d6bbb", "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": 807.3333129882812, - "y": 851, - "z": "25457e3a.564dda", + "x": 816.3333129882812, + "y": 838, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "82beaa2.c0b24d8", + "id": "1584a1f4.77616e", "type": "for", "name": "for resource-accumulator-resolved-data loop", "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n", "comments": "", "outputs": 1, - "x": 418.00001525878906, - "y": 1153.3333473205566, - "z": "25457e3a.564dda", + "x": 427.00001525878906, + "y": 1140.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "371f7985.57bd16" + "a0dff41d.c5f6f8" ] ] }, { - "id": "ea488b64.0cb308", + "id": "b1915485.d1a248", "type": "set", "name": "set from resource-accumulator-resolved-data", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n\n", "comments": "", - "x": 1632.000015258789, - "y": 1204.3333473205566, - "z": "25457e3a.564dda", + "x": 1641.000015258789, + "y": 1191.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "5224ef9f.f95998", + "id": "d7fdb480.d92b28", "type": "for", "name": "for capability-data", "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n", "comments": "", "outputs": 1, - "x": 337.00001525878906, - "y": 1416.3333473205566, - "z": "25457e3a.564dda", + "x": 346.00001525878906, + "y": 1403.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "180834f4.0223fb" + "57177866.272cc8" ] ] }, { - "id": "180834f4.0223fb", + "id": "57177866.272cc8", "type": "for", "name": "for key-mapping", "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >", "comments": "", "outputs": 1, - "x": 560.0000152587891, - "y": 1416.3333473205566, - "z": "25457e3a.564dda", + "x": 569.0000152587891, + "y": 1403.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "90054e48.e44a1" + "c093b4a1.367fc8" ] ] }, { - "id": "b3fed148.ab4d6", + "id": "c1dc247a.f59bd8", "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": 362.00001525878906, - "y": 1074.3333473205566, - "z": "25457e3a.564dda", + "x": 371.00001525878906, + "y": 1061.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [] ] }, { - "id": "15b6f898.c038a7", + "id": "b71ab664.30d0b8", "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": 345, - "y": 152, - "z": "25457e3a.564dda", + "x": 354, + "y": 139, + "z": "37ca9f86.ffaea", "wires": [ [ - "7e9fde22.d0f5" + "f5981e01.60fd2" ] ] }, { - "id": "7e9fde22.d0f5", + "id": "f5981e01.60fd2", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 550, - "y": 152, - "z": "25457e3a.564dda", + "x": 559, + "y": 139, + "z": "37ca9f86.ffaea", "wires": [ [ - "1e729d78.2afb63" + "3c5c1bf8.51e694" ] ] }, { - "id": "1e729d78.2afb63", + "id": "3c5c1bf8.51e694", "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": 714, - "y": 151, - "z": "25457e3a.564dda", + "x": 723, + "y": 138, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "921c6908.5a7c6", + "id": "cde17ef3.62e96", "type": "for", "name": "for vnf-parameters-data.param", "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n", "comments": "", "outputs": 1, - "x": 1391.000015258789, - "y": 1153.3333473205566, - "z": "25457e3a.564dda", + "x": 1400.000015258789, + "y": 1140.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "4ba8e978.428598" + "ee7f99cb.ec6478" ] ] }, { - "id": "371f7985.57bd16", + "id": "a0dff41d.c5f6f8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">", "atomic": "false", "comments": "", "outputs": 1, - "x": 697.0000152587891, - "y": 1154.3333473205566, - "z": "25457e3a.564dda", + "x": 706.0000152587891, + "y": 1141.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "daec1228.174c78", - "11c1115b.0b9dcf", - "b6fa1afb.0b0068" + "5ba2a252.918fcc", + "9de1e4b8.140328", + "8d20aa37.3155b8" ] ] }, { - "id": "2178fdaa.9f4722", + "id": "b69a7caa.2ef72", "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": 417, - "y": 253, - "z": "25457e3a.564dda", + "x": 426, + "y": 240, + "z": "37ca9f86.ffaea", "wires": [ [ - "2f8ba0ac.8cb83", - "585f5e92.feaf28" + "4afc6166.7a666", + "82ad191e.542718" ] ] }, { - "id": "2f8ba0ac.8cb83", + "id": "4afc6166.7a666", "type": "outcome", "name": "null", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 680.1428833007812, - "y": 220.85715293884277, - "z": "25457e3a.564dda", + "x": 689.1428833007812, + "y": 207.85715293884277, + "z": "37ca9f86.ffaea", "wires": [ [ - "95452a78.4cd6e8" + "efd0848b.dde0a8" ] ] }, { - "id": "585f5e92.feaf28", + "id": "82ad191e.542718", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 679.1428833007812, - "y": 284.8571529388428, - "z": "25457e3a.564dda", + "x": 688.1428833007812, + "y": 271.8571529388428, + "z": "37ca9f86.ffaea", "wires": [ [ - "274ba7d4.2752e" + "f848b2f3.3c79" ] ] }, { - "id": "95452a78.4cd6e8", + "id": "efd0848b.dde0a8", "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": 893.1428833007812, - "y": 220.85715293884277, - "z": "25457e3a.564dda", + "x": 902.1428833007812, + "y": 207.85715293884277, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "274ba7d4.2752e", + "id": "f848b2f3.3c79", "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": 878.1428833007812, - "y": 284.8571529388428, - "z": "25457e3a.564dda", + "x": 887.1428833007812, + "y": 271.8571529388428, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "4ba8e978.428598", + "id": "ee7f99cb.ec6478", "type": "switchNode", "name": "switch input vnf-name", "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n", "comments": "", "outputs": 1, - "x": 1649.000015258789, - "y": 1153.3333473205566, - "z": "25457e3a.564dda", + "x": 1658.000015258789, + "y": 1140.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "51567492.7ec0ac" + "9cff4b27.b85b38" ] ] }, { - "id": "51567492.7ec0ac", + "id": "9cff4b27.b85b38", "type": "not-found", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1829.000015258789, - "y": 1153.3333473205566, - "z": "25457e3a.564dda", + "x": 1838.000015258789, + "y": 1140.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "c1a41bbc.f5855" + "c0fb05df.380d78" ] ] }, { - "id": "c1a41bbc.f5855", + "id": "c0fb05df.380d78", "type": "set", "name": "set for existing param name", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n", "comments": "", - "x": 2039.000015258789, - "y": 1154.3333473205566, - "z": "25457e3a.564dda", + "x": 2048.000015258789, + "y": 1141.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "b6fa1afb.0b0068", + "id": "8d20aa37.3155b8", "type": "switchNode", "name": "switch tmp.mso.param.not-found", "xml": "<switch test='`$tmp.mso.param.found`'>\n", "comments": "", "outputs": 1, - "x": 939.0000152587891, - "y": 1206.3333473205566, - "z": "25457e3a.564dda", + "x": 948.0000152587891, + "y": 1193.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "13042a91.1fbf7d" + "1c10cd2a.821413" ] ] }, { - "id": "13042a91.1fbf7d", + "id": "1c10cd2a.821413", "type": "not-found", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1173.000015258789, - "y": 1205.3333473205566, - "z": "25457e3a.564dda", + "x": 1182.000015258789, + "y": 1192.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "c99ccd6c.b70598" + "99896231.f8f2a" ] ] }, { - "id": "daec1228.174c78", + "id": "5ba2a252.918fcc", "type": "set", "name": "set for existing param name", "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n", "comments": "", - "x": 923.0000152587891, - "y": 1095.3333473205566, - "z": "25457e3a.564dda", + "x": 932.0000152587891, + "y": 1082.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "11c1115b.0b9dcf", + "id": "9de1e4b8.140328", "type": "switchNode", "name": "switch check length > 0", "xml": "<switch test='`$prehighnum > 0`'>\n", "comments": "", "outputs": 1, - "x": 915.5000152587891, - "y": 1154.3333473205566, - "z": "25457e3a.564dda", + "x": 924.5000152587891, + "y": 1141.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "13d6175.5719969" + "9213bfe0.b1c2f" ] ] }, { - "id": "13d6175.5719969", + "id": "9213bfe0.b1c2f", "type": "not-found", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1162.500015258789, - "y": 1154.3333473205566, - "z": "25457e3a.564dda", + "x": 1171.500015258789, + "y": 1141.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "921c6908.5a7c6" + "cde17ef3.62e96" ] ] }, { - "id": "402f5e16.17318", + "id": "2ccc2373.2f411c", "type": "for", "name": "for payload", "xml": "<for index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >", "comments": "", "outputs": 1, - "x": 1609.000015258789, - "y": 1468.3333473205566, - "z": "25457e3a.564dda", + "x": 1618.000015258789, + "y": 1455.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "5766e1da.218b68" + "f1daaf1.ffce15" ] ] }, { - "id": "462cc35.3e8b9bc", + "id": "44960d5c.3364a4", "type": "set", "name": "set resource-key", "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\t\n", "comments": "", - "x": 2008.000015258789, - "y": 1409.3333473205566, - "z": "25457e3a.564dda", + "x": 2017.000015258789, + "y": 1396.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "ae8db4d3.4b4a48", + "id": "53d49382.5b17ac", "type": "set", "name": "set output-data ", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />", "comments": "", - "x": 1187.000015258789, - "y": 1370.3333473205566, - "z": "25457e3a.564dda", + "x": 1196.000015258789, + "y": 1357.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "90054e48.e44a1", + "id": "c093b4a1.367fc8", "type": "for", "name": "for output-key-mapping", "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >", "comments": "", "outputs": 1, - "x": 795.0000152587891, - "y": 1417.3333473205566, - "z": "25457e3a.564dda", + "x": 804.0000152587891, + "y": 1404.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "5a70cf94.1278d8" + "556a862d.ca6cc8" ] ] }, { - "id": "5a70cf94.1278d8", + "id": "556a862d.ca6cc8", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">", "atomic": "false", "comments": "", "outputs": 1, - "x": 990.0000152587891, - "y": 1416.3333473205566, - "z": "25457e3a.564dda", + "x": 999.0000152587891, + "y": 1403.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "ae8db4d3.4b4a48", - "914a95fd.27e4", - "74ac5a29.666eac", - "5d5538e1.f0339" + "53d49382.5b17ac", + "d10a9ec.6fa016", + "1edc412b.57e08f", + "fb512106.96832" ] ] }, { - "id": "74ac5a29.666eac", + "id": "1edc412b.57e08f", "type": "set", "name": "set length", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' value='`$highnum + 1`'/>\n\n", "comments": "", - "x": 1186.000015258789, - "y": 1468.3333473205566, - "z": "25457e3a.564dda", + "x": 1195.000015258789, + "y": 1455.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "27108109.bca146", + "id": "6398d565.0d7bec", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 614.3333129882812, - "y": 913, - "z": "25457e3a.564dda", + "x": 623.3333129882812, + "y": 900, + "z": "37ca9f86.ffaea", "wires": [ [ - "37ca0be9.afa37c" + "ad5923cd.d6bbb" ] ] }, { - "id": "914a95fd.27e4", + "id": "d10a9ec.6fa016", "type": "switchNode", "name": "switch payload_length", "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n", "comments": "", "outputs": 1, - "x": 1216.000015258789, - "y": 1417.3333473205566, - "z": "25457e3a.564dda", + "x": 1225.000015258789, + "y": 1404.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "e7579cfd.79cf", - "53b912f8.bc8e44" + "4ee4b348.8656dc", + "e4f53748.a116e8" ] ] }, { - "id": "e7579cfd.79cf", + "id": "4ee4b348.8656dc", "type": "outcome", "name": "true", "xml": "<outcome value='true'>", "comments": "", "outputs": 1, - "x": 1431.000015258789, - "y": 1349.3333473205566, - "z": "25457e3a.564dda", + "x": 1440.000015258789, + "y": 1336.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [] ] }, { - "id": "53b912f8.bc8e44", + "id": "e4f53748.a116e8", "type": "other", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1440.000015258789, - "y": 1468.3333473205566, - "z": "25457e3a.564dda", + "x": 1449.000015258789, + "y": 1455.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "402f5e16.17318" + "2ccc2373.2f411c" ] ] }, { - "id": "f02efea4.67e1a8", + "id": "34d4733f.ad277c", "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": 364.78570556640625, - "y": 550.6071863174438, - "z": "25457e3a.564dda", + "x": 373.78570556640625, + "y": 537.6071863174438, + "z": "37ca9f86.ffaea", "wires": [ [ - "730e137.b92b2ec" + "f8be6bf3.459048" ] ] }, { - "id": "210411fd.9339ae", + "id": "2dcbecbb.bef464", "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": 1042.9285354614258, - "y": 551.464297413826, - "z": "25457e3a.564dda", + "x": 1051.9285354614258, + "y": 538.464297413826, + "z": "37ca9f86.ffaea", "wires": [ [ - "1dda43f0.78a6ec", - "17ee1b83.1900bc", - "436821fa.6b6638" + "6d48236.8c58cdc", + "77c0ba75.bf78b4", + "3eefac05.6098c4" ] ] }, { - "id": "1dda43f0.78a6ec", + "id": "6d48236.8c58cdc", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1286.1427536010742, - "y": 551.8451566696167, - "z": "25457e3a.564dda", + "x": 1295.1427536010742, + "y": 538.8451566696167, + "z": "37ca9f86.ffaea", "wires": [ [ - "13103a3.51f8ec6" + "b60c82bc.a0482" ] ] }, { - "id": "13103a3.51f8ec6", + "id": "b60c82bc.a0482", "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": 1467.142734527588, - "y": 551.9880638122559, - "z": "25457e3a.564dda", + "x": 1476.142734527588, + "y": 538.9880638122559, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "dc45b20d.a2471", + "id": "691f618d.9d0b7", "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": 1064.380874633789, - "y": 680.3095798492432, - "z": "25457e3a.564dda", + "x": 1073.380874633789, + "y": 667.3095798492432, + "z": "37ca9f86.ffaea", "wires": [ [ - "49f2443a.7a2f84", - "1553ab7a.9ccd2d", - "f60a2de7.b86a" + "7a3b7e53.0cbf9", + "21c1086d.e4f9e8", + "9b560159.d8c39" ] ] }, { - "id": "49f2443a.7a2f84", + "id": "7a3b7e53.0cbf9", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1343.1664581298828, - "y": 680.6904038190842, - "z": "25457e3a.564dda", + "x": 1352.1664581298828, + "y": 667.6904038190842, + "z": "37ca9f86.ffaea", "wires": [ [ - "696c0378.dceeec" + "e1cb3e60.4c427" ] ] }, { - "id": "696c0378.dceeec", + "id": "e1cb3e60.4c427", "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": 1518.166389465332, - "y": 680.8333042860031, - "z": "25457e3a.564dda", + "x": 1527.166389465332, + "y": 667.8333042860031, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "1553ab7a.9ccd2d", + "id": "21c1086d.e4f9e8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1353.3808822631836, - "y": 760.095287322998, - "z": "25457e3a.564dda", + "x": 1362.3808822631836, + "y": 747.095287322998, + "z": "37ca9f86.ffaea", "wires": [ [ - "2b1bf028.83d6c" + "3dd958.a42046a8" ] ] }, { - "id": "69655b75.0e578c", + "id": "70a816d3.209488", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 751.7380294799805, - "y": 550.8452922105789, - "z": "25457e3a.564dda", + "x": 760.7380294799805, + "y": 537.8452922105789, + "z": "37ca9f86.ffaea", "wires": [ [ - "210411fd.9339ae", - "dc45b20d.a2471" + "2dcbecbb.bef464", + "691f618d.9d0b7" ] ] }, { - "id": "e9acfce8.8fe6e", + "id": "e3b84927.6478a8", "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": 1565.42866897583, - "y": 631.964334487915, - "z": "25457e3a.564dda", + "x": 1574.42866897583, + "y": 618.964334487915, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "17ee1b83.1900bc", + "id": "77c0ba75.bf78b4", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1294.0001411437988, - "y": 632.2500095367432, - "z": "25457e3a.564dda", + "x": 1303.0001411437988, + "y": 619.2500095367432, + "z": "37ca9f86.ffaea", "wires": [ [ - "e9acfce8.8fe6e" + "e3b84927.6478a8" ] ] }, { - "id": "2b1bf028.83d6c", + "id": "3dd958.a42046a8", "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": 1557.821434020996, - "y": 761.6786003112793, - "z": "25457e3a.564dda", + "x": 1566.821434020996, + "y": 748.6786003112793, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "5766e1da.218b68", + "id": "f1daaf1.ffce15", "type": "block", "name": "block : atomic", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 1786.000015258789, - "y": 1467.3333473205566, - "z": "25457e3a.564dda", + "x": 1795.000015258789, + "y": 1454.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "462cc35.3e8b9bc", - "8649e6f6.ce9d2", - "7fb45245.33dda4" + "44960d5c.3364a4", + "4b9e8979.c71658", + "bdf323e8.a11f4" ] ] }, { - "id": "8649e6f6.ce9d2", + "id": "4b9e8979.c71658", "type": "set", "name": "set length", "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n", "comments": "", - "x": 1997.000015258789, - "y": 1467.3333473205566, - "z": "25457e3a.564dda", + "x": 2006.000015258789, + "y": 1454.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "436821fa.6b6638", + "id": "3eefac05.6098c4", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1296.7500190734863, - "y": 591.5000076293945, - "z": "25457e3a.564dda", + "x": 1305.7500190734863, + "y": 578.5000076293945, + "z": "37ca9f86.ffaea", "wires": [ [ - "37a1e85c.528b7" + "8019c4ec.975338" ] ] }, { - "id": "37a1e85c.528b7", + "id": "8019c4ec.975338", "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": 1468.0000228881836, - "y": 590.2500085830688, - "z": "25457e3a.564dda", + "x": 1477.0000228881836, + "y": 577.2500085830688, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "f60a2de7.b86a", + "id": "9b560159.d8c39", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1354.25, - "y": 721.5, - "z": "25457e3a.564dda", + "x": 1363.25, + "y": 708.5, + "z": "37ca9f86.ffaea", "wires": [ [ - "94027915.4b59b" + "489b8367.0100dc" ] ] }, { - "id": "94027915.4b59b", + "id": "489b8367.0100dc", "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": 1525.5000038146973, - "y": 720.2500009536743, - "z": "25457e3a.564dda", + "x": 1534.5000038146973, + "y": 707.2500009536743, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "7fb45245.33dda4", + "id": "bdf323e8.a11f4", "type": "set", "name": "increment length", "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n", "comments": "", - "x": 2010.000015258789, - "y": 1533.3333473205566, - "z": "25457e3a.564dda", + "x": 2019.000015258789, + "y": 1520.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "5d5538e1.f0339", + "id": "fb512106.96832", "type": "set", "name": "increment length", "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n", "comments": "", - "x": 1203.000015258789, - "y": 1539.3333473205566, - "z": "25457e3a.564dda", + "x": 1212.000015258789, + "y": 1526.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "b8f5425b.1922c", + "id": "3d1f3402.e6765c", "type": "set", "name": "increment length", "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n", "comments": "", - "x": 1550.000015258789, - "y": 1264.3333473205566, - "z": "25457e3a.564dda", + "x": 1559.000015258789, + "y": 1251.3333473205566, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "c99ccd6c.b70598", + "id": "99896231.f8f2a", "type": "block", "name": "block : atomic", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 1344.000015258789, - "y": 1204.3333473205566, - "z": "25457e3a.564dda", + "x": 1353.000015258789, + "y": 1191.3333473205566, + "z": "37ca9f86.ffaea", "wires": [ [ - "ea488b64.0cb308", - "b8f5425b.1922c" + "b1915485.d1a248", + "3d1f3402.e6765c" ] ] }, { - "id": "fc28f089.d04e38", + "id": "1f798081.68b1ef", "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": 309.6666603088379, - "y": 814.0000104904175, - "z": "25457e3a.564dda", + "x": 318.6666603088379, + "y": 801.0000104904175, + "z": "37ca9f86.ffaea", "wires": [ [] ] }, { - "id": "a7a9673d.8c8648", + "id": "860049fc.959878", "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": 306.3333282470703, - "y": 969.000018119812, - "z": "25457e3a.564dda", + "x": 315.3333282470703, + "y": 956.000018119812, + "z": "37ca9f86.ffaea", "wires": [ [] ] }, { - "id": "f4313dca.a2ef98", + "id": "f39abee0.7b55a", "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": 319.25, - "y": 1691.5000133514404, - "z": "25457e3a.564dda", + "x": 328.25, + "y": 1678.5000133514404, + "z": "37ca9f86.ffaea", "wires": [ [] ] }, { - "id": "6f10c8a6.d01ab", + "id": "53829451.b6abdc", "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": 325.5, - "y": 1639.0000114440918, - "z": "25457e3a.564dda", + "x": 334.5, + "y": 1626.0000114440918, + "z": "37ca9f86.ffaea", "wires": [] }, { - "id": "6ddd33ca.15d1fc", + "id": "5ee34dfd.0df884", "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": 304.00000381469727, - "y": 1590.2500190734863, - "z": "25457e3a.564dda", + "x": 313.00000381469727, + "y": 1577.2500190734863, + "z": "37ca9f86.ffaea", "wires": [ [] ] + }, + { + "id": "a487406b.42d53", + "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.template-prefix'`\" value='`$tmp.sdnc-artifact-name`' />\n <parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />", + "comments": "", + "x": 369.0000228881836, + "y": 702.6667098999023, + "z": "37ca9f86.ffaea", + "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 4bede874..0cf5a8da 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,20 +1,20 @@ [ { - "id": "f7510939.737a28", + "id": "1264c6cd.930839", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 97, - "y": 66, - "z": "58e8fb6f.65cbf4", + "x": 101, + "y": 96, + "z": "4a0b2401.ec39ec", "wires": [ [ - "2fcf1979.35372e" + "cd72f82b.448a88" ] ] }, { - "id": "2fcf1979.35372e", + "id": "cd72f82b.448a88", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1053 +22,1065 @@ "comments": "", "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>", "outputs": 1, - "x": 373, - "y": 67, - "z": "58e8fb6f.65cbf4", + "x": 377, + "y": 97, + "z": "4a0b2401.ec39ec", "wires": [ [ - "bc76009d.4ebf28" + "1882c0cd.fac1af" ] ] }, { - "id": "bc76009d.4ebf28", + "id": "1882c0cd.fac1af", "type": "method", "name": "self-serve-vnf-ra-assignment", "xml": "<method rpc='self-serve-vnf-ra-assignment' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 690, - "y": 67, - "z": "58e8fb6f.65cbf4", + "x": 694, + "y": 97, + "z": "4a0b2401.ec39ec", "wires": [ [ - "5a6abd1c.325a84" + "5be6105f.ccbde" ] ] }, { - "id": "5a6abd1c.325a84", + "id": "5be6105f.ccbde", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 186.16664123535156, - "y": 147.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 190.16664123535156, + "y": 177.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "df3086f1.895f2", - "ea9193c.a6879f", - "33c58f5d.79c91", - "6787a8cd.55f73", - "a6a772e5.982a2", - "bd0c1c4e.597a5", - "91dde7fd.fe86a", - "a269720d.c1b3c", - "c497e61b.9d5da", - "5d2bdeb6.7712a", - "ff9121b8.95fe6", - "a656672e.be2f5", - "479d04c2.fc7acc", - "8048ec03.29272", - "c8325ee3.97b988" + "95e79859.795e68", + "9ad508ab.052518", + "3ac5cd34.2257f2", + "2edab5da.4808ea", + "f2aa029b.615de", + "10dc8417.707e0c", + "fd52ae4e.bd56c", + "c73b8162.24f6f", + "d29a4d92.8e7d9", + "84a90182.cf73", + "48b65c6e.618e44", + "80225cf4.2c8b2", + "a4083479.8e5dd8", + "638697ae.8d3678", + "2e936c1f.cb2bd4", + "546a230c.3e01dc" ] ] }, { - "id": "ea9193c.a6879f", + "id": "9ad508ab.052518", "type": "set", "name": "set", - "xml": "<set>\n <parameter name=\"request-id\" 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=\"resource-id\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" /> \n <parameter name=\"action-name\" value=\"resource-assignment\"/> \n <parameter name=\"responsePrefix\" value=\"raAssign\" />\n", + "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": 371.9166603088379, - "y": 192.08333015441895, - "z": "58e8fb6f.65cbf4", + "x": 375.9166603088379, + "y": 222.08333015441895, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "6b11523.8f254ac", + "id": "877ede4f.92e9b", "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": 910.8094635009766, - "y": 583.6189861297607, - "z": "58e8fb6f.65cbf4", + "x": 914.8094635009766, + "y": 613.6189861297607, + "z": "4a0b2401.ec39ec", "wires": [ [ - "5877f735.e57fd", - "7ba78ada.2fb134", - "bf519ef3.d251" + "8947e8ba.8b6c18", + "7bc2b258.538c7c", + "c5829c3f.f44d7" ] ] }, { - "id": "5877f735.e57fd", + "id": "8947e8ba.8b6c18", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1155.8095626831055, - "y": 532.904709815979, - "z": "58e8fb6f.65cbf4", + "x": 1159.8095626831055, + "y": 562.904709815979, + "z": "4a0b2401.ec39ec", "wires": [ [ - "f07c5725.aa61d" + "2b79a1d8.82461e" ] ] }, { - "id": "f07c5725.aa61d", + "id": "2b79a1d8.82461e", "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": 1328.8095626831055, - "y": 531.904709815979, - "z": "58e8fb6f.65cbf4", + "x": 1332.8095626831055, + "y": 561.904709815979, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "fbb3efb4.020878", + "id": "9a929dee.aae27", "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": 1531.2380638122559, - "y": 633.047513961792, - "z": "58e8fb6f.65cbf4", + "x": 1535.2380638122559, + "y": 663.047513961792, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "7d77945b.b872dc", + "id": "1f983518.26a63b", "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": 1330.8095626831055, - "y": 580.904709815979, - "z": "58e8fb6f.65cbf4", + "x": 1334.8095626831055, + "y": 610.904709815979, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "a6a772e5.982a2", + "id": "f2aa029b.615de", "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": 431.80946350097656, - "y": 584.6189861297607, - "z": "58e8fb6f.65cbf4", + "x": 435.80946350097656, + "y": 614.6189861297607, + "z": "4a0b2401.ec39ec", "wires": [ [ - "45517119.0e4e48" + "a0598bd4.bb2518" ] ] }, { - "id": "7ba78ada.2fb134", + "id": "7bc2b258.538c7c", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1161.8095626831055, - "y": 581.904709815979, - "z": "58e8fb6f.65cbf4", + "x": 1165.8095626831055, + "y": 611.904709815979, + "z": "4a0b2401.ec39ec", "wires": [ [ - "7d77945b.b872dc" + "1f983518.26a63b" ] ] }, { - "id": "45517119.0e4e48", + "id": "a0598bd4.bb2518", "type": "outcome", "name": "true", "xml": "<outcome value='true'>", "comments": "", "outputs": 1, - "x": 680.8094635009766, - "y": 584.6189861297607, - "z": "58e8fb6f.65cbf4", + "x": 684.8094635009766, + "y": 614.6189861297607, + "z": "4a0b2401.ec39ec", "wires": [ [ - "6b11523.8f254ac" + "877ede4f.92e9b" ] ] }, { - "id": "6787a8cd.55f73", + "id": "2edab5da.4808ea", "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": 447.66664123535156, - "y": 384.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 451.66664123535156, + "y": 414.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "df930bd3.0b7718" + "8e542e02.8473f" ] ] }, { - "id": "df930bd3.0b7718", + "id": "8e542e02.8473f", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">", "atomic": "false", "comments": "", "outputs": 1, - "x": 669.6666412353516, - "y": 383.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 673.6666412353516, + "y": 413.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "408427e4.b460e8" + "d470eb9a.687f98" ] ] }, { - "id": "e049960d.9cd738", + "id": "fb20cb1a.51a4b8", "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": 1320.6666412353516, - "y": 316.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1324.6666412353516, + "y": 346.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "16a8e775.3a66e1", + "id": "7c80301e.7f871", "type": "outcome", "name": "sdnc_model_name", "xml": "<outcome value='sdnc_model_name'>\n", "comments": "", "outputs": 1, - "x": 1066.6666412353516, - "y": 316.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1070.6666412353516, + "y": 346.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "e049960d.9cd738" + "fb20cb1a.51a4b8" ] ] }, { - "id": "408427e4.b460e8", + "id": "d470eb9a.687f98", "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": 828.6666412353516, - "y": 383.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 832.6666412353516, + "y": 413.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "16a8e775.3a66e1", - "6adfc9ab.cf61f", - "5d22c0ae.86e7a", - "45edf3cd.ba4db4" + "7c80301e.7f871", + "69dbd226.9264ec", + "87b3dbed.61a088", + "27ccfdc6.314a12" ] ] }, { - "id": "6adfc9ab.cf61f", + "id": "69dbd226.9264ec", "type": "outcome", "name": "sdnc_model_version", "xml": "<outcome value='sdnc_model_version'>\n", "comments": "", "outputs": 1, - "x": 1069.6666412353516, - "y": 362.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1073.6666412353516, + "y": 392.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "591cbcf1.5fb17c" + "74fadd31.036b54" ] ] }, { - "id": "5d22c0ae.86e7a", + "id": "87b3dbed.61a088", "type": "outcome", "name": "sdnc_artifact_name", "xml": "<outcome value='sdnc_artifact_name'>\n", "comments": "", "outputs": 1, - "x": 1068.6666412353516, - "y": 411.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1072.6666412353516, + "y": 441.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "122b59ca.cd367e" + "a7f5b067.57b29" ] ] }, { - "id": "591cbcf1.5fb17c", + "id": "74fadd31.036b54", "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": 1324.6666412353516, - "y": 362.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1328.6666412353516, + "y": 392.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "122b59ca.cd367e", + "id": "a7f5b067.57b29", "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": 1320.6666412353516, - "y": 411.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1324.6666412353516, + "y": 441.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "3f7c8176.d6b64e", + "id": "e803a56a.a7f258", "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 + '"' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].name + '":"' + $vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$i].value + '",'`\"/>\n\n", "comments": "", - "x": 1336.6666412353516, - "y": 460.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 1340.6666412353516, + "y": 490.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "45edf3cd.ba4db4", + "id": "27ccfdc6.314a12", "type": "outcome", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1028.666648864746, - "y": 460.9047546386719, - "z": "58e8fb6f.65cbf4", + "x": 1032.666648864746, + "y": 490.9047546386719, + "z": "4a0b2401.ec39ec", "wires": [ [ - "3f7c8176.d6b64e" + "e803a56a.a7f258" ] ] }, { - "id": "bd0c1c4e.597a5", + "id": "10dc8417.707e0c", "type": "set", "name": "set configAssignment JsonString", - "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '"service-instance-id":"' + $vnf-topology-operation-input.service-information.service-instance-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '"vnf-model-customization-uuid":"' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '"vnf-id":"' + $vnf-topology-operation-input.vnf-information.vnf-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '"'`\"/>\n<parameter name=\"tmp.json-payload\" value=\"`'{' + $tmp.config-name-value-payload7 + '}'`\" />", + "xml": "<set>\n<parameter name=\"tmp.config-name-value-payload4\" value=\"`$tmp.config-name-value-other-payload + '"service-instance-id":"' + $vnf-topology-operation-input.service-information.service-instance-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload5\" value=\"`$tmp.config-name-value-payload4 + '"vnf-model-customization-uuid":"' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload6\" value=\"`$tmp.config-name-value-payload5 + '"vnf-id":"' + $vnf-topology-operation-input.vnf-information.vnf-id + '",'`\"/>\n<parameter name=\"tmp.config-name-value-payload7\" value=\"`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '"'`\"/>\n", "comments": "", - "x": 441.66664123535156, - "y": 703.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 461.6666564941406, + "y": 685.3333568572998, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "91dde7fd.fe86a", + "id": "fd52ae4e.bd56c", "type": "execute", "name": "execute BlueprintProcessingClient", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\r\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/cds-processor-payload.json'`\" />\r\n <parameter name='restapiUrl' value=\"`$prop.cds.url + '/api/v1/execution-service/process'`\" />\r\n <parameter name='restapiUser' value='`$prop.cds.user`' />\r\n <parameter name='restapiPassword' value='`$prop.cds.pwd`' />\r\n <parameter name='format' value='json' />\r\n <parameter name='httpMethod' value='POST' />\r\n <parameter name=\"responsePrefix\" value=\"`$responsePrefix`\" />", + "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": 449.33331298828125, - "y": 858, - "z": "58e8fb6f.65cbf4", + "x": 453.33331298828125, + "y": 888, + "z": "4a0b2401.ec39ec", "wires": [ [ - "7b68efaf.314158", - "7211bbf0.b473fc" + "51cecb46.839514", + "d8c1b9cb.9f5348" ] ] }, { - "id": "7b68efaf.314158", + "id": "51cecb46.839514", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 689.3333129882812, - "y": 832, - "z": "58e8fb6f.65cbf4", + "x": 693.3333129882812, + "y": 862, + "z": "4a0b2401.ec39ec", "wires": [ [ - "e94b29ef.72631" + "5d166bf5.6d0624" ] ] }, { - "id": "e94b29ef.72631", + "id": "5d166bf5.6d0624", "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": 871.3333129882812, - "y": 853, - "z": "58e8fb6f.65cbf4", + "x": 875.3333129882812, + "y": 883, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "c497e61b.9d5da", + "id": "d29a4d92.8e7d9", "type": "for", "name": "for resource-accumulator-resolved-data loop", "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.resource-accumulator-resolved-data_length`' >\n", "comments": "", "outputs": 1, - "x": 473.66664123535156, - "y": 1075.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 477.66664123535156, + "y": 1105.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "a0e85ddc.4c617" + "fbbcea55.468248" ] ] }, { - "id": "e4968d42.952ee8", + "id": "9947d8c1.f7aff8", "type": "set", "name": "set from resource-accumulator-resolved-data", "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='RA Resolved'/>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='SUCCESS'/>\n", "comments": "", - "x": 1703.6666412353516, - "y": 1127.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1707.6666412353516, + "y": 1157.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "5d2bdeb6.7712a", + "id": "84a90182.cf73", "type": "for", "name": "for capability-data", "xml": "<for silentFailure='true' index='i' start='0' end='`$jsonContextPrefix.capability-data_length`' >\n", "comments": "", "outputs": 1, - "x": 398.66664123535156, - "y": 1417.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 402.66664123535156, + "y": 1447.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "59ba36cd.90352" + "fa102a2b.773698" ] ] }, { - "id": "59ba36cd.90352", + "id": "fa102a2b.773698", "type": "for", "name": "for key-mapping", "xml": "<for silentFailure='true' index='j' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping_length`' >", "comments": "", "outputs": 1, - "x": 607.6666412353516, - "y": 1417.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 611.6666412353516, + "y": 1447.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "c262587.ce01da8" + "420ba6ad.7d12f8" ] ] }, { - "id": "a269720d.c1b3c", + "id": "c73b8162.24f6f", "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": 417.66664123535156, - "y": 996.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 421.66664123535156, + "y": 1026.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [] ] }, { - "id": "df3086f1.895f2", + "id": "95e79859.795e68", "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": 423.66664123535156, - "y": 147.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 427.66664123535156, + "y": 177.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "7701fdb8.3f24cc" + "b2ef8bc8.f9b188" ] ] }, { - "id": "7701fdb8.3f24cc", + "id": "b2ef8bc8.f9b188", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 601.6666412353516, - "y": 145.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 605.6666412353516, + "y": 175.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "1d32ed0e.9e31f3" + "359040a9.7ab45" ] ] }, { - "id": "1d32ed0e.9e31f3", + "id": "359040a9.7ab45", "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": 748.6666412353516, - "y": 146.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 752.6666412353516, + "y": 176.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "c131d15b.1aef98", + "id": "2048f9bb.f2f736", "type": "for", "name": "for vnf-parameters-data.param", "xml": "<for silentFailure='true' index='cnt' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n", "comments": "", "outputs": 1, - "x": 1446.6666412353516, - "y": 1075.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1450.6666412353516, + "y": 1105.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "3c69fe77.c81ada" + "b6d977b7.115288" ] ] }, { - "id": "a0e85ddc.4c617", + "id": "fbbcea55.468248", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">", "atomic": "false", "comments": "", "outputs": 1, - "x": 752.6666412353516, - "y": 1076.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 756.6666412353516, + "y": 1106.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "c865c555.1438c8", - "69622bed.1e814c", - "8148c167.a33aa" + "4a737be7.870a34", + "20c5df3a.f6ffc", + "34f87842.282048" ] ] }, { - "id": "33c58f5d.79c91", + "id": "3ac5cd34.2257f2", "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": 475.66664123535156, - "y": 245.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 479.66664123535156, + "y": 275.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "80ce6f0d.c3a98", - "a0423db8.f01fe8" + "400017d.409bfe8", + "7d611aa7.76df04" ] ] }, { - "id": "80ce6f0d.c3a98", + "id": "400017d.409bfe8", "type": "outcome", "name": "null", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 713.6666412353516, - "y": 213.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 717.6666412353516, + "y": 243.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "99ca71f9.ca2008" + "27c026e8.fb154a" ] ] }, { - "id": "a0423db8.f01fe8", + "id": "7d611aa7.76df04", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 712.6666412353516, - "y": 277.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 716.6666412353516, + "y": 307.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [ [ - "d63b03e5.819148" + "3e29b95e.47e686" ] ] }, { - "id": "99ca71f9.ca2008", + "id": "27c026e8.fb154a", "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": 926.6666412353516, - "y": 213.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 930.6666412353516, + "y": 243.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "d63b03e5.819148", + "id": "3e29b95e.47e686", "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": 911.6666412353516, - "y": 277.3333339691162, - "z": "58e8fb6f.65cbf4", + "x": 915.6666412353516, + "y": 307.3333339691162, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "3c69fe77.c81ada", + "id": "b6d977b7.115288", "type": "switchNode", "name": "switch input vnf-name", "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].name == $jsonContextPrefix.resource-accumulator-resolved-data[$i].param-name`'>\n", "comments": "", "outputs": 1, - "x": 1704.6666412353516, - "y": 1075.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1708.6666412353516, + "y": 1105.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "f71f49f1.2930d" + "67c98419.11b03c" ] ] }, { - "id": "f71f49f1.2930d", + "id": "67c98419.11b03c", "type": "not-found", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1884.6666412353516, - "y": 1075.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1888.6666412353516, + "y": 1105.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "6f785c18.a5a264" + "c179b41f.2921e8" ] ] }, { - "id": "6f785c18.a5a264", + "id": "c179b41f.2921e8", "type": "set", "name": "set for existing param name", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$cnt].value`' value='`$jsonContextPrefix.resource-accumulator-resolved-data[$i].param-value`'/>\n<parameter name='tmp.mso.param.found' value='true' />\n", "comments": "", - "x": 2094.6666412353516, - "y": 1076.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 2098.6666412353516, + "y": 1106.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "8148c167.a33aa", + "id": "34f87842.282048", "type": "switchNode", "name": "switch tmp.mso.param.not-found", "xml": "<switch test='`$tmp.mso.param.found`'>\n", "comments": "", "outputs": 1, - "x": 994.6666412353516, - "y": 1128.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 998.6666412353516, + "y": 1158.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "43bd538.13b17ac" + "56f65a3d.bdecc4" ] ] }, { - "id": "43bd538.13b17ac", + "id": "56f65a3d.bdecc4", "type": "not-found", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1228.6666412353516, - "y": 1127.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1232.6666412353516, + "y": 1157.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "8e656d8f.2c0638" + "ecce6565.d1e898" ] ] }, { - "id": "c865c555.1438c8", + "id": "4a737be7.870a34", "type": "set", "name": "set for existing param name", "xml": "<set>\n<parameter name='tmp.mso.param.found' value='false' />\n", "comments": "", - "x": 978.6666412353516, - "y": 1017.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 982.6666412353516, + "y": 1047.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "69622bed.1e814c", + "id": "20c5df3a.f6ffc", "type": "switchNode", "name": "switch check length > 0", "xml": "<switch test='`$prehighnum > 0`'>\n", "comments": "", "outputs": 1, - "x": 971.1666412353516, - "y": 1076.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 975.1666412353516, + "y": 1106.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "d5b14a95.351558" + "278fa054.17f2" ] ] }, { - "id": "d5b14a95.351558", + "id": "278fa054.17f2", "type": "not-found", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1218.1666412353516, - "y": 1076.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1222.1666412353516, + "y": 1106.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "c131d15b.1aef98" + "2048f9bb.f2f736" ] ] }, { - "id": "530a0de5.6510fc", + "id": "910d6ed9.68335", "type": "for", "name": "for payload", "xml": "<for silentFailure='true' index='k' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length`' >", "comments": "", "outputs": 1, - "x": 1789.6666412353516, - "y": 1435.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1793.6666412353516, + "y": 1465.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "d780496.e20e538" + "451cb826.e55b18" ] ] }, { - "id": "39414253.4d201e", + "id": "ebc212fd.50c99", "type": "set", "name": "set resource-key", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key[$num].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload[$k].param-value`'/>\n\n", "comments": "", - "x": 2138.6666412353516, - "y": 1371.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 2142.6666412353516, + "y": 1401.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "79092629.a0057", + "id": "77f8b842.ce0bf8", "type": "set", "name": "set output-data ", "xml": "<set>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].name`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].value`' value='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping[$l].resource-value`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.capability-name`' value='`$jsonContextPrefix.capability-data[$i].capability-name`'/>\n<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.status`' value='PENDING'/>\n<parameter name='num' value='0' />", "comments": "", - "x": 1362.6666412353516, - "y": 1315.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1366.6666412353516, + "y": 1345.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "c262587.ce01da8", + "id": "420ba6ad.7d12f8", "type": "for", "name": "for output-key-mapping", "xml": "<for silentFailure='true' index='l' start='0' end='`$jsonContextPrefix.capability-data[$i].key-mapping[$j].output-key-mapping_length`' >", "comments": "", "outputs": 1, - "x": 830.6666412353516, - "y": 1417.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 834.6666412353516, + "y": 1447.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "a651056f.79b248" + "de871bca.269b28" ] ] }, { - "id": "a651056f.79b248", + "id": "de871bca.269b28", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">", "atomic": "false", "comments": "", "outputs": 1, - "x": 1081.6666412353516, - "y": 1417.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1085.6666412353516, + "y": 1447.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "79092629.a0057", - "5a379da9.df18dc", - "37a6c3e.3ad683c", - "3d8ba937.dbc0d6" + "77f8b842.ce0bf8", + "d1ce4892.013d98", + "435b327b.50848c", + "833f0238.99363" ] ] }, { - "id": "5a379da9.df18dc", + "id": "d1ce4892.013d98", "type": "set", "name": "set length", "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' value='`$highnum + 1`'/>\n", "comments": "", - "x": 1350.6666412353516, - "y": 1453.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1354.6666412353516, + "y": 1483.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "7211bbf0.b473fc", + "id": "d8c1b9cb.9f5348", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 694.3333129882812, - "y": 894, - "z": "58e8fb6f.65cbf4", + "x": 698.3333129882812, + "y": 924, + "z": "4a0b2401.ec39ec", "wires": [ [ - "e94b29ef.72631" + "5d166bf5.6d0624" ] ] }, { - "id": "37a6c3e.3ad683c", + "id": "435b327b.50848c", "type": "switchNode", "name": "switch payload_length", "xml": "<switch test=\"`$jsonContextPrefix.capability-data[$i].key-mapping[$j].payload_length == ''`\">\n", "comments": "", "outputs": 1, - "x": 1386.6666412353516, - "y": 1386.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1390.6666412353516, + "y": 1416.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "9c94dbb3.05da2", - "b6532788.a69bf8" + "a70ff081.a1c2e", + "cd6e211b.36062" ] ] }, { - "id": "9c94dbb3.05da2", + "id": "a70ff081.a1c2e", "type": "outcome", "name": "true", "xml": "<outcome value='true'>", "comments": "", "outputs": 1, - "x": 1607.6666412353516, - "y": 1317.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1611.6666412353516, + "y": 1347.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [] ] }, { - "id": "b6532788.a69bf8", + "id": "cd6e211b.36062", "type": "other", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1614.6666412353516, - "y": 1435.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1618.6666412353516, + "y": 1465.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "530a0de5.6510fc" + "910d6ed9.68335" ] ] }, { - "id": "bf519ef3.d251", + "id": "c5829c3f.f44d7", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1157.9523658752441, - "y": 632.9046821594238, - "z": "58e8fb6f.65cbf4", + "x": 1161.9523658752441, + "y": 662.9046821594238, + "z": "4a0b2401.ec39ec", "wires": [ [ - "fbb3efb4.020878" + "9a929dee.aae27" ] ] }, { - "id": "c6d0d2f9.dcf96", + "id": "7d1e7719.053288", "type": "set", "name": "set length", "xml": "<set>\n\t<parameter name='`service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$highnum].resource-resolution-data.resource-key_length`' value='`$num + 1`'/>\n", "comments": "", - "x": 2127.6666412353516, - "y": 1435.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 2131.6666412353516, + "y": 1465.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "8236fb65.2996b", + "id": "e4fba5aa.251098", "type": "set", "name": "increment length", "xml": "<set>\n\t<parameter name='num' value='`$num + 1`' />\n", "comments": "", - "x": 2145.6666412353516, - "y": 1509.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 2149.6666412353516, + "y": 1539.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "3d8ba937.dbc0d6", + "id": "833f0238.99363", "type": "set", "name": "increment length", "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n\n", "comments": "", - "x": 1371.6666412353516, - "y": 1520.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1375.6666412353516, + "y": 1550.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "8e656d8f.2c0638", + "id": "ecce6565.d1e898", "type": "block", "name": "block : atomic", "xml": "<block atomic='true'>", "atomic": "true", "comments": "", "outputs": 1, - "x": 1405.6666412353516, - "y": 1126.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1409.6666412353516, + "y": 1156.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "e4968d42.952ee8", - "d52c802e.c9c1a8" + "9947d8c1.f7aff8", + "44e5b8af.77e3d8" ] ] }, { - "id": "d52c802e.c9c1a8", + "id": "44e5b8af.77e3d8", "type": "set", "name": "increment length", "xml": "<set>\n\t<parameter name='highnum' value='`$highnum + 1`' />\n", "comments": "", - "x": 1620.6666412353516, - "y": 1186.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1624.6666412353516, + "y": 1216.333324432373, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "d780496.e20e538", + "id": "451cb826.e55b18", "type": "block", "name": "block atomic", "xml": "<block atomic=\"true\">", "atomic": "false", "comments": "", "outputs": 1, - "x": 1945.6666412353516, - "y": 1436.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 1949.6666412353516, + "y": 1466.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [ - "39414253.4d201e", - "c6d0d2f9.dcf96", - "8236fb65.2996b" + "ebc212fd.50c99", + "7d1e7719.053288", + "e4fba5aa.251098" ] ] }, { - "id": "ff9121b8.95fe6", + "id": "48b65c6e.618e44", "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": 371.9999809265137, - "y": 779.333324432373, - "z": "58e8fb6f.65cbf4", + "x": 375.9999809265137, + "y": 809.333324432373, + "z": "4a0b2401.ec39ec", "wires": [ [] ] }, { - "id": "a656672e.be2f5", + "id": "80225cf4.2c8b2", "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": 368.6666488647461, - "y": 934.3333320617676, - "z": "58e8fb6f.65cbf4", + "x": 372.6666488647461, + "y": 964.3333320617676, + "z": "4a0b2401.ec39ec", "wires": [ [] ] }, { - "id": "8048ec03.29272", + "id": "638697ae.8d3678", "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": 377.00000762939453, - "y": 1738.5000267028809, - "z": "58e8fb6f.65cbf4", + "x": 381.00000762939453, + "y": 1768.5000267028809, + "z": "4a0b2401.ec39ec", "wires": [ [] ] }, { - "id": "479d04c2.fc7acc", + "id": "a4083479.8e5dd8", "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": 383.25000762939453, - "y": 1686.0000247955322, - "z": "58e8fb6f.65cbf4", + "x": 387.25000762939453, + "y": 1716.0000247955322, + "z": "4a0b2401.ec39ec", "wires": [] }, { - "id": "c8325ee3.97b988", + "id": "2e936c1f.cb2bd4", "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: vnf-ra-assignment\"/>\n\n", "comments": "", "outputs": 1, - "x": 360.75000381469727, - "y": 1639.7500247955322, - "z": "58e8fb6f.65cbf4", + "x": 364.75000381469727, + "y": 1669.7500247955322, + "z": "4a0b2401.ec39ec", "wires": [ [] ] + }, + { + "id": "546a230c.3e01dc", + "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.template-prefix'`\" value='`$tmp.sdnc-artifact-name`' />\n<parameter name=\"`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`\" value='`$tmp.json-payload`' />", + "comments": "", + "x": 430.0000457763672, + "y": 736.3333587646484, + "z": "4a0b2401.ec39ec", + "wires": [] } ]
\ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml index cbc78c8a..c1f8931e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml @@ -14,11 +14,15 @@ </outcome>
</execute>
<set>
- <parameter name="request-id" value="`$tmp.return.generate.pnf-se-serv-uuid`"/>
+ <parameter name="cds" value="execution-service_process."/>
+ <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.pnf-se-serv-uuid`"/>
<parameter name="resource-type" value="`$pnf-topology-operation-input.pnf-details.pnf-type`" />
- <parameter name="resource-id" value="`$pnf-topology-operation-input.pnf-details.pnf-id`" />
- <parameter name="action-name" value="resource-assignment"/>
+ <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$pnf-topology-operation-input.pnf-details.pnf-id`" />
+ <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
<parameter name="responsePrefix" value="raAssign" />
+ <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+ <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+ <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
</set>
<switch test='`$service-data.pnfs.pnf[$pnf-index].pnf-data.pnf-topology.pnf-parameters-data.param_length`'>
<outcome value=''>
@@ -94,19 +98,25 @@ <parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '"pnf-model-customization-uuid":"' + $pnf-topology-operation-input.pnf-details.onap-model-information.model-customization-uuid + '",'`"/>
<parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '"pnf-id":"' + $pnf-topology-operation-input.pnf-details.pnf-id + '",'`"/>
<parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $pnf-topology-operation-input.pnf-request-input.aic-cloud-region + '"'`"/>
+ </set>
+ <set>
<parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload7 + '}'`" />
+ <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+ <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+ <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />
+ <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
</set>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
<parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
<parameter name='restapiUser' value='`$prop.cds.user`' />
<parameter name='restapiPassword' value='`$prop.cds.pwd`' />
<parameter name='format' value='json' />
<parameter name='httpMethod' value='POST' />
+ <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
<parameter name="responsePrefix" value="`$responsePrefix`" />
<outcome value='failure'>
<return status='failure'>
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 5b30bba8..a2fa9417 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 @@ -14,11 +14,15 @@ </outcome>
</execute>
<set>
- <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
+ <parameter name="cds" value="execution-service_process."/>
+ <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
<parameter name="resource-type" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-type`" />
- <parameter name="resource-id" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
- <parameter name="action-name" value="resource-assignment"/>
+ <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vf-module-topology-operation-input.vf-module-information.vf-module-id`" />
+ <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
<parameter name="responsePrefix" value="raAssign" />
+ <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+ <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+ <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
</set>
<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`'>
<outcome value=''>
@@ -119,17 +123,23 @@ <parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '"vnf-model-customization-uuid":"' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.onap-model-information.model-customization-uuid + '",'`"/>
<parameter name="tmp.config-name-value-payload8" value="`$tmp.config-name-value-payload7 + '"vf-module-id":"' + $vf-module-topology-operation-input.vf-module-information.vf-module-id + '",'`"/>
<parameter name="tmp.config-name-value-payload9" value="`$tmp.config-name-value-payload8 + '"aic-cloud-region":"' + $vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region + '"'`"/>
+ </set>
+ <set>
<parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload9 + '}'`" />
+ <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+ <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+ <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />
+ <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
</set>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
<parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
<parameter name='restapiUser' value='`$prop.cds.user`' />
<parameter name='restapiPassword' value='`$prop.cds.pwd`' />
+ <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
<parameter name='format' value='json' />
<parameter name='httpMethod' value='POST' />
<parameter name="responsePrefix" value="`$responsePrefix`" />
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 c65b7c03..b279626a 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 @@ -14,11 +14,15 @@ </outcome>
</execute>
<set>
- <parameter name="request-id" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
+ <parameter name="cds" value="execution-service_process."/>
+ <parameter name="`$cds + 'commonHeader.requestId'`" value="`$tmp.return.generate.vnf-se-serv-uuid`"/>
<parameter name="resource-type" value="`$vnf-topology-operation-input.vnf-information.vnf-type`" />
- <parameter name="resource-id" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
- <parameter name="action-name" value="resource-assignment"/>
+ <parameter name="`$cds + 'commonHeader.subRequestId'`" value="`$vnf-topology-operation-input.vnf-information.vnf-id`" />
+ <parameter name="`$cds + 'actionIdentifiers.actionName'`" value="resource-assignment"/>
<parameter name="responsePrefix" value="raAssign" />
+ <parameter name="`$cds + 'isNonAppend'`" value="true"/>
+ <parameter name="`$cds + 'commonHeader.originatorId'`" value="SDNC_DG"/>
+ <parameter name="`$cds + 'actionIdentifiers.mode'`" value="sync"/>
</set>
<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>
<outcome value=''>
@@ -94,19 +98,25 @@ <parameter name="tmp.config-name-value-payload5" value="`$tmp.config-name-value-payload4 + '"vnf-model-customization-uuid":"' + $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid + '",'`"/>
<parameter name="tmp.config-name-value-payload6" value="`$tmp.config-name-value-payload5 + '"vnf-id":"' + $vnf-topology-operation-input.vnf-information.vnf-id + '",'`"/>
<parameter name="tmp.config-name-value-payload7" value="`$tmp.config-name-value-payload6 + '"aic-cloud-region":"' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region + '"'`"/>
+ </set>
+ <set>
<parameter name="tmp.json-payload" value="`'{' + $tmp.config-name-value-payload7 + '}'`" />
+ <parameter name="`$cds + 'actionIdentifiers.blueprintName'`" value='`$tmp.sdnc-model-name`' />
+ <parameter name="`$cds + 'actionIdentifiers.blueprintVersion'`" value='`$tmp.sdnc-model-version`' />
+ <parameter name="`$cds + 'payload.template-prefix'`" value='`$tmp.sdnc-artifact-name`' />
+ <parameter name="`$cds + 'payload.resource-assignment-request.resource-assignment-properties'`" value='`$tmp.json-payload`' />
</set>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
<parameter name="field1" value="BEFORE BlueprintProcessingClient"/>
</record>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/cds-processor-payload.json'`" />
+ <execute plugin='org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode' method='sendRequest' >
<parameter name='restapiUrl' value="`$prop.cds.url + '/api/v1/execution-service/process'`" />
<parameter name='restapiUser' value='`$prop.cds.user`' />
<parameter name='restapiPassword' value='`$prop.cds.pwd`' />
<parameter name='format' value='json' />
<parameter name='httpMethod' value='POST' />
+ <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
<parameter name="responsePrefix" value="`$responsePrefix`" />
<outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/restconfapi-yang/src/main/yang/cds/execution-service.yang b/platform-logic/restconfapi-yang/src/main/yang/cds/execution-service.yang new file mode 100644 index 00000000..d7cf68f1 --- /dev/null +++ b/platform-logic/restconfapi-yang/src/main/yang/cds/execution-service.yang @@ -0,0 +1,43 @@ +module execution-service { + yang-version 1.1; + namespace "cds:workflow:rest"; + prefix "cds"; + + revision "2019-05-21"; + + container process { + container commonHeader { + leaf originatorId { + type string; + } + leaf requestId { + type string; + } + leaf subRequestId { + type string; + } + } + container actionIdentifiers { + leaf blueprintName { + type string; + } + leaf blueprintVersion { + type string; + } + leaf actionName { + type string; + } + leaf mode { + type string; + } + } + container payload { + leaf-list template-prefix { + type string; + } + container resource-assignment-request { + anyxml resource-assignment-properties; + } + } + } +} |