[\r
{\r
- "id": "f06d79a.4f13a08",\r
+ "id": "c0a79856.b8a9a8",\r
"type": "dgstart",\r
"name": "DGSTART",\r
"outputs": 1,\r
- "x": 120,\r
- "y": 66,\r
- "z": "62554968.e321b8",\r
+ "x": 129,\r
+ "y": 75,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "e698fb0d.22ccb"\r
+ "f23fb4.004e985"\r
]\r
]\r
},\r
{\r
- "id": "e698fb0d.22ccb",\r
+ "id": "f23fb4.004e985",\r
"type": "service-logic",\r
"name": "GENERIC-RESOURCE-API ${project.version}",\r
"module": "GENERIC-RESOURCE-API",\r
"comments": "",\r
"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}'>",\r
"outputs": 1,\r
- "x": 251.2856903076172,\r
- "y": 115.23810863494873,\r
- "z": "62554968.e321b8",\r
+ "x": 260.2856903076172,\r
+ "y": 124.23810863494873,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "c77e5b12.74fa8"\r
+ "16bd01d7.cde55e"\r
]\r
]\r
},\r
{\r
- "id": "c77e5b12.74fa8",\r
+ "id": "16bd01d7.cde55e",\r
"type": "method",\r
"name": "method sotn-vf-operation-l2vpn-activate",\r
"xml": "<method rpc='sotn-vf-operation-l2vpn-activate' mode='sync'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 254.42861938476562,\r
- "y": 200.00003242492676,\r
- "z": "62554968.e321b8",\r
+ "x": 263.4286193847656,\r
+ "y": 209.00003242492676,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "dc8a4134.633b38"\r
+ "4bca7263.f9b50c"\r
]\r
]\r
},\r
{\r
- "id": "dc8a4134.633b38",\r
+ "id": "4bca7263.f9b50c",\r
"type": "block",\r
"name": "block : atomic",\r
"xml": "<block atomic=\"true\">",\r
"atomic": "true",\r
"outputs": 1,\r
- "x": 622.2380447387695,\r
- "y": 414.66666814964265,\r
- "z": "62554968.e321b8",\r
+ "x": 631.2380447387695,\r
+ "y": 423.66666814964265,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "6485c0f8.91ce08",\r
- "a02d1e2f.e50b18",\r
- "c0d6a6a1.052f28",\r
- "aff44c8.fd218b",\r
- "cdefed21.97b52",\r
- "ef33383b.0eb5c8",\r
- "6bb0bfe6.f5358"\r
+ "89ba9e4f.322f08",\r
+ "b6b036c1.4e053",\r
+ "a1814ef6.4e6ba"\r
]\r
]\r
},\r
{\r
- "id": "6485c0f8.91ce08",\r
+ "id": "213a5120.a6687e",\r
"type": "set",\r
"name": "set vnf-level-oper-status to Active",\r
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",\r
"comments": "",\r
- "x": 1037.3850173950195,\r
- "y": 601.6705513000488,\r
- "z": "62554968.e321b8",\r
+ "x": 1046.3850173950195,\r
+ "y": 610.6705513000488,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "a02d1e2f.e50b18",\r
+ "id": "89ba9e4f.322f08",\r
"type": "returnSuccess",\r
"name": "return success",\r
"xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
"comments": "",\r
- "x": 957.5717086791992,\r
- "y": 727.5970888137817,\r
- "z": "62554968.e321b8",\r
+ "x": 966.5717086791992,\r
+ "y": 736.5970888137817,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "c0d6a6a1.052f28",\r
+ "id": "b6b036c1.4e053",\r
"type": "set",\r
"name": "set vnf-index and vnf-object-path",\r
- "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />",\r
+ "xml": "<set>\n<!--<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />-->\n<!--<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vnf-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vnf-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />-->\n\n<parameter name='vnfId' value='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $vf-module-topology-operation-input.service-information.service-instance-id + '/service-data/vnfs/vnf/' + $vf-module-topology-operation-input.vnf-information.vnf-id + '/vnf-data/'` \" />\n",\r
"comments": "",\r
- "x": 1043.571662902832,\r
- "y": 549.5968055725098,\r
- "z": "62554968.e321b8",\r
+ "x": 1052.571662902832,\r
+ "y": 558.5968055725098,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "aff44c8.fd218b",\r
+ "id": "951505a8.4ab128",\r
"type": "switchNode",\r
"name": "switch service-data.vnfs.vnf_length",\r
"xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1052.0000610351562,\r
- "y": 304.00000545661896,\r
- "z": "62554968.e321b8",\r
+ "x": 1061.0000610351562,\r
+ "y": 313.00000545661896,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "c419b86f.420228",\r
- "5e5514b0.5b9124",\r
- "dab73261.53c13"\r
+ "298b7800.074bc",\r
+ "302f9230.c82bc6",\r
+ "3ee80cd1.702c9c"\r
]\r
]\r
},\r
{\r
- "id": "dab73261.53c13",\r
+ "id": "3ee80cd1.702c9c",\r
"type": "outcome",\r
"name": "0",\r
"xml": "<outcome value='0'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1310.9689559936523,\r
- "y": 265.96876499336213,\r
- "z": "62554968.e321b8",\r
+ "x": 1319.9689559936523,\r
+ "y": 274.96876499336213,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "ac6cfd44.a241c"\r
+ "bc487c7b.4684b8"\r
]\r
]\r
},\r
{\r
- "id": "ac6cfd44.a241c",\r
+ "id": "bc487c7b.4684b8",\r
"type": "returnFailure",\r
"name": "return failure",\r
"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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
"comments": "",\r
- "x": 1465.7778434753418,\r
- "y": 284.88903352897614,\r
- "z": "62554968.e321b8",\r
+ "x": 1474.7778434753418,\r
+ "y": 293.88903352897614,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "c419b86f.420228",\r
+ "id": "298b7800.074bc",\r
"type": "other",\r
"name": "Null",\r
"xml": "<outcome value=''>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1304.0000953674316,\r
- "y": 305.00008651893586,\r
- "z": "62554968.e321b8",\r
+ "x": 1313.0000953674316,\r
+ "y": 314.00008651893586,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "ac6cfd44.a241c"\r
+ "bc487c7b.4684b8"\r
]\r
]\r
},\r
{\r
- "id": "5e5514b0.5b9124",\r
+ "id": "302f9230.c82bc6",\r
"type": "other",\r
"name": "other",\r
"xml": "<outcome value='Other'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1297.000503540039,\r
- "y": 338.0000903336331,\r
- "z": "62554968.e321b8",\r
+ "x": 1306.000503540039,\r
+ "y": 347.0000903336331,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "639a074f.493e98"\r
+ "3aa4324.564e84e"\r
]\r
]\r
},\r
{\r
- "id": "639a074f.493e98",\r
+ "id": "3aa4324.564e84e",\r
"type": "block",\r
"name": "block : atomic",\r
"xml": "<block atomic=\"true\">",\r
"atomic": "true",\r
"outputs": 1,\r
- "x": 1444.2700462341309,\r
- "y": 338.55473539512604,\r
- "z": "62554968.e321b8",\r
+ "x": 1453.2700462341309,\r
+ "y": 347.55473539512604,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "6fa946fa.ca1978"\r
+ "ea8cd4e1.da014"\r
]\r
]\r
},\r
{\r
- "id": "6fa946fa.ca1978",\r
+ "id": "ea8cd4e1.da014",\r
"type": "for",\r
"name": "for vidx..service-data.vnfs.vnf_length[]",\r
"xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1690.2861633300781,\r
- "y": 345.4286558357999,\r
- "z": "62554968.e321b8",\r
+ "x": 1699.2861633300781,\r
+ "y": 354.4286558357999,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "154eb41a.640b64"\r
+ "6be80779.f9067"\r
]\r
]\r
},\r
{\r
- "id": "154eb41a.640b64",\r
+ "id": "6be80779.f9067",\r
"type": "block",\r
"name": "block",\r
"xml": "<block>\n",\r
"atomic": "false",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1909.6357955932617,\r
- "y": 344.9687359062955,\r
- "z": "62554968.e321b8",\r
+ "x": 1918.6357955932617,\r
+ "y": 353.9687359062955,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "330022d0.830a2e"\r
+ "e37eb61b.35117"\r
]\r
]\r
},\r
{\r
- "id": "330022d0.830a2e",\r
+ "id": "e37eb61b.35117",\r
"type": "switchNode",\r
"name": "switch vnfid found",\r
- "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
+ "xml": "<!--<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">-->\n\n<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vf-topology-operation-input.vf-module-information.vf-module-id`\">\n\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 2063.7153930664062,\r
- "y": 344.67881796043366,\r
- "z": "62554968.e321b8",\r
+ "x": 2072.7153930664062,\r
+ "y": 353.67881796043366,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "fcbe4c85.417af"\r
+ "b5cfadba.1f4aa"\r
]\r
]\r
},\r
{\r
- "id": "fcbe4c85.417af",\r
+ "id": "b5cfadba.1f4aa",\r
"type": "outcomeTrue",\r
"name": "true",\r
"xml": "<outcome value='true'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 2239.6675148010254,\r
- "y": 344.57150003593415,\r
- "z": "62554968.e321b8",\r
+ "x": 2248.6675148010254,\r
+ "y": 353.57150003593415,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "2fb9529b.c7be6e"\r
+ "bd36402c.584f38"\r
]\r
]\r
},\r
{\r
- "id": "2fb9529b.c7be6e",\r
+ "id": "bd36402c.584f38",\r
"type": "set",\r
"name": "set tmp.vidx and ctx.vnf-data",\r
"xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",\r
"comments": "",\r
- "x": 2449.1998901367188,\r
- "y": 346.3216001717374,\r
- "z": "62554968.e321b8",\r
+ "x": 2458.1998901367188,\r
+ "y": 355.3216001717374,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "cdefed21.97b52",\r
+ "id": "a1814ef6.4e6ba",\r
"type": "save",\r
"name": "update AnAI - l2vpn.operational-status",\r
"xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\" \n\t\tkey=\"connectivity.connectivity-id = $vnfId\" >\n<parameter name=\"operational-status\" value=\"Active\" />",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1063.0000228881836,\r
- "y": 668.0103769302368,\r
- "z": "62554968.e321b8",\r
+ "x": 1072.0000228881836,\r
+ "y": 677.0103769302368,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[]\r
]\r
},\r
{\r
- "id": "ef33383b.0eb5c8",\r
+ "id": "fa4a7cef.4c643",\r
"type": "set",\r
"name": "copy input data to service data",\r
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",\r
"comments": "",\r
- "x": 1042.0001373291016,\r
- "y": 499.010338306427,\r
- "z": "62554968.e321b8",\r
+ "x": 1051.0001373291016,\r
+ "y": 508.010338306427,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "6bb0bfe6.f5358",\r
+ "id": "d491e887.81b538",\r
"type": "switchNode",\r
"name": "switch vnf-level-oper-status",\r
"xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1028.75,\r
- "y": 404.00390815734863,\r
- "z": "62554968.e321b8",\r
+ "x": 1037.75,\r
+ "y": 413.00390815734863,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "5c7bc43a.bb701c",\r
- "b67194e3.094198"\r
+ "2e735695.8a522a",\r
+ "9667f59f.7676c8"\r
]\r
]\r
},\r
{\r
- "id": "5c7bc43a.bb701c",\r
+ "id": "2e735695.8a522a",\r
"type": "outcome",\r
"name": "outcome Created",\r
"xml": "<outcome value='Created'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1274.583293914795,\r
- "y": 405.1150059700012,\r
- "z": "62554968.e321b8",\r
+ "x": 1283.583293914795,\r
+ "y": 414.1150059700012,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "914253cd.1c469"\r
+ "a29cc418.229998"\r
]\r
]\r
},\r
{\r
- "id": "b67194e3.094198",\r
+ "id": "9667f59f.7676c8",\r
"type": "other",\r
"name": "other",\r
"xml": "<outcome value='Other'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1252.5833129882812,\r
- "y": 455.115017414093,\r
- "z": "62554968.e321b8",\r
+ "x": 1261.5833129882812,\r
+ "y": 464.115017414093,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[\r
- "b6453bfb.a302f"\r
+ "aa583cbc.e62958"\r
]\r
]\r
},\r
{\r
- "id": "b6453bfb.a302f",\r
+ "id": "aa583cbc.e62958",\r
"type": "returnFailure",\r
"name": "return failure",\r
"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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
"comments": "",\r
- "x": 1412.083080291748,\r
- "y": 458.1150164604187,\r
- "z": "62554968.e321b8",\r
+ "x": 1421.083080291748,\r
+ "y": 467.1150164604187,\r
+ "z": "498236f1.856f48",\r
"wires": []\r
},\r
{\r
- "id": "914253cd.1c469",\r
+ "id": "a29cc418.229998",\r
"type": "block",\r
"name": "block : atomic",\r
"xml": "<block atomic=\"true\">",\r
"atomic": "true",\r
"outputs": 1,\r
- "x": 1484.8896675109863,\r
- "y": 416.4401812553406,\r
- "z": "62554968.e321b8",\r
+ "x": 1493.8896675109863,\r
+ "y": 425.4401812553406,\r
+ "z": "498236f1.856f48",\r
"wires": [\r
[]\r
]\r
Code Review / sdnc / oam.git / blobdiff