[\r
{\r
- "id": "ba2f1a27.8f7c88",\r
+ "id": "668a4a6a.11fb74",\r
"type": "method",\r
"name": "method vnf-topology-operation-vpn-site-resource-create",\r
"xml": "<method rpc='vnf-topology-operation-vpn-site-resource-create' mode='sync'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 233,\r
- "y": 190.9999925820157,\r
- "z": "bc55b65a.bac808",\r
+ "x": 260.0104064941406,\r
+ "y": 185.0104217529297,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "887ebd07.82fca"\r
+ "f0e43a5a.fb4558"\r
]\r
]\r
},\r
{\r
- "id": "99a008b4.eb0bc8",\r
+ "id": "61b91100.d7ede",\r
"type": "dgstart",\r
"name": "DGSTART",\r
"outputs": 1,\r
- "x": 109.57138061523438,\r
- "y": 43,\r
- "z": "bc55b65a.bac808",\r
+ "x": 136.581787109375,\r
+ "y": 37.010429170913994,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "9964126a.58753"\r
+ "bc2b5176.73e7e"\r
]\r
]\r
},\r
{\r
- "id": "9964126a.58753",\r
+ "id": "bc2b5176.73e7e",\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": 211.85708618164062,\r
- "y": 101.23810407798737,\r
- "z": "bc55b65a.bac808",\r
+ "x": 238.86749267578125,\r
+ "y": 95.24853324890137,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "ba2f1a27.8f7c88"\r
+ "668a4a6a.11fb74"\r
]\r
]\r
},\r
{\r
- "id": "887ebd07.82fca",\r
+ "id": "f0e43a5a.fb4558",\r
"type": "block",\r
"name": "block : atomic",\r
"xml": "<block atomic=\"true\">",\r
"atomic": "true",\r
"outputs": 1,\r
- "x": 213.23804473876953,\r
- "y": 362.6666643349454,\r
- "z": "bc55b65a.bac808",\r
+ "x": 240.24845123291016,\r
+ "y": 356.6770935058594,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "e036c242.ea2d7",\r
- "8ac28eea.03b2e",\r
- "bee946ca.5b9488",\r
- "fa22ed9a.8f597",\r
- "259c9f6d.05187",\r
- "1c3377d1.23ec68",\r
- "33f4194.b4adce6",\r
- "cd58d769.440f18",\r
- "50ac8040.e368f",\r
- "82bd0bd5.564548"\r
+ "6dab251c.49205c",\r
+ "10940ab9.a5fb85",\r
+ "2aab9019.e3a45",\r
+ "be0c443b.256188",\r
+ "46389e76.c8e6",\r
+ "89f88258.b891f",\r
+ "dc405c48.cda4b",\r
+ "1170677a.a70a49",\r
+ "997721e4.3b61b",\r
+ "71ec508c.bf2e1",\r
+ "60143a97.af1404"\r
]\r
]\r
},\r
{\r
- "id": "8ac28eea.03b2e",\r
+ "id": "10940ab9.a5fb85",\r
"type": "set",\r
"name": "set vnf-level-oper-status to Created",\r
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].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[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",\r
"comments": "",\r
- "x": 647.3847961425781,\r
- "y": 616.6705932617188,\r
- "z": "bc55b65a.bac808",\r
+ "x": 674.3952026367188,\r
+ "y": 610.6810224326327,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "e036c242.ea2d7",\r
+ "id": "6dab251c.49205c",\r
"type": "set",\r
"name": "copy input data to service data",\r
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-index`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='$vnf-topology-operation-input.vnf-request-input.' />\n\n",\r
"comments": "",\r
- "x": 639.2379837036133,\r
- "y": 511.6668453216553,\r
- "z": "bc55b65a.bac808",\r
+ "x": 666.2483901977539,\r
+ "y": 505.67727449256927,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "259c9f6d.05187",\r
+ "id": "46389e76.c8e6",\r
"type": "execute",\r
"name": "execute generate-vnf-index",\r
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-index\"/>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 627.5714874267578,\r
- "y": 461.33342933654785,\r
- "z": "bc55b65a.bac808",\r
+ "x": 654.5818939208984,\r
+ "y": 455.34385850746185,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[]\r
]\r
},\r
{\r
- "id": "4832dc07.c382d4",\r
+ "id": "60143a97.af1404",\r
"type": "set",\r
"name": "set vnf-index to service data",\r
"xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.vnf-id' value='`$prop.vnf-index`' />\n",\r
"comments": "",\r
- "x": 638.5715637207031,\r
- "y": 568.3334331512451,\r
- "z": "bc55b65a.bac808",\r
+ "x": 665.5819702148438,\r
+ "y": 562.3438623221591,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "bee946ca.5b9488",\r
+ "id": "2aab9019.e3a45",\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": 642.5713653564453,\r
- "y": 241.3333559036255,\r
- "z": "bc55b65a.bac808",\r
+ "x": 669.5817718505859,\r
+ "y": 235.34378507453948,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "b7b01487.9885f8",\r
- "aecaf676.67f6b8"\r
+ "214b38d8.c822d8",\r
+ "308ac75b.244168"\r
]\r
]\r
},\r
{\r
- "id": "b7b01487.9885f8",\r
+ "id": "214b38d8.c822d8",\r
"type": "other",\r
"name": "NULL",\r
"xml": "<outcome value=''>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 877.2857513427734,\r
- "y": 236.47617626190186,\r
- "z": "bc55b65a.bac808",\r
+ "x": 904.2961578369141,\r
+ "y": 230.48660543281585,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "1f5394d7.70124b"\r
+ "bcebd76e.5a08d8"\r
]\r
]\r
},\r
{\r
- "id": "1f5394d7.70124b",\r
+ "id": "bcebd76e.5a08d8",\r
"type": "set",\r
"name": "set vnf-index=0",\r
"xml": "<set>\n<parameter name='vnf-index' value='0' />\n",\r
"comments": "",\r
- "x": 1037.5714569091797,\r
- "y": 236.47626781463623,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1064.5818634033203,\r
+ "y": 230.48669698555022,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "aecaf676.67f6b8",\r
+ "id": "308ac75b.244168",\r
"type": "other",\r
"name": "other",\r
"xml": "<outcome value='Other'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 873.7142906188965,\r
- "y": 269.76200771331787,\r
- "z": "bc55b65a.bac808",\r
+ "x": 900.7246971130371,\r
+ "y": 263.77243688423187,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "6e2b33e1.03a57c"\r
+ "af41a2cb.7d1be"\r
]\r
]\r
},\r
{\r
- "id": "bd7ad864.5375c8",\r
+ "id": "c6ca1095.8fc32",\r
"type": "set",\r
"name": "set vnf-index = vnf_length",\r
"xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",\r
"comments": "",\r
- "x": 1266.571533203125,\r
- "y": 248.04773330688477,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1293.5819396972656,\r
+ "y": 242.05816247779876,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "d9951812.e7fdb8",\r
+ "id": "c1df9f5.ae8c56",\r
"type": "for",\r
"name": "for each existing VNF",\r
"xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1255.0001525878906,\r
- "y": 283.04770517349243,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1282.0105590820312,\r
+ "y": 277.0581343444064,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "febea1ac.bb0d8"\r
+ "6e99eb9c.1d2854"\r
]\r
]\r
},\r
{\r
- "id": "6e2b33e1.03a57c",\r
+ "id": "af41a2cb.7d1be",\r
"type": "block",\r
"name": "block",\r
"xml": "<block>\n",\r
"atomic": "false",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1008.4285736083984,\r
- "y": 271.76197719573975,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1035.438980102539,\r
+ "y": 265.77240636665374,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "bd7ad864.5375c8",\r
- "d9951812.e7fdb8"\r
+ "c6ca1095.8fc32",\r
+ "c1df9f5.ae8c56"\r
]\r
]\r
},\r
{\r
- "id": "febea1ac.bb0d8",\r
+ "id": "6e99eb9c.1d2854",\r
"type": "switchNode",\r
"name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",\r
"xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1648.285888671875,\r
- "y": 283.61918926239014,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1675.2962951660156,\r
+ "y": 277.62961843330413,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "359b5cad.1078a4"\r
+ "b8a872f3.280e3"\r
]\r
]\r
},\r
{\r
- "id": "359b5cad.1078a4",\r
+ "id": "b8a872f3.280e3",\r
"type": "outcomeTrue",\r
"name": "true",\r
"xml": "<outcome value='true'>\n",\r
"comments": "",\r
"outputs": 1,\r
- "x": 1929.571590423584,\r
- "y": 282.19059467315674,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1956.5819969177246,\r
+ "y": 276.20102384407073,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[\r
- "e5d5a5d7.361b48"\r
+ "2b05b5cd.40cb0a"\r
]\r
]\r
},\r
{\r
- "id": "fe823586.a40dc8",\r
+ "id": "1bd5d19c.ac71ae",\r
"type": "comment",\r
"name": "make sure this vnf-id doesn't exist already",\r
"info": "",\r
"comments": "",\r
- "x": 1617.4285049438477,\r
- "y": 247.1905813217163,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1644.4389114379883,\r
+ "y": 241.2010104926303,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "fa22ed9a.8f597",\r
+ "id": "be0c443b.256188",\r
"type": "set",\r
"name": "set new vnf_length",\r
"xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",\r
"comments": "",\r
- "x": 599.5714874267578,\r
- "y": 409.33342599868774,\r
- "z": "bc55b65a.bac808",\r
+ "x": 626.5818939208984,\r
+ "y": 403.34385516960174,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "1c3377d1.23ec68",\r
+ "id": "89f88258.b891f",\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": 586.5714492797852,\r
- "y": 879.59694480896,\r
- "z": "bc55b65a.bac808",\r
+ "x": 613.5818557739258,\r
+ "y": 873.607373979874,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "82bd0bd5.564548",\r
+ "id": "71ec508c.bf2e1",\r
"type": "save",\r
"name": "save service relationship in AAI",\r
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"generic-vnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/generic-vnfs/generic-vnf/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"generic-vnf.vnf-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" />\n\n\n<!--save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"vpn-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/vpn-resources/vpn-resource/' + $prop.vnf-index`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"vpn-resource.vpn-resource-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-index`\" /-->",\r
"comments": "",\r
"outputs": 1,\r
- "x": 649.2382202148438,\r
- "y": 826.5968379974365,\r
- "z": "bc55b65a.bac808",\r
+ "x": 676.2486267089844,\r
+ "y": 820.6072671683505,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[]\r
]\r
},\r
{\r
- "id": "33f4194.b4adce6",\r
+ "id": "dc405c48.cda4b",\r
"type": "set",\r
"name": "set vnf-index and vnf-object-path",\r
"xml": "<set>\n<parameter name='vnfId' value='`$prop.vnf-index`' />\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/' + $prop.vnf-index + '/vnf-data/'` \" />",\r
"comments": "",\r
- "x": 640.5714797973633,\r
- "y": 657.5968637466431,\r
- "z": "bc55b65a.bac808",\r
+ "x": 667.5818862915039,\r
+ "y": 651.6072929175571,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "cd58d769.440f18",\r
+ "id": "1170677a.a70a49",\r
"type": "set",\r
"name": "set vnf-request-input.",\r
"xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",\r
"comments": "",\r
- "x": 605.5711212158203,\r
- "y": 360.3247985839844,\r
- "z": "bc55b65a.bac808",\r
+ "x": 632.5815277099609,\r
+ "y": 354.33522775489837,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "e5d5a5d7.361b48",\r
+ "id": "2b05b5cd.40cb0a",\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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",\r
"comments": "",\r
- "x": 2058.1429595947266,\r
- "y": 333.1906089782715,\r
- "z": "bc55b65a.bac808",\r
+ "x": 2085.153366088867,\r
+ "y": 327.2010381491855,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "b6f6713f.1cb83",\r
+ "id": "8463cd7c.a7a22",\r
"type": "comment",\r
"name": "Take the parameter names by removing prefix",\r
"info": "",\r
"comments": "",\r
- "x": 1351.5715713500977,\r
- "y": 336.66667556762695,\r
- "z": "bc55b65a.bac808",\r
+ "x": 1378.5819778442383,\r
+ "y": 330.67710473854095,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "a6480f2e.967df",\r
+ "id": "ecfeb487.443888",\r
"type": "comment",\r
"name": "TODO: change AAI models",\r
"info": "",\r
"comments": "",\r
- "x": 629.1820449829102,\r
- "y": 726.9742965698242,\r
- "z": "bc55b65a.bac808",\r
+ "x": 656.1924514770508,\r
+ "y": 720.9847257407382,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": []\r
},\r
{\r
- "id": "50ac8040.e368f",\r
+ "id": "997721e4.3b61b",\r
"type": "save",\r
"name": "save AnAI - vnf-instance.orchestration-status",\r
"xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $prop.vnf-index\" >\n<parameter name=\"orchestration-status\" value=\"create\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\r
"comments": "",\r
"outputs": 1,\r
- "x": 695.545783996582,\r
- "y": 767.2470808029175,\r
- "z": "bc55b65a.bac808",\r
+ "x": 722.5561904907227,\r
+ "y": 761.2575099738315,\r
+ "z": "872ff8dd.fe5e78",\r
"wires": [\r
[]\r
]\r
Code Review / sdnc / oam.git / commitdiff