diff options
| author |   shashikanth.vh <shashikanth.vh@huawei.com> | 2018-09-07 23:00:43 +0530 |
|---|---|---|
| committer | shashikanth.vh <shashikanth.vh@huawei.com> | 2018-09-07 23:00:49 +0530 |
| commit | 911b3733c248a4c9ecbd4d5bbc3ae9991b3b8a74 (patch) | |
| tree | fb766cc71e87c91fa76038d9558c6a2ca308dca9 /platform-logic/generic-resource-api/src | |
| parent | 55b429cfc73802e3e52fa2f3864ecc4cdd552728 (diff) | |
integration test issues fix for sdwan and sotn
Change-Id: I3bc75cd456c15a89ebf3b4e91e9b3836e7322b66
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>
Former-commit-id: 24f0d8fc370633b26f18015e15c4c62002d697e1
Diffstat (limited to 'platform-logic/generic-resource-api/src')
4 files changed, 1464 insertions, 1451 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json index 47601af5..01b405f3 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.json @@ -1,20 +1,20 @@ [ { - "id": "cbe4a9ee.16a0f8", + "id": "d8f994a.905d468", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 129.00390625, - "y": 47.00390625, - "z": "886e5ee7.da286", + "x": 80, + "y": 65, + "z": "8408bfb2.5391c", "wires": [ [ - "e13e73c3.adb19" + "3c2e6d4d.c2bd82" ] ] }, { - "id": "e13e73c3.adb19", + "id": "3c2e6d4d.c2bd82", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,2871 +22,2871 @@ "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": 341.00391006469727, - "y": 119.0039234161377, - "z": "886e5ee7.da286", + "x": 292.00000381469727, + "y": 137.0000171661377, + "z": "8408bfb2.5391c", "wires": [ [ - "5fa2576a.526658" + "26038810.a7ef78" ] ] }, { - "id": "5fa2576a.526658", + "id": "26038810.a7ef78", "type": "method", "name": "sotn-attachment-topology-operation-activate", "xml": "<method rpc='sotn-attachment-topology-operation-activate' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 329.0040283203125, - "y": 207.00390625, - "z": "886e5ee7.da286", + "x": 280.0001220703125, + "y": 225, + "z": "8408bfb2.5391c", "wires": [ [ - "91f5fd5b.cb45c" + "1c3cd19e.85c58e" ] ] }, { - "id": "91f5fd5b.cb45c", + "id": "1c3cd19e.85c58e", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 345.0040283203125, - "y": 762.0041508674622, - "z": "886e5ee7.da286", + "x": 296.0001220703125, + "y": 780.0002446174622, + "z": "8408bfb2.5391c", "wires": [ [ - "f796ddaa.da23c", - "d7cfeb18.ac7528", - "b6393afd.3cacd8", - "81c5733e.5f25d", - "1053c083.232fef", - "42a877ee.39df08", - "d3f500c4.1bfb3", - "aa223239.c5978", - "44848e46.5ebac", - "b29f5799.241a78", - "3637e175.005c6e", - "295602b3.df648e", - "6a3ffb44.1e9004", - "6bb92832.c7ba68", - "1605273a.149319", - "93c61c2f.6bcfd", - "eba0b0a5.90799", - "e1d773b9.aec52", - "8f7266fc.c45038", - "5e07c169.5398c" + "2327aa5f.54ef36", + "99534ea9.895be", + "a2e616e3.120d38", + "a9a5a283.d6f32", + "9011b40c.35c348", + "6ba17b8d.9294d4", + "1a3613fe.fb52ac", + "7282ea04.8f4254", + "38dcc355.b103ac", + "8ae6fd1b.92978", + "20f5a5d.63f625a", + "b5b11ed1.c43bd", + "43ca1b3a.8238a4", + "b210c8e1.8a1f58", + "a7a8f21b.2788e", + "e85cfb03.0cc698", + "d41d9b4e.b5c868", + "d29d9e3d.acace", + "37ff9c4b.85c4b4", + "48b1d949.e92058" ] ] }, { - "id": "f796ddaa.da23c", + "id": "2327aa5f.54ef36", "type": "set", "name": "set tmp.ar.allotted-resource-id,etc", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n", "comments": "", - "x": 741.9974670410156, - "y": 160.9973931312561, - "z": "886e5ee7.da286", + "x": 692.9935607910156, + "y": 178.9934868812561, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "84a283be.00d5", + "id": "de9b3e6.47f7ac", "type": "comment", "name": "set tmp ar-id to fetch resource from MDSAL", "info": "", "comments": "", - "x": 770.9577789306641, - "y": 125.02918910980225, - "z": "886e5ee7.da286", + "x": 721.9538726806641, + "y": 143.02528285980225, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "d7cfeb18.ac7528", + "id": "99534ea9.895be", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 695.9974060058594, - "y": 253.99739837646484, - "z": "886e5ee7.da286", + "x": 646.9934997558594, + "y": 271.99349212646484, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "1053c083.232fef", + "id": "9011b40c.35c348", "type": "execute", "name": "execute Properties", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n", "comments": "", "outputs": 1, - "x": 702.2592964172363, - "y": 341.6641273498535, - "z": "886e5ee7.da286", + "x": 653.2553901672363, + "y": 359.6602210998535, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "b6393afd.3cacd8", + "id": "a2e616e3.120d38", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 749.2593536376953, - "y": 429.6641311645508, - "z": "886e5ee7.da286", + "x": 700.2554473876953, + "y": 447.6602249145508, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "611b176c.616988", + "id": "76aa0cc6.9d0f44", "type": "comment", "name": "GET connection-attachment-allotted-resource from mdsal", "info": "", "comments": "", - "x": 795.8122863769531, - "y": 560.5425653457642, - "z": "886e5ee7.da286", + "x": 746.8083801269531, + "y": 578.5386590957642, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "eec7a472.d0ac68", + "id": "5edbb6db.a8fc38", "type": "comment", "name": "Used for setting output to API Handler", "info": "", "comments": "", - "x": 749.9974365234375, - "y": 220.997407913208, - "z": "886e5ee7.da286", + "x": 700.9935302734375, + "y": 238.993501663208, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "5ba07193.a939c", + "id": "c666ffbb.fc8ca", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 767.9974021911621, - "y": 306.8862886428833, - "z": "886e5ee7.da286", + "x": 718.9934959411621, + "y": 324.8823823928833, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "25108569.01c11a", + "id": "b8b88660.9e4428", "type": "comment", "name": "Used to Get AR by id to MDSAL, same as self-link", "info": "", "comments": "", - "x": 793.9974212646484, - "y": 393.8862476348877, - "z": "886e5ee7.da286", + "x": 744.9935150146484, + "y": 411.8823413848877, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "5268ad10.1fbc94", + "id": "936be6c0.7bea88", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1255.6706981658936, - "y": 578.0038909912109, - "z": "886e5ee7.da286", + "x": 1206.6667919158936, + "y": 595.9999847412109, + "z": "8408bfb2.5391c", "wires": [ [ - "1b9b3a1f.4ecdd6" + "b80a91b9.c696c" ] ] }, { - "id": "1b9b3a1f.4ecdd6", + "id": "b80a91b9.c696c", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1399.6707763671875, - "y": 535.5038089752197, - "z": "886e5ee7.da286", + "x": 1350.6668701171875, + "y": 553.4999027252197, + "z": "8408bfb2.5391c", "wires": [ [ - "b1843433.376208" + "17081217.bb83fe" ] ] }, { - "id": "b1843433.376208", + "id": "17081217.bb83fe", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1568.5282001495361, - "y": 533.1229801177979, - "z": "886e5ee7.da286", + "x": 1519.5242938995361, + "y": 551.1190738677979, + "z": "8408bfb2.5391c", "wires": [ [ - "72d20a43.d9be64", - "eb9d8f14.be82" + "25c765d1.dcabfa", + "7d4970ac.b46e2" ] ] }, { - "id": "72d20a43.d9be64", + "id": "25c765d1.dcabfa", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1723.8613357543945, - "y": 505.1228952407837, - "z": "886e5ee7.da286", + "x": 1674.8574295043945, + "y": 523.1189889907837, + "z": "8408bfb2.5391c", "wires": [ [ - "bb2299d5.286418" + "dd6e63a4.58a4c" ] ] }, { - "id": "bb2299d5.286418", + "id": "dd6e63a4.58a4c", "type": "block", "name": "block: atomic", "xml": "<block atomic='true'>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1882.385139465332, - "y": 503.02774238586426, - "z": "886e5ee7.da286", + "x": 1833.381233215332, + "y": 521.0238361358643, + "z": "8408bfb2.5391c", "wires": [ [ - "5775f1db.84903", - "246f7da0.0df1c2", - "af0aec90.73323" + "7d4cf7ca.b708d8", + "b39fcc17.895c5", + "2aaa9fcc.38bd8" ] ] }, { - "id": "5facd3b6.9153ec", + "id": "899b09dd.666cb8", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Connection attachment resource not exist\" />\n \n", "comments": "", - "x": 1822.5230712890625, - "y": 610.0699768066406, - "z": "886e5ee7.da286", + "x": 1773.5191650390625, + "y": 628.0660705566406, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "ffb50ed4.11c7e", + "id": "e9cdf97c.418498", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1247.5225009918213, - "y": 613.0699758529663, - "z": "886e5ee7.da286", + "x": 1198.5185947418213, + "y": 631.0660696029663, + "z": "8408bfb2.5391c", "wires": [ [ - "8996743b.6d4188" + "2d136e8b.0dda42" ] ] }, { - "id": "8996743b.6d4188", + "id": "2d136e8b.0dda42", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1427.5224514007568, - "y": 613.7365264892578, - "z": "886e5ee7.da286", + "x": 1378.5185451507568, + "y": 631.7326202392578, + "z": "8408bfb2.5391c", "wires": [ [ - "5facd3b6.9153ec" + "899b09dd.666cb8" ] ] }, { - "id": "eb9d8f14.be82", + "id": "7d4970ac.b46e2", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1715.189338684082, - "y": 564.4032697677612, - "z": "886e5ee7.da286", + "x": 1666.185432434082, + "y": 582.3993635177612, + "z": "8408bfb2.5391c", "wires": [ [ - "5facd3b6.9153ec" + "899b09dd.666cb8" ] ] }, { - "id": "5775f1db.84903", + "id": "7d4cf7ca.b708d8", "type": "set", "name": "set connection-attachment-ar from get", "xml": "<set>\n<parameter name='connection-attachment-ar.' value='$mdsal-ar.connection-attachment-allotted-resource[0].' />\n", "comments": "", - "x": 2129.4485931396484, - "y": 476.00399446487427, - "z": "886e5ee7.da286", + "x": 2080.4446868896484, + "y": 494.00008821487427, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "af0aec90.73323", + "id": "2aaa9fcc.38bd8", "type": "set", "name": "set oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-ar.allotted-resource-status.rpc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n", "comments": "", - "x": 2063.4486236572266, - "y": 549.4324970245361, - "z": "886e5ee7.da286", + "x": 2014.4447174072266, + "y": 567.4285907745361, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "246f7da0.0df1c2", + "id": "b39fcc17.895c5", "type": "switchNode", "name": "switch order-status", "xml": "<switch test='`$connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 2073.448402404785, - "y": 515.0039310455322, - "z": "886e5ee7.da286", + "x": 2024.4444961547852, + "y": 533.0000247955322, + "z": "8408bfb2.5391c", "wires": [ [ - "9948e837.465828", - "ac517970.6daf78" + "3c6d5162.4dd28e", + "fef42f12.64b0e" ] ] }, { - "id": "9948e837.465828", + "id": "3c6d5162.4dd28e", "type": "outcome", "name": "outcome Created", "xml": "<outcome value='Created'>\n", "comments": "", "outputs": 1, - "x": 2309.048484802246, - "y": 509.0039620399475, - "z": "886e5ee7.da286", + "x": 2260.044578552246, + "y": 527.0000557899475, + "z": "8408bfb2.5391c", "wires": [ [ - "d4094486.c3a6e8" + "6af9dab4.2f9774" ] ] }, { - "id": "ac517970.6daf78", + "id": "fef42f12.64b0e", "type": "outcome", "name": "outcome Other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2302.762924194336, - "y": 548.4325699806213, - "z": "886e5ee7.da286", + "x": 2253.759017944336, + "y": 566.4286637306213, + "z": "8408bfb2.5391c", "wires": [ [ - "757a486d.390608" + "f2cd9f47.d7377" ] ] }, { - "id": "d4094486.c3a6e8", + "id": "6af9dab4.2f9774", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2467.519157409668, - "y": 509.37961769104004, - "z": "886e5ee7.da286", + "x": 2418.515251159668, + "y": 527.37571144104, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "757a486d.390608", + "id": "f2cd9f47.d7377", "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\" \n value=\"`'Existing connection-attachment-allotted-resource with order status of ' + $connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n", "comments": "", - "x": 2478.670738220215, - "y": 547.0039691925049, - "z": "886e5ee7.da286", + "x": 2429.666831970215, + "y": 565.0000629425049, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "d09e7753.a74cd8", + "id": "1faeed04.ccc693", "type": "call", "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 966.306957244873, - "y": 660.4975109100342, - "z": "886e5ee7.da286", + "x": 917.303050994873, + "y": 678.4936046600342, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "42a877ee.39df08", + "id": "6ba17b8d.9294d4", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 660.3130569458008, - "y": 661.5038814544678, - "z": "886e5ee7.da286", + "x": 611.3091506958008, + "y": 679.4999752044678, + "z": "8408bfb2.5391c", "wires": [ [ - "d09e7753.a74cd8" + "1faeed04.ccc693" ] ] }, { - "id": "e91124de.b8d7d8", + "id": "8dc6288b.69f3c8", "type": "comment", "name": "GET parent-service-data from mdsal to check existence of other End point", "info": "", "comments": "", - "x": 848.00439453125, - "y": 706.5356588363647, - "z": "886e5ee7.da286", + "x": 799.00048828125, + "y": 724.5317525863647, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "cfe58f57.1b13e", + "id": "68cf6590.29454c", "type": "for", "name": "for pidx..mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[]", "xml": "<for index='pidx' start='0' end='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1739.1891021728516, - "y": 859.0081362724304, - "z": "886e5ee7.da286", + "x": 1690.1851959228516, + "y": 877.0042300224304, + "z": "8408bfb2.5391c", "wires": [ [ - "b90499b4.5bff18" + "d6ae5f76.c8f15" ] ] }, { - "id": "81c5733e.5f25d", + "id": "a9a5a283.d6f32", "type": "switchNode", "name": "switch mdsal-psd.service-data.provided-allotted-resources_length", "xml": "<switch test='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 823.1881256103516, - "y": 966.7221727371216, - "z": "886e5ee7.da286", + "x": 774.1842193603516, + "y": 984.7182664871216, + "z": "8408bfb2.5391c", "wires": [ [ - "2b5852f4.1574ce", - "8b23ecf0.b4c98", - "2dc5a41e.bad62c" + "e20f3541.b06af8", + "5e0c5641.7d4838", + "50edb11a.27a72" ] ] }, { - "id": "2b5852f4.1574ce", + "id": "e20f3541.b06af8", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1151.3311462402344, - "y": 1039.5794467926025, - "z": "886e5ee7.da286", + "x": 1102.3272399902344, + "y": 1057.5755405426025, + "z": "8408bfb2.5391c", "wires": [ [ - "4362d0c4.f5cb7" + "bd3642c3.e39b9" ] ] }, { - "id": "3bb83710.9a5ab8", + "id": "5a0c4146.2d462", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1335.458408355713, - "y": 898.7054557800293, - "z": "886e5ee7.da286", + "x": 1286.454502105713, + "y": 916.7015495300293, + "z": "8408bfb2.5391c", "wires": [ [ - "cfe58f57.1b13e", - "44aafa72.840b94" + "68cf6590.29454c", + "9f978556.72d7a8" ] ] }, { - "id": "b90499b4.5bff18", + "id": "d6ae5f76.c8f15", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2179.3004302978516, - "y": 856.0079383850098, - "z": "886e5ee7.da286", + "x": 2130.2965240478516, + "y": 874.0040321350098, + "z": "8408bfb2.5391c", "wires": [ [ - "d9f6094c.60f3c8", - "cb859d5.2b35e6" + "d913a74c.a2fc88", + "7618c5b2.5c314c" ] ] }, { - "id": "d9f6094c.60f3c8", + "id": "d913a74c.a2fc88", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2352.1106452941895, - "y": 827.4725532531738, - "z": "886e5ee7.da286", + "x": 2303.1067390441895, + "y": 845.4686470031738, + "z": "8408bfb2.5391c", "wires": [ [ - "8ae27c1b.bd8dc" + "2345ff9d.8801f" ] ] }, { - "id": "303a5029.c6676", + "id": "5607eea5.cfd0b", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2500.8711166381836, - "y": 884.3296403884888, - "z": "886e5ee7.da286", + "x": 2451.8672103881836, + "y": 902.3257341384888, + "z": "8408bfb2.5391c", "wires": [ [ - "da88cefe.fe269" + "fa337068.73737" ] ] }, { - "id": "da88cefe.fe269", + "id": "fa337068.73737", "type": "set", "name": "set tmp.pidx and ptx.consumed-ar", "xml": "<set>\n<parameter name='tmp.pidx' value='`$pidx`' />\n<parameter name='tmp.provided-ar.' value='`$mdsal-psd.service-data.provided-allotted-resources.provided-allotted-resource[$pidx].`' />\n<parameter name='tmp.found-in-ar' value='true' />\n<parameter name='tmp.ep-available' value='true' />", "comments": "", - "x": 2735.728542327881, - "y": 882.9011726379395, - "z": "886e5ee7.da286", + "x": 2686.724636077881, + "y": 900.8972663879395, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "eb542676.9f39a8", + "id": "38da952f.2ea48a", "type": "comment", "name": "Check existence of other AR in parent service data", "info": "Check if other allotted resource is available.", "comments": "", - "x": 770.9665641784668, - "y": 871.8968677520752, - "z": "886e5ee7.da286", + "x": 721.9626579284668, + "y": 889.8929615020752, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "8b23ecf0.b4c98", + "id": "5e0c5641.7d4838", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1165.9836158752441, - "y": 978.6811304092407, - "z": "886e5ee7.da286", + "x": 1116.9797096252441, + "y": 996.6772241592407, + "z": "8408bfb2.5391c", "wires": [ [ - "eb826fe2.5c753" + "87c536f.c550fc8" ] ] }, { - "id": "4362d0c4.f5cb7", + "id": "bd3642c3.e39b9", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: End points not available\" />\n \n", "comments": "", - "x": 1310.9834938049316, - "y": 1038.68137550354, - "z": "886e5ee7.da286", + "x": 1261.9795875549316, + "y": 1056.67746925354, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "2dc5a41e.bad62c", + "id": "50edb11a.27a72", "type": "other", "name": "outcome 2", "xml": "<outcome value='2'>\n", "comments": "", "outputs": 1, - "x": 1160.9834289550781, - "y": 899.6811561584473, - "z": "886e5ee7.da286", + "x": 1111.9795227050781, + "y": 917.6772499084473, + "z": "8408bfb2.5391c", "wires": [ [ - "3bb83710.9a5ab8" + "5a0c4146.2d462" ] ] }, { - "id": "8ae27c1b.bd8dc", + "id": "2345ff9d.8801f", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2510.0948600769043, - "y": 826.6812963485718, - "z": "886e5ee7.da286", + "x": 2461.0909538269043, + "y": 844.6773900985718, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "cb859d5.2b35e6", + "id": "7618c5b2.5c314c", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 2359.0945014953613, - "y": 883.6811561584473, - "z": "886e5ee7.da286", + "x": 2310.0905952453613, + "y": 901.6772499084473, + "z": "8408bfb2.5391c", "wires": [ [ - "303a5029.c6676" + "5607eea5.cfd0b" ] ] }, { - "id": "44aafa72.840b94", + "id": "9f978556.72d7a8", "type": "switchNode", "name": "switch tmp.found-in-ar", "xml": "<switch test='`$tmp.found-in-ar`'>\n\n", "comments": "", "outputs": 1, - "x": 1547.9834060668945, - "y": 952.4589738845825, - "z": "886e5ee7.da286", + "x": 1498.9794998168945, + "y": 970.4550676345825, + "z": "8408bfb2.5391c", "wires": [ [ - "753da27d.40afec" + "81a77acc.304778" ] ] }, { - "id": "753da27d.40afec", + "id": "81a77acc.304778", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1718.98344039917, - "y": 953.5701951980591, - "z": "886e5ee7.da286", + "x": 1669.97953414917, + "y": 971.5662889480591, + "z": "8408bfb2.5391c", "wires": [ [ - "15dd4c54.90cd64" + "9ffb9a81.6b3718" ] ] }, { - "id": "15dd4c54.90cd64", + "id": "9ffb9a81.6b3718", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1867.9835357666016, - "y": 953.5701942443848, - "z": "886e5ee7.da286", + "x": 1818.9796295166016, + "y": 971.5662879943848, + "z": "8408bfb2.5391c", "wires": [ [ - "2865c930.441376", - "36209682.cdfdca" + "5c659a2b.afc754", + "8cf7d234.3dc16" ] ] }, { - "id": "2877490b.8d1876", + "id": "989dac87.78e81", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2614.101360321045, - "y": 969.7990484237671, - "z": "886e5ee7.da286", + "x": 2565.097454071045, + "y": 987.7951421737671, + "z": "8408bfb2.5391c", "wires": [ [ - "2c4d90a6.77e83" + "ec7b01c7.d1285" ] ] }, { - "id": "bf4a739d.0a26c", + "id": "34bec365.7b96ac", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2605.9531631469727, - "y": 1004.8651332855225, - "z": "886e5ee7.da286", + "x": 2556.9492568969727, + "y": 1022.8612270355225, + "z": "8408bfb2.5391c", "wires": [ [ - "7b79fb1a.832b54" + "a5c61aa1.3f8f98" ] ] }, { - "id": "24a003e8.d381ac", + "id": "fe59f6b4.0bb438", "type": "switchNode", "name": "switch mdsal-psd.service-data.networks_length", "xml": "<switch test='`$mdsal-psd.service-data.networks.network_length`'>\n", "comments": "", "outputs": 1, - "x": 1611.316909790039, - "y": 1053.903814315796, - "z": "886e5ee7.da286", + "x": 1562.313003540039, + "y": 1071.899908065796, + "z": "8408bfb2.5391c", "wires": [ [ - "1aeaa906.662367", - "d808e760.0f46c8" + "e9948315.8ea76", + "6bae8ece.fed41" ] ] }, { - "id": "d808e760.0f46c8", + "id": "6bae8ece.fed41", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1875.3167572021484, - "y": 1033.7925605773926, - "z": "886e5ee7.da286", + "x": 1826.3128509521484, + "y": 1051.7886543273926, + "z": "8408bfb2.5391c", "wires": [ [ - "e18d77e0.ca5578" + "468dd517.bd59ec" ] ] }, { - "id": "1aeaa906.662367", + "id": "e9948315.8ea76", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1865.3168182373047, - "y": 1081.792531967163, - "z": "886e5ee7.da286", + "x": 1816.3129119873047, + "y": 1099.788625717163, + "z": "8408bfb2.5391c", "wires": [ [ - "d8d07b23.4c08f8" + "fdb79d00.1f625" ] ] }, { - "id": "d8d07b23.4c08f8", + "id": "fdb79d00.1f625", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Incorrect state found more then 1 network\" />\n \n", "comments": "", - "x": 2003.9691619873047, - "y": 1083.894292831421, - "z": "886e5ee7.da286", + "x": 1954.9652557373047, + "y": 1101.890386581421, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "3516f8ea.4360d8", + "id": "4b31996c.2e9dd8", "type": "set", "name": "set tmp.network.", "xml": "<set>\n<parameter name='tmp.network.' value='`$mdsal-psd.service-data.networks.network[0].`' />\n\n\n", "comments": "", - "x": 2236.761615753174, - "y": 1034.792730331421, - "z": "886e5ee7.da286", + "x": 2187.757709503174, + "y": 1052.788824081421, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "eb826fe2.5c753", + "id": "87c536f.c550fc8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1333.4279251098633, - "y": 977.7923974990845, - "z": "886e5ee7.da286", + "x": 1284.4240188598633, + "y": 995.7884912490845, + "z": "8408bfb2.5391c", "wires": [ [ - "24a003e8.d381ac" + "fe59f6b4.0bb438" ] ] }, { - "id": "e18d77e0.ca5578", + "id": "468dd517.bd59ec", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 2034.0945281982422, - "y": 1036.7923946380615, - "z": "886e5ee7.da286", + "x": 1985.0906219482422, + "y": 1054.7884883880615, + "z": "8408bfb2.5391c", "wires": [ [ - "3516f8ea.4360d8", - "fa997652.5fc978" + "4b31996c.2e9dd8", + "35ea2ff8.819d3" ] ] }, { - "id": "fa997652.5fc978", + "id": "35ea2ff8.819d3", "type": "for", "name": "for nidx..tmp.network.network-data.network-request-input.network...[]", "xml": "<for index='nidx' start='0' end='`$tmp.network.network-data.network-request-input.network-input-parameters.param_length`' >", "comments": "", "outputs": 1, - "x": 2397.094566345215, - "y": 1082.7925491333008, - "z": "886e5ee7.da286", + "x": 2348.090660095215, + "y": 1100.7886428833008, + "z": "8408bfb2.5391c", "wires": [ [ - "f89cda47.d902a8" + "e42ebe27.208ea" ] ] }, { - "id": "f89cda47.d902a8", + "id": "e42ebe27.208ea", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2443.650634765625, - "y": 1313.7923583984375, - "z": "886e5ee7.da286", + "x": 2394.646728515625, + "y": 1331.7884521484375, + "z": "8408bfb2.5391c", "wires": [ [ - "eff80839.760f28", - "81242a80.6995e8", - "a9774cfd.8e266", - "1742a4f9.42112b", - "e032978.6936268", - "b04f73ae.32d85", - "3f331e86.57efa2", - "d4d17449.0a3768", - "b369fa7c.e07e38", - "642263f7.dd00fc" + "b0894bea.c54948", + "8a2437bd.a21588", + "3ab7c28c.29ebee", + "26dbc77e.931828", + "ea187132.b5e71", + "89603344.a7cf9", + "c98b4f19.64757", + "42370cde.333864", + "542afd70.800e84", + "bb2b418a.7b353" ] ] }, { - "id": "eff80839.760f28", + "id": "b0894bea.c54948", "type": "switchNode", "name": "switch access-node-id", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'access-node-id'`\">", "comments": "", "outputs": 1, - "x": 2720.1608505249023, - "y": 1155.8031058311462, - "z": "886e5ee7.da286", + "x": 2671.1569442749023, + "y": 1173.7991995811462, + "z": "8408bfb2.5391c", "wires": [ [ - "3c2bf5ae.ea0f1a" + "b3ce3deb.b8884" ] ] }, { - "id": "3c2bf5ae.ea0f1a", + "id": "b3ce3deb.b8884", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2909.1604766845703, - "y": 1157.8029704093933, - "z": "886e5ee7.da286", + "x": 2860.1565704345703, + "y": 1175.7990641593933, + "z": "8408bfb2.5391c", "wires": [ [ - "ff19cd9d.b44a2" + "5da4de6b.c7114" ] ] }, { - "id": "ff19cd9d.b44a2", + "id": "5da4de6b.c7114", "type": "set", "name": "set tmp.found-in-network tmp.ep-available", "xml": "<set>\n<parameter name='tmp.found-in-network' value='true' />\n<parameter name='tmp.ep-available' value='true' />", "comments": "", - "x": 3162.1606521606445, - "y": 1157.4030165672302, - "z": "886e5ee7.da286", + "x": 3113.1567459106445, + "y": 1175.3991103172302, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "81242a80.6995e8", + "id": "8a2437bd.a21588", "type": "returnSuccess", "name": "return success", "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", "comments": "", - "x": 2694.150302886963, - "y": 1529.7923970222473, - "z": "886e5ee7.da286", + "x": 2645.146396636963, + "y": 1547.7884907722473, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "295602b3.df648e", + "id": "b5b11ed1.c43bd", "type": "switchNode", "name": "switch tmp.ep-available", "xml": "<switch test='`$tmp.ep-available`'>\n", "comments": "", "outputs": 1, - "x": 686.3167266845703, - "y": 1162.236707687378, - "z": "886e5ee7.da286", + "x": 637.3128204345703, + "y": 1180.232801437378, + "z": "8408bfb2.5391c", "wires": [ [ - "49e6bbf9.737be4", - "71f6c993.d973c8" + "f1872c0f.1837d", + "9ac98463.c4b848" ] ] }, { - "id": "71f6c993.d973c8", + "id": "9ac98463.c4b848", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 904.9834461212158, - "y": 1211.5700645446777, - "z": "886e5ee7.da286", + "x": 855.9795398712158, + "y": 1229.5661582946777, + "z": "8408bfb2.5391c", "wires": [ [ - "71103f59.0e808" + "ab243d87.b71c1" ] ] }, { - "id": "49e6bbf9.737be4", + "id": "f1872c0f.1837d", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 909.8722476959229, - "y": 1120.570125579834, - "z": "886e5ee7.da286", + "x": 860.8683414459229, + "y": 1138.566219329834, + "z": "8408bfb2.5391c", "wires": [ [ - "20d8c152.565e0e" + "d737a2f6.f391a" ] ] }, { - "id": "20d8c152.565e0e", + "id": "d737a2f6.f391a", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1056.8722438812256, - "y": 1122.4589385986328, - "z": "886e5ee7.da286", + "x": 1007.8683376312256, + "y": 1140.4550323486328, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "71103f59.0e808", + "id": "ab243d87.b71c1", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1075.094533920288, - "y": 1209.5700225830078, - "z": "886e5ee7.da286", + "x": 1026.090627670288, + "y": 1227.5661163330078, + "z": "8408bfb2.5391c", "wires": [ [ - "44959453.f2ce1c", - "8bc2c84.596c538", - "431946d9.2130a8" + "19d2fe63.b868b2", + "4546d667.4ae1b8", + "b9f6cbba.591c38" ] ] }, { - "id": "44959453.f2ce1c", + "id": "19d2fe63.b868b2", "type": "switchNode", "name": "switch tmp.found-in-ar", "xml": "<switch test='`$tmp.found-in-ar`'>\n", "comments": "", "outputs": 1, - "x": 1301.2055473327637, - "y": 1176.5700225830078, - "z": "886e5ee7.da286", + "x": 1252.2016410827637, + "y": 1194.5661163330078, + "z": "8408bfb2.5391c", "wires": [ [ - "37b8c945.c963b6", - "bce04597.421bd8" + "50e50db9.eaaab4", + "af3e410f.b9392" ] ] }, { - "id": "37b8c945.c963b6", + "id": "50e50db9.eaaab4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1496.6499938964844, - "y": 1154.570083618164, - "z": "886e5ee7.da286", + "x": 1447.6460876464844, + "y": 1172.566177368164, + "z": "8408bfb2.5391c", "wires": [ [ - "2970ed54.87cac2" + "d166c0ee.6a20a" ] ] }, { - "id": "bce04597.421bd8", + "id": "af3e410f.b9392", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1493.64990234375, - "y": 1202.570068359375, - "z": "886e5ee7.da286", + "x": 1444.64599609375, + "y": 1220.566162109375, + "z": "8408bfb2.5391c", "wires": [ [ - "a5084037.7afaf" + "ffc03ec.99f0ec" ] ] }, { - "id": "2970ed54.87cac2", + "id": "d166c0ee.6a20a", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1684.2056579589844, - "y": 1151.570083618164, - "z": "886e5ee7.da286", + "x": 1635.2017517089844, + "y": 1169.566177368164, + "z": "8408bfb2.5391c", "wires": [ [ - "c697bcdd.29bcd" + "4058090.d4f72f8" ] ] }, { - "id": "a5084037.7afaf", + "id": "ffc03ec.99f0ec", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1681.20556640625, - "y": 1201.570068359375, - "z": "886e5ee7.da286", + "x": 1632.20166015625, + "y": 1219.566162109375, + "z": "8408bfb2.5391c", "wires": [ [ - "10ed7f5b.5c00f1" + "defdcdc4.5501c" ] ] }, { - "id": "3b7ac17e.0f823e", + "id": "ab3d5af0.b7c608", "type": "comment", "name": "GET connection-attachment-ar to store AR data from mdsal", "info": "", "comments": "", - "x": 2193.4767417907715, - "y": 438.50785398483276, - "z": "886e5ee7.da286", + "x": 2144.4728355407715, + "y": 456.50394773483276, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "71841c48.209304", + "id": "c32af7d5.1a65c8", "type": "comment", "name": "Set source end point", "info": "", "comments": "", - "x": 682.9766387939453, - "y": 527.2578740119934, - "z": "886e5ee7.da286", + "x": 633.9727325439453, + "y": 545.2539677619934, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "d3f500c4.1bfb3", + "id": "1a3613fe.fb52ac", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 733.9727325439453, - "y": 736.0039968490601, - "z": "886e5ee7.da286", + "x": 684.9688262939453, + "y": 754.0000905990601, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "7ecc4648.197a88", + "id": "29a80022.cf94", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1093.972885131836, - "y": 807.0039834976196, - "z": "886e5ee7.da286", + "x": 1044.968978881836, + "y": 825.0000772476196, + "z": "8408bfb2.5391c", "wires": [ [ - "2393b2c8.86b16e" + "d5049708.bf05f8" ] ] }, { - "id": "dfe397a0.b9ba28", + "id": "6ef3a6c9.24a468", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1085.8246879577637, - "y": 842.070068359375, - "z": "886e5ee7.da286", + "x": 1036.8207817077637, + "y": 860.066162109375, + "z": "8408bfb2.5391c", "wires": [ [ - "1a3d638c.318b9c" + "c085c15a.7561d" ] ] }, { - "id": "1a3d638c.318b9c", + "id": "c085c15a.7561d", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: Parent service data not available\" />\n \n", "comments": "", - "x": 1231.9734687805176, - "y": 841.3374795913696, - "z": "886e5ee7.da286", + "x": 1182.9695625305176, + "y": 859.3335733413696, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "2393b2c8.86b16e", + "id": "d5049708.bf05f8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1224.9729804992676, - "y": 807.0040445327759, - "z": "886e5ee7.da286", + "x": 1175.9690742492676, + "y": 825.0001382827759, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "7b79fb1a.832b54", + "id": "a5c61aa1.3f8f98", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"404\" />\n <parameter name=\"error-message\" value=\"Error: SOTN provided attachment resource not found\" />\n \n", "comments": "", - "x": 2755.973213195801, - "y": 1005.00417137146, - "z": "886e5ee7.da286", + "x": 2706.969306945801, + "y": 1023.00026512146, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "2c4d90a6.77e83", + "id": "ec7b01c7.d1285", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2740.9733352661133, - "y": 972.0041561126709, - "z": "886e5ee7.da286", + "x": 2691.9694290161133, + "y": 990.0002498626709, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "aa223239.c5978", + "id": "7282ea04.8f4254", "type": "set", "name": "set tmp.found-in-ar tmp.found-in-network tmp.ep-available to false", "xml": "<set>\n<parameter name='tmp.found-in-ar' value='false' />\n<parameter name='tmp.found-in-network' value='false' />\n<parameter name='tmp.ep-available' value='false' />", "comments": "", - "x": 819.9726715087891, - "y": 909.0039710998535, - "z": "886e5ee7.da286", + "x": 770.9687652587891, + "y": 927.0000648498535, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "3eb9877e.29bda8", + "id": "c2ebe251.65d25", "type": "comment", "name": "If other EP exists set destination end point", "info": "Check if other allotted resource is available.", "comments": "", - "x": 736.9726715087891, - "y": 1087.0039196014404, - "z": "886e5ee7.da286", + "x": 687.9687652587891, + "y": 1105.0000133514404, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "6bea5b5c.cc56a4", + "id": "22068d64.f16a22", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1476.9727935791016, - "y": 1414.0042009353638, - "z": "886e5ee7.da286", + "x": 1427.9688873291016, + "y": 1432.0002946853638, + "z": "8408bfb2.5391c", "wires": [ [ - "873a1eb1.c2b41", - "ec2f2c59.85a72", - "4344ccac.0cc2d4", - "3e861847.acb138", - "dbce043e.c1b088", - "6cf22112.6f2ff", - "447be204.cdf4fc", - "3722b20a.c8338e" + "52d775a5.5ac3dc", + "124f9640.78093a", + "f7902989.b82738", + "a976aa7c.720c08", + "fd92d693.19e5f8", + "a34cb9dd.d28f48", + "724051d8.4335d", + "aa8cb96a.2b0388" ] ] }, { - "id": "873a1eb1.c2b41", + "id": "52d775a5.5ac3dc", "type": "switchNode", "name": "switch access-node-id", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-node-id'`\">", "comments": "", "outputs": 1, - "x": 1719.4830951690674, - "y": 1284.014597415924, - "z": "886e5ee7.da286", + "x": 1670.4791889190674, + "y": 1302.010691165924, + "z": "8408bfb2.5391c", "wires": [ [ - "e78fa7d0.0dc8a8" + "7d3f8794.bd4838" ] ] }, { - "id": "ec2f2c59.85a72", + "id": "124f9640.78093a", "type": "returnSuccess", "name": "return success", "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", "comments": "", - "x": 1692.4730472564697, - "y": 1589.0045609474182, - "z": "886e5ee7.da286", + "x": 1643.4691410064697, + "y": 1607.0006546974182, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "4344ccac.0cc2d4", + "id": "f7902989.b82738", "type": "switchNode", "name": "switch access-ltp-id", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-ltp-id'`\">", "comments": "", "outputs": 1, - "x": 1710.9729251861572, - "y": 1327.7821288108826, - "z": "886e5ee7.da286", + "x": 1661.9690189361572, + "y": 1345.7782225608826, + "z": "8408bfb2.5391c", "wires": [ [ - "e0447eeb.b4df4" + "f4be3b97.453c38" ] ] }, { - "id": "3e861847.acb138", + "id": "a976aa7c.720c08", "type": "switchNode", "name": "switch clientSignal", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'clientSignal'`\">", "comments": "", "outputs": 1, - "x": 1704.9729633331299, - "y": 1373.782175540924, - "z": "886e5ee7.da286", + "x": 1655.9690570831299, + "y": 1391.778269290924, + "z": "8408bfb2.5391c", "wires": [ [ - "851a1f33.b90d6" + "2d6f043a.f526ac" ] ] }, { - "id": "dbce043e.c1b088", + "id": "fd92d693.19e5f8", "type": "switchNode", "name": "switch cVLAN", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'cVLAN'`\">", "comments": "", "outputs": 1, - "x": 1688.9624652862549, - "y": 1412.771677494049, - "z": "886e5ee7.da286", + "x": 1639.9585590362549, + "y": 1430.767771244049, + "z": "8408bfb2.5391c", "wires": [ [ - "cde9b854.f3d7e8" + "8a9f16c4.814038" ] ] }, { - "id": "e78fa7d0.0dc8a8", + "id": "7d3f8794.bd4838", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1897.1950092315674, - "y": 1284.6709694862366, - "z": "886e5ee7.da286", + "x": 1848.1911029815674, + "y": 1302.6670632362366, + "z": "8408bfb2.5391c", "wires": [ [ - "bfb532e5.03a1a" + "a7752993.c80d28" ] ] }, { - "id": "bfb532e5.03a1a", + "id": "a7752993.c80d28", "type": "set", "name": "set dst-access-node-id", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$tmp.ep.parameters.param[$idx].value`' />", "comments": "", - "x": 2072.1950092315674, - "y": 1284.270944595337, - "z": "886e5ee7.da286", + "x": 2023.1911029815674, + "y": 1302.267038345337, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "e0447eeb.b4df4", + "id": "f4be3b97.453c38", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1892.6848773956299, - "y": 1327.438425540924, - "z": "886e5ee7.da286", + "x": 1843.6809711456299, + "y": 1345.434519290924, + "z": "8408bfb2.5391c", "wires": [ [ - "b05efaae.c42928" + "d0325deb.a98b5" ] ] }, { - "id": "851a1f33.b90d6", + "id": "2d6f043a.f526ac", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1892.6848773956299, - "y": 1373.438425540924, - "z": "886e5ee7.da286", + "x": 1843.6809711456299, + "y": 1391.434519290924, + "z": "8408bfb2.5391c", "wires": [ [ - "24c05af2.8faa76" + "ecea19c4.1c06b8" ] ] }, { - "id": "cde9b854.f3d7e8", + "id": "8a9f16c4.814038", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1892.6743793487549, - "y": 1412.4280495643616, - "z": "886e5ee7.da286", + "x": 1843.6704730987549, + "y": 1430.4241433143616, + "z": "8408bfb2.5391c", "wires": [ [ - "27931eaa.157cb2" + "d2defa52.a9bb28" ] ] }, { - "id": "8bc2c84.596c538", + "id": "4546d667.4ae1b8", "type": "for", "name": "for idx..tmp.ep.parameters[]", "xml": "<for index='idx' start='0' end='`$tmp.ep.parameters.param_length`'>\n\n", "comments": "", "outputs": 1, - "x": 1329.97265625, - "y": 1302.00390625, - "z": "886e5ee7.da286", + "x": 1280.96875, + "y": 1320, + "z": "8408bfb2.5391c", "wires": [ [ - "6bea5b5c.cc56a4" + "22068d64.f16a22" ] ] }, { - "id": "c697bcdd.29bcd", + "id": "4058090.d4f72f8", "type": "set", "name": "set tmp.ep.parameters", "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$mdsal-other-ar.connection-attachment-allotted-resource[0].allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.`' />\n", "comments": "", - "x": 1895.9727115631104, - "y": 1151.0039806365967, - "z": "886e5ee7.da286", + "x": 1846.9688053131104, + "y": 1169.0000743865967, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "10ed7f5b.5c00f1", + "id": "defdcdc4.5501c", "type": "set", "name": "set tmp.ep.parameters", "xml": "<set>\n<parameter name='tmp.ep.parameters.' value='`$tmp.network.network-data.network-request-input.network-input-parameters.`' />\n", "comments": "", - "x": 1892.972620010376, - "y": 1197.0039653778076, - "z": "886e5ee7.da286", + "x": 1843.968713760376, + "y": 1215.0000591278076, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "b05efaae.c42928", + "id": "d0325deb.a98b5", "type": "set", "name": "set dst-access-node-id", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$tmp.ep.parameters.param[$idx].value`' />", "comments": "", - "x": 2069.9728412628174, - "y": 1327.0042214393616, - "z": "886e5ee7.da286", + "x": 2020.9689350128174, + "y": 1345.0003151893616, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "24c05af2.8faa76", + "id": "ecea19c4.1c06b8", "type": "set", "name": "set dst-clientSignal", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.clientSignal' value='`$tmp.ep.parameters.param[$idx].value`' />", "comments": "", - "x": 2063.9728412628174, - "y": 1371.0042214393616, - "z": "886e5ee7.da286", + "x": 2014.9689350128174, + "y": 1389.0003151893616, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "27931eaa.157cb2", + "id": "d2defa52.a9bb28", "type": "set", "name": "set dst-cVLAN", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.cVLAN' value='`$tmp.ep.parameters.param[$idx].value`' />", "comments": "", - "x": 2054.9728412628174, - "y": 1410.0042214393616, - "z": "886e5ee7.da286", + "x": 2005.9689350128174, + "y": 1428.0003151893616, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "1eb5604c.140ea", + "id": "bdd4e0c8.a95a4", "type": "comment", "name": "Get controller info and send request", "info": "", "comments": "", - "x": 1936.972713470459, - "y": 1881.004059791565, - "z": "886e5ee7.da286", + "x": 1887.968807220459, + "y": 1899.000153541565, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "4c07dee.6ce442", + "id": "dce4c016.eb68d", "type": "execute", "name": "execute RestApiCallNode Create ethernet Service", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1989.97314453125, - "y": 2024.0048599243164, - "z": "886e5ee7.da286", + "x": 1940.96923828125, + "y": 2042.0009536743164, + "z": "8408bfb2.5391c", "wires": [ [ - "ebb13c18.63d5b", - "27ef146.5170fec" + "d73f8f6a.bf95e", + "93c5c8ec.0f2668" ] ] }, { - "id": "ebb13c18.63d5b", + "id": "d73f8f6a.bf95e", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2255.972869873047, - "y": 2053.004982948303, - "z": "886e5ee7.da286", + "x": 2206.968963623047, + "y": 2071.001076698303, + "z": "8408bfb2.5391c", "wires": [ [ - "3abdd3d8.70de3c" + "56a9c0b6.f8192" ] ] }, { - "id": "3abdd3d8.70de3c", + "id": "56a9c0b6.f8192", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "comments": "", "outputs": 1, - "x": 2403.972869873047, - "y": 2051.0048608779907, - "z": "886e5ee7.da286", + "x": 2354.968963623047, + "y": 2069.0009546279907, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "252b7082.c5a2b", + "id": "9708b12d.0139f", "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 executing Create vpn rest api\" />\n", "comments": "", - "x": 2385.972900390625, - "y": 1998.0049209594727, - "z": "886e5ee7.da286", + "x": 2336.968994140625, + "y": 2016.0010147094727, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "27ef146.5170fec", + "id": "93c5c8ec.0f2668", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 2246.9728088378906, - "y": 1998.0049209594727, - "z": "886e5ee7.da286", + "x": 2197.9689025878906, + "y": 2016.0010147094727, + "z": "8408bfb2.5391c", "wires": [ [ - "252b7082.c5a2b" + "9708b12d.0139f" ] ] }, { - "id": "b6a98854.3d7a58", + "id": "1b789a42.5731a6", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 908.7350807189941, - "y": 2104.9576148986816, - "z": "886e5ee7.da286", + "x": 859.7311744689941, + "y": 2122.9537086486816, + "z": "8408bfb2.5391c", "wires": [ [ - "35924502.aff77a" + "c0a71186.8f35f" ] ] }, { - "id": "35924502.aff77a", + "id": "c0a71186.8f35f", "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=\"AAI failed\" />\n", "comments": "", - "x": 1075.2589015960693, - "y": 2131.5766220092773, - "z": "886e5ee7.da286", + "x": 1026.2549953460693, + "y": 2149.5727157592773, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "89209832.9697d8", + "id": "38fb2ac3.f4e026", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 910.8303089141846, - "y": 2152.719457626343, - "z": "886e5ee7.da286", + "x": 861.8264026641846, + "y": 2170.715551376343, + "z": "8408bfb2.5391c", "wires": [ [ - "35924502.aff77a" + "c0a71186.8f35f" ] ] }, { - "id": "48f4ae61.b756e", + "id": "25a98b94.f96284", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 682.7827243804932, - "y": 2093.3067779541016, - "z": "886e5ee7.da286", + "x": 633.7788181304932, + "y": 2111.3028717041016, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "e1d773b9.aec52", + "id": "d29d9e3d.acace", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 697.5504207611084, - "y": 2014.8322591781616, - "z": "886e5ee7.da286", + "x": 648.5465145111084, + "y": 2032.8283529281616, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "5e07c169.5398c", + "id": "48b1d949.e92058", "type": "returnSuccess", "name": "return success", "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", "comments": "", - "x": 657.9635925292969, - "y": 2200.4480476379395, - "z": "886e5ee7.da286", + "x": 608.9596862792969, + "y": 2218.4441413879395, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "eba0b0a5.90799", + "id": "d41d9b4e.b5c868", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 750.2825031280518, - "y": 1939.4731121063232, - "z": "886e5ee7.da286", + "x": 701.2785968780518, + "y": 1957.4692058563232, + "z": "8408bfb2.5391c", "wires": [ [ - "88c5e9d5.563c18", - "ade401d9.d9d7d", - "c5f54133.a8e19" + "cbf0048f.1976a8", + "ceabdd96.4d7c2", + "fd522403.9ba2f8" ] ] }, { - "id": "88c5e9d5.563c18", + "id": "cbf0048f.1976a8", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1004.9239253997803, - "y": 1983.8045063018799, - "z": "886e5ee7.da286", + "x": 955.9200191497803, + "y": 2001.8006000518799, + "z": "8408bfb2.5391c", "wires": [ [ - "effa0e45.a8e79" + "97e00130.f2f9" ] ] }, { - "id": "ade401d9.d9d7d", + "id": "ceabdd96.4d7c2", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1006.9239482879639, - "y": 1942.3044704422355, - "z": "886e5ee7.da286", + "x": 957.9200420379639, + "y": 1960.3005641922355, + "z": "8408bfb2.5391c", "wires": [ [ - "effa0e45.a8e79" + "97e00130.f2f9" ] ] }, { - "id": "c5f54133.a8e19", + "id": "fd522403.9ba2f8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1010.6740322113037, - "y": 1893.6616230010986, - "z": "886e5ee7.da286", + "x": 961.6701259613037, + "y": 1911.6577167510986, + "z": "8408bfb2.5391c", "wires": [ [ - "f45f0673.a366c8" + "977fddb0.04443" ] ] }, { - "id": "effa0e45.a8e79", + "id": "97e00130.f2f9", "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 updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1165.67405128479, - "y": 1962.054536819458, - "z": "886e5ee7.da286", + "x": 1116.67014503479, + "y": 1980.050630569458, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "f45f0673.a366c8", + "id": "977fddb0.04443", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1138.3299770355225, - "y": 1895.8537912368774, - "z": "886e5ee7.da286", + "x": 1089.3260707855225, + "y": 1913.8498849868774, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "6a3ffb44.1e9004", + "id": "43ca1b3a.8238a4", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />", "comments": "", - "x": 652.4961185455322, - "y": 1773.8540132045746, - "z": "886e5ee7.da286", + "x": 603.4922122955322, + "y": 1791.8501069545746, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "1605273a.149319", + "id": "a7a8f21b.2788e", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 669.78196144104, - "y": 1846.4736108779907, - "z": "886e5ee7.da286", + "x": 620.77805519104, + "y": 1864.4697046279907, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "93c61c2f.6bcfd", + "id": "e85cfb03.0cc698", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 719.7690410614014, - "y": 1883.4246912002563, - "z": "886e5ee7.da286", + "x": 670.7651348114014, + "y": 1901.4207849502563, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "6bb92832.c7ba68", + "id": "b210c8e1.8a1f58", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 666.3376598358154, - "y": 1813.028663635254, - "z": "886e5ee7.da286", + "x": 617.3337535858154, + "y": 1831.024757385254, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "4d71f89f.b7cd18", + "id": "c1cb8c0d.2e37e", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 779.67112159729, - "y": 1734.0286157131195, - "z": "886e5ee7.da286", + "x": 730.66721534729, + "y": 1752.0247094631195, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "5c1a3e33.04e12", + "id": "df3f7f58.d001f", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 721.2509479522705, - "y": 1701.4419174194336, - "z": "886e5ee7.da286", + "x": 672.2470417022705, + "y": 1719.4380111694336, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "8f7266fc.c45038", + "id": "37ff9c4b.85c4b4", "type": "update", "name": "update AAI allotted-resource", - "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Active\" />\n", + "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n\t<parameter name=\"description\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Active\" />\n", "comments": "", "outputs": 1, - "x": 709.2270030975342, - "y": 2130.7589206695557, - "z": "886e5ee7.da286", + "x": 660.2230968475342, + "y": 2148.7550144195557, + "z": "8408bfb2.5391c", "wires": [ [ - "b6a98854.3d7a58", - "89209832.9697d8" + "1b789a42.5731a6", + "38fb2ac3.f4e026" ] ] }, { - "id": "f51b8e7a.4294a", + "id": "21d3ff91.ea3ad", "type": "execute", "name": "execute RestApiCallNode getPath from OOF", - "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", + "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"http://oof.api.simpledemo.onap.org:8698/api/oof/v1/route\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", "comments": "", "outputs": 1, - "x": 1517.976963043213, - "y": 1693.2585725784302, - "z": "886e5ee7.da286", + "x": 1468.973056793213, + "y": 1711.2546663284302, + "z": "8408bfb2.5391c", "wires": [ [ - "475ee246.c4d58c", - "951a0e07.b45a7" + "bafb67de.3074a8", + "5a6c0e0a.12b56" ] ] }, { - "id": "475ee246.c4d58c", + "id": "bafb67de.3074a8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1757.9771041870117, - "y": 1717.258542060852, - "z": "886e5ee7.da286", + "x": 1708.9731979370117, + "y": 1735.254635810852, + "z": "8408bfb2.5391c", "wires": [ [ - "2cebb233.b139be" + "710b598a.58f428" ] ] }, { - "id": "dfc21d27.a29bd", + "id": "18674100.77537f", "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 executing OOF api\" />\n", "comments": "", - "x": 1896.977138519287, - "y": 1666.2586336135864, - "z": "886e5ee7.da286", + "x": 1847.973232269287, + "y": 1684.2547273635864, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "951a0e07.b45a7", + "id": "5a6c0e0a.12b56", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1756.9768905639648, - "y": 1666.258632659912, - "z": "886e5ee7.da286", + "x": 1707.9729843139648, + "y": 1684.254726409912, + "z": "8408bfb2.5391c", "wires": [ [ - "dfc21d27.a29bd" + "18674100.77537f" ] ] }, { - "id": "d7025fc8.34b0f", + "id": "26f2f7bd.b11308", "type": "comment", "name": "Get VPNs from OOF", "info": "", "comments": "", - "x": 1503.980884552002, - "y": 1660.2625722885132, - "z": "886e5ee7.da286", + "x": 1454.976978302002, + "y": 1678.2586660385132, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "7306bfe1.33065", + "id": "bfb31be6.a42bf8", "type": "for", "name": "for vidx..oof.vpns_length[]", "xml": "<for index='vidx' start='0' end='`$oof.vpns_length`' >", "comments": "", "outputs": 1, - "x": 1470.9766845703125, - "y": 1798.50830078125, - "z": "886e5ee7.da286", + "x": 1408.972900390625, + "y": 1793.50439453125, + "z": "8408bfb2.5391c", "wires": [ [ - "3edaf3bd.0b304c" + "7ccc98bc.08a1c8" ] ] }, { - "id": "9a8b6203.49db4", + "id": "b17db7bf.7ed888", "type": "comment", "name": "Loop through VPN and configure them", "info": "", "comments": "", - "x": 1500.977138519287, - "y": 1761.0086650848389, - "z": "886e5ee7.da286", + "x": 1454.9733505249023, + "y": 1928.0047721862793, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "a9774cfd.8e266", + "id": "3ab7c28c.29ebee", "type": "switchNode", "name": "switch name", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'name'`\">\n \n", "comments": "", "outputs": 1, - "x": 2697.760986328125, - "y": 1247.125732421875, - "z": "886e5ee7.da286", + "x": 2648.757080078125, + "y": 1265.121826171875, + "z": "8408bfb2.5391c", "wires": [ [ - "a313d119.ec211" + "80770609.775ee8" ] ] }, { - "id": "a313d119.ec211", + "id": "80770609.775ee8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2886.760955810547, - "y": 1247.125717639923, - "z": "886e5ee7.da286", + "x": 2837.757049560547, + "y": 1265.121811389923, + "z": "8408bfb2.5391c", "wires": [ [ - "3a640881.1aa1d8" + "e1e890c6.ecbaa" ] ] }, { - "id": "3a640881.1aa1d8", + "id": "e1e890c6.ecbaa", "type": "set", "name": "set etht-svc-name & bandwidth-profile-name", "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n<parameter name='prop.global.sotn.bandwidth-profile-name' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3127.76127243042, - "y": 1246.7257723808289, - "z": "886e5ee7.da286", + "x": 3078.75736618042, + "y": 1264.7218661308289, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "1742a4f9.42112b", + "id": "26dbc77e.931828", "type": "switchNode", "name": "switch description", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'description'`\">\n", "comments": "", "outputs": 1, - "x": 2710.6008644104004, - "y": 1282.1258273124695, - "z": "886e5ee7.da286", + "x": 2661.5969581604004, + "y": 1300.1219210624695, + "z": "8408bfb2.5391c", "wires": [ [ - "26c6398e.ae40a6" + "85ca2389.bb6f4" ] ] }, { - "id": "26c6398e.ae40a6", + "id": "85ca2389.bb6f4", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2885.600929260254, - "y": 1284.1258130073547, - "z": "886e5ee7.da286", + "x": 2836.597023010254, + "y": 1302.1219067573547, + "z": "8408bfb2.5391c", "wires": [ [ - "ec7ec9cc.624b18" + "d8003739.5fe0f8" ] ] }, { - "id": "ec7ec9cc.624b18", + "id": "d8003739.5fe0f8", "type": "set", "name": "set etht-svc-descr", "xml": "<set>\n<parameter name='prop.global.sotn.etht-svc-descr' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3041.9342460632324, - "y": 1281.5868878364563, - "z": "886e5ee7.da286", + "x": 2992.9303398132324, + "y": 1299.5829815864563, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "e032978.6936268", + "id": "ea187132.b5e71", "type": "switchNode", "name": "switch tenantId", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'tenantId'`\">\n", "comments": "", "outputs": 1, - "x": 2705.983127593994, - "y": 1315.4592175483704, - "z": "886e5ee7.da286", + "x": 2656.979221343994, + "y": 1333.4553112983704, + "z": "8408bfb2.5391c", "wires": [ [ - "a0536f01.8cf66" + "b902a644.d22b48" ] ] }, { - "id": "a0536f01.8cf66", + "id": "b902a644.d22b48", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2883.9831314086914, - "y": 1319.4590954780579, - "z": "886e5ee7.da286", + "x": 2834.9792251586914, + "y": 1337.4551892280579, + "z": "8408bfb2.5391c", "wires": [ [ - "a1009c69.a8fed" + "f54bc445.403788" ] ] }, { - "id": "a1009c69.a8fed", + "id": "f54bc445.403788", "type": "set", "name": "set tenantId", "xml": "<set>\n<parameter name='prop.global.sotn.tenantId' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3021.9833183288574, - "y": 1316.0590710639954, - "z": "886e5ee7.da286", + "x": 2972.9794120788574, + "y": 1334.0551648139954, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "3f331e86.57efa2", + "id": "c98b4f19.64757", "type": "switchNode", "name": "switch cir", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'cir'`\">\n", "comments": "", "outputs": 1, - "x": 2688.822727203369, - "y": 1388.4591727256775, - "z": "886e5ee7.da286", + "x": 2639.818820953369, + "y": 1406.4552664756775, + "z": "8408bfb2.5391c", "wires": [ [ - "937bdc12.dc2f3" + "9783697c.7bd558" ] ] }, { - "id": "937bdc12.dc2f3", + "id": "9783697c.7bd558", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2883.8227920532227, - "y": 1389.4591727256775, - "z": "886e5ee7.da286", + "x": 2834.8188858032227, + "y": 1407.4552664756775, + "z": "8408bfb2.5391c", "wires": [ [ - "5cef9c18.c1e3e4" + "466b0eb3.bb2f5" ] ] }, { - "id": "5cef9c18.c1e3e4", + "id": "466b0eb3.bb2f5", "type": "set", "name": "set cir", "xml": "<set>\n<parameter name='prop.sotn.cir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3008.15629196167, - "y": 1387.920247554779, - "z": "886e5ee7.da286", + "x": 2959.15238571167, + "y": 1405.916341304779, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "b04f73ae.32d85", + "id": "89603344.a7cf9", "type": "switchNode", "name": "switch vpnType", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'vpnType'`\">\n", "comments": "", "outputs": 1, - "x": 2703.131015777588, - "y": 1351.236882686615, - "z": "886e5ee7.da286", + "x": 2654.127109527588, + "y": 1369.232976436615, + "z": "8408bfb2.5391c", "wires": [ [ - "56ebc42c.8ac03c" + "87ab7779.c52db8" ] ] }, { - "id": "56ebc42c.8ac03c", + "id": "87ab7779.c52db8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2885.131202697754, - "y": 1354.236867427826, - "z": "886e5ee7.da286", + "x": 2836.127296447754, + "y": 1372.232961177826, + "z": "8408bfb2.5391c", "wires": [ [ - "74808c5.5744174" + "3f32f379.afc74c" ] ] }, { - "id": "74808c5.5744174", + "id": "3f32f379.afc74c", "type": "set", "name": "set vpnType", "xml": "<set>\n<parameter name='prop.global.sotn.vpnType' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3021.464946746826, - "y": 1350.6981091499329, - "z": "886e5ee7.da286", + "x": 2972.461040496826, + "y": 1368.6942028999329, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "d4d17449.0a3768", + "id": "42370cde.333864", "type": "switchNode", "name": "switch eir", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'eir'`\">\n", "comments": "", "outputs": 1, - "x": 2684.1130714416504, - "y": 1422.1570801734924, - "z": "886e5ee7.da286", + "x": 2635.1091651916504, + "y": 1440.1531739234924, + "z": "8408bfb2.5391c", "wires": [ [ - "f8a0cc6a.69a85" + "15d6de1e.22e142" ] ] }, { - "id": "f8a0cc6a.69a85", + "id": "15d6de1e.22e142", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2884.1133193969727, - "y": 1425.1570191383362, - "z": "886e5ee7.da286", + "x": 2835.1094131469727, + "y": 1443.1531128883362, + "z": "8408bfb2.5391c", "wires": [ [ - "f369a42b.d52e88" + "b64e8009.4dda9" ] ] }, { - "id": "f369a42b.d52e88", + "id": "b64e8009.4dda9", "type": "set", "name": "set eir", "xml": "<set>\n<parameter name='prop.global.sotn.eir' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3007.4469413757324, - "y": 1424.6180787086487, - "z": "886e5ee7.da286", + "x": 2958.4430351257324, + "y": 1442.6141724586487, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "b369fa7c.e07e38", + "id": "542afd70.800e84", "type": "switchNode", "name": "switch colorAware", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'colorAware'`\">\n", "comments": "", "outputs": 1, - "x": 2709.113681793213, - "y": 1456.1569590568542, - "z": "886e5ee7.da286", + "x": 2660.109775543213, + "y": 1474.1530528068542, + "z": "8408bfb2.5391c", "wires": [ [ - "6206f9dc.040438" + "c02edc40.a4984" ] ] }, { - "id": "6206f9dc.040438", + "id": "c02edc40.a4984", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2880.1135025024414, - "y": 1462.1568975448608, - "z": "886e5ee7.da286", + "x": 2831.1095962524414, + "y": 1480.1529912948608, + "z": "8408bfb2.5391c", "wires": [ [ - "be68a268.af6ac" + "bc113f5e.da64f" ] ] }, { - "id": "be68a268.af6ac", + "id": "bc113f5e.da64f", "type": "set", "name": "set colorAware", "xml": "<set>\n<parameter name='prop.global.sotn.colorAware' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3028.44681930542, - "y": 1462.6181101799011, - "z": "886e5ee7.da286", + "x": 2979.44291305542, + "y": 1480.6142039299011, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "642263f7.dd00fc", + "id": "bb2b418a.7b353", "type": "switchNode", "name": "switch couplingFlag", "xml": "<switch test=\"`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].name == 'couplingFlag'`\">\n", "comments": "", "outputs": 1, - "x": 2711.1136207580566, - "y": 1492.1570210456848, - "z": "886e5ee7.da286", + "x": 2662.1097145080566, + "y": 1510.1531147956848, + "z": "8408bfb2.5391c", "wires": [ [ - "fa5db057.82465" + "7f802b07.ecbf24" ] ] }, { - "id": "fa5db057.82465", + "id": "7f802b07.ecbf24", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2883.1135025024414, - "y": 1501.1569905281067, - "z": "886e5ee7.da286", + "x": 2834.1095962524414, + "y": 1519.1530842781067, + "z": "8408bfb2.5391c", "wires": [ [ - "6df9a5ad.64aebc" + "c56e4808.694228" ] ] }, { - "id": "6df9a5ad.64aebc", + "id": "c56e4808.694228", "type": "set", "name": "set couplingFlag", "xml": "<set>\n<parameter name='prop.global.sotn.couplingFlag' value='`$tmp.network.network-data.network-request-input.network-input-parameters.param[$nidx].value`' />\n", "comments": "", - "x": 3036.44681930542, - "y": 1501.6181111335754, - "z": "886e5ee7.da286", + "x": 2987.44291305542, + "y": 1519.6142048835754, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "dcfbfca6.40021", + "id": "88779084.b1b7a", "type": "comment", "name": "Check if other EP exists in SOTNConnectionResource", "info": "", "comments": "", - "x": 2842.316650390625, - "y": 1110.7923583984375, - "z": "886e5ee7.da286", + "x": 2793.312744140625, + "y": 1128.7884521484375, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "d09beabc.c794f8", + "id": "218cf941.d932e6", "type": "comment", "name": "Get other global parameters from network", "info": "", "comments": "", - "x": 2778.31640625, - "y": 1196.7923583984375, - "z": "886e5ee7.da286", + "x": 2729.3125, + "y": 1214.7884521484375, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "6cf22112.6f2ff", + "id": "a34cb9dd.d28f48", "type": "switchNode", "name": "switch access-provider-id", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-provider-id'`\">", "comments": "", "outputs": 1, - "x": 1726.5387592315674, - "y": 1458.2368874549866, - "z": "886e5ee7.da286", + "x": 1677.5348529815674, + "y": 1476.2329812049866, + "z": "8408bfb2.5391c", "wires": [ [ - "c84add66.981c8" + "5225a75b.b6a278" ] ] }, { - "id": "c84add66.981c8", + "id": "5225a75b.b6a278", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1913.5387592315674, - "y": 1454.2368874549866, - "z": "886e5ee7.da286", + "x": 1864.5348529815674, + "y": 1472.2329812049866, + "z": "8408bfb2.5391c", "wires": [ [ - "d4a1069.e5c08f8" + "bb23f0a1.13aff" ] ] }, { - "id": "d4a1069.e5c08f8", + "id": "bb23f0a1.13aff", "type": "set", "name": "set access-provider-id", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n", "comments": "", - "x": 2081.5387592315674, - "y": 1454.8368935585022, - "z": "886e5ee7.da286", + "x": 2032.5348529815674, + "y": 1472.8329873085022, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "447be204.cdf4fc", + "id": "724051d8.4335d", "type": "switchNode", "name": "switch access-client-id", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-client-id'`\">", "comments": "", "outputs": 1, - "x": 1717.5387744903564, - "y": 1501.2473359107971, - "z": "886e5ee7.da286", + "x": 1668.5348682403564, + "y": 1519.2434296607971, + "z": "8408bfb2.5391c", "wires": [ [ - "ced037b4.e37178" + "ff129381.47439" ] ] }, { - "id": "ced037b4.e37178", + "id": "ff129381.47439", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1904.5387744903564, - "y": 1497.2473359107971, - "z": "886e5ee7.da286", + "x": 1855.5348682403564, + "y": 1515.2434296607971, + "z": "8408bfb2.5391c", "wires": [ [ - "f03bab32.57be38" + "646b3044.5a019" ] ] }, { - "id": "f03bab32.57be38", + "id": "646b3044.5a019", "type": "set", "name": "set access-client-id", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n", "comments": "", - "x": 2072.5387744903564, - "y": 1497.8473420143127, - "z": "886e5ee7.da286", + "x": 2023.5348682403564, + "y": 1515.8434357643127, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "3722b20a.c8338e", + "id": "aa8cb96a.2b0388", "type": "switchNode", "name": "switch access-topology-id", "xml": "<switch test=\"`$tmp.ep.parameters.param[$idx].name == 'access-topology-id'`\">", "comments": "", "outputs": 1, - "x": 1730.538719177246, - "y": 1543.2473669052124, - "z": "886e5ee7.da286", + "x": 1681.534812927246, + "y": 1561.2434606552124, + "z": "8408bfb2.5391c", "wires": [ [ - "b6a6f2db.60fe6" + "850aea86.efd2b8" ] ] }, { - "id": "b6a6f2db.60fe6", + "id": "850aea86.efd2b8", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 1917.538719177246, - "y": 1539.2473669052124, - "z": "886e5ee7.da286", + "x": 1868.534812927246, + "y": 1557.2434606552124, + "z": "8408bfb2.5391c", "wires": [ [ - "e9af1870.fc5978" + "684120ad.73ee4" ] ] }, { - "id": "e9af1870.fc5978", + "id": "684120ad.73ee4", "type": "set", "name": "set access-topology-id", "xml": "<set>\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$tmp.ep.parameters.param[$idx].value`' />\n", "comments": "", - "x": 2085.538719177246, - "y": 1539.847373008728, - "z": "886e5ee7.da286", + "x": 2036.534812927246, + "y": 1557.843466758728, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "3edaf3bd.0b304c", + "id": "7ccc98bc.08a1c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1676.0940551757812, - "y": 1796.3482403755188, - "z": "886e5ee7.da286", + "x": 1632.090217590332, + "y": 1830.3444538116455, + "z": "8408bfb2.5391c", "wires": [ [ - "13419eef.5a7671", - "ab382a71.e012a8", - "518651aa.2aca3", - "24337100.d599a", - "12ceff59.6da431", - "d86cc1ce.6085e", - "30cf4858.64e188", - "fa2339a4.1d6f28", - "f8b8212e.de624", - "4c07dee.6ce442" + "5e2345ea.98643c", + "9cdc2e08.4c708", + "49da5087.2ef8c", + "28e7193.be6e4e6", + "af1ee321.f9c8f", + "9e37cd9e.2c26b", + "22309e2d.4e2112", + "c455d29d.5ee15", + "dce4c016.eb68d", + "8bccebfa.8dc598" ] ] }, { - "id": "9cf5ad87.06886", + "id": "56421575.13e47c", "type": "set", "name": "set controller data", "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n", "comments": "", - "x": 2322.538787841797, - "y": 1876.6815524101257, - "z": "886e5ee7.da286", + "x": 2273.534881591797, + "y": 1894.6776461601257, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "f8b8212e.de624", + "id": "c455d29d.5ee15", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n", "comments": "", "outputs": 1, - "x": 1939.0386962890625, - "y": 1913.6814918518066, - "z": "886e5ee7.da286", + "x": 1890.0347900390625, + "y": 1931.6775856018066, + "z": "8408bfb2.5391c", "wires": [ [ - "2a73c293.cee82e", - "cd5e3cf0.7e544", - "e221ac88.e3abb" + "3cdb301b.34dde", + "8a438cce.4438d", + "1a1ad8a.53da727" ] ] }, { - "id": "2a73c293.cee82e", + "id": "3cdb301b.34dde", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2159.038631439209, - "y": 1877.6814608573914, - "z": "886e5ee7.da286", + "x": 2110.034725189209, + "y": 1895.6775546073914, + "z": "8408bfb2.5391c", "wires": [ [ - "9cf5ad87.06886" + "56421575.13e47c" ] ] }, { - "id": "cd5e3cf0.7e544", + "id": "8a438cce.4438d", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2168.529571533203, - "y": 1918.2554669380188, - "z": "886e5ee7.da286", + "x": 2119.525665283203, + "y": 1936.2515606880188, + "z": "8408bfb2.5391c", "wires": [ [ - "73ddc8d7.9cef28" + "7adc3011.31b48" ] ] }, { - "id": "e221ac88.e3abb", + "id": "1a1ad8a.53da727", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2163.862548828125, - "y": 1954.5887799263, - "z": "886e5ee7.da286", + "x": 2114.858642578125, + "y": 1972.5848736763, + "z": "8408bfb2.5391c", "wires": [ [ - "9cd2e5f3.c77dc8" + "c476b95c.317398" ] ] }, { - "id": "73ddc8d7.9cef28", + "id": "7adc3011.31b48", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 2315.1009216308594, - "y": 1914.5412936210632, - "z": "886e5ee7.da286", + "x": 2266.0970153808594, + "y": 1932.5373873710632, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "9cd2e5f3.c77dc8", + "id": "c476b95c.317398", "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=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n", "comments": "", - "x": 2318.6351928710938, - "y": 1956.0279278755188, - "z": "886e5ee7.da286", + "x": 2269.6312866210938, + "y": 1974.0240216255188, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "fa2339a4.1d6f28", + "id": "22309e2d.4e2112", "type": "get-resource", "name": "get-resource pnf", - "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id \n\t\tAND pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n\n", + "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $oof.vpn.access-node-id \n\t\tAND depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n\n", "comments": "", "outputs": 1, - "x": 1884.538589477539, - "y": 1822.6811356544495, - "z": "886e5ee7.da286", + "x": 1835.534683227539, + "y": 1840.6772294044495, + "z": "8408bfb2.5391c", "wires": [ [ - "346b021b.bac82e", - "fe6ca97c.41f258", - "fc66139b.853a" + "4c6591a0.fd0d5", + "3f03425.dc307be", + "55a8764.382b688" ] ] }, { - "id": "346b021b.bac82e", + "id": "4c6591a0.fd0d5", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 2066.5386352539062, - "y": 1767.681245803833, - "z": "886e5ee7.da286", + "x": 2017.5347290039062, + "y": 1785.677339553833, + "z": "8408bfb2.5391c", "wires": [ [ - "edadbcd1.1307c" + "44f2e24b.08176c" ] ] }, { - "id": "fe6ca97c.41f258", + "id": "3f03425.dc307be", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 2067.0295372009277, - "y": 1805.2553424835205, - "z": "886e5ee7.da286", + "x": 2018.0256309509277, + "y": 1823.2514362335205, + "z": "8408bfb2.5391c", "wires": [ [ - "df86be3c.187cb" + "b1d992a2.3473" ] ] }, { - "id": "fc66139b.853a", + "id": "55a8764.382b688", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 2058.362548828125, - "y": 1838.5887174606323, - "z": "886e5ee7.da286", + "x": 2009.358642578125, + "y": 1856.5848112106323, + "z": "8408bfb2.5391c", "wires": [ [ - "589f379c.3c1008" + "de897f67.8434" ] ] }, { - "id": "df86be3c.187cb", + "id": "b1d992a2.3473", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n", "comments": "", - "x": 2214.601161956787, - "y": 1804.5412311553955, - "z": "886e5ee7.da286", + "x": 2165.597255706787, + "y": 1822.5373249053955, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "589f379c.3c1008", + "id": "de897f67.8434", "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=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n", "comments": "", - "x": 2212.1351928710938, - "y": 1838.027865409851, - "z": "886e5ee7.da286", + "x": 2163.1312866210938, + "y": 1856.023959159851, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "edadbcd1.1307c", + "id": "44f2e24b.08176c", "type": "set", "name": "set tmp.thirdparty-sdnc-id", "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n", "comments": "", - "x": 2251.5386352539062, - "y": 1766.6813678741455, - "z": "886e5ee7.da286", + "x": 2202.5347290039062, + "y": 1784.6774616241455, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "ca8d7a27.974a78", + "id": "d17a16c8.3b48c8", "type": "comment", "name": "get domain controller information", "info": "", "comments": "", - "x": 1935.0425033569336, - "y": 1789.6850910186768, - "z": "886e5ee7.da286", + "x": 1886.0385971069336, + "y": 1807.6811847686768, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "30cf4858.64e188", + "id": "8bccebfa.8dc598", "type": "set", "name": "set oof.vpn", "xml": "<set>\n<parameter name='oof.vpn.' value='`$oof.vpns[$vidx].`' />", "comments": "", - "x": 1896.538589477539, - "y": 1743.7922191619873, - "z": "886e5ee7.da286", + "x": 1847.534683227539, + "y": 1761.7883129119873, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "ab382a71.e012a8", + "id": "9cdc2e08.4c708", "type": "save", "name": "save VPN resource in AAI", "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n<parameter name='access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='src-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='dst-access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />", "comments": "", "outputs": 1, - "x": 1915.004005432129, - "y": 2160.7546215057373, - "z": "886e5ee7.da286", + "x": 1866.000099182129, + "y": 2178.7507152557373, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "518651aa.2aca3", + "id": "49da5087.2ef8c", "type": "set", "name": "set tmp.vpnName", "xml": "<set>\n<parameter name='tmp.vpnName' value=\"`$oof.vpn.access-node-id + '-' + $prop.global.sotn.etht-svc-name`\" />", "comments": "", - "x": 1891.504005432129, - "y": 2113.2543182373047, - "z": "886e5ee7.da286", + "x": 1842.500099182129, + "y": 2131.2504119873047, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "24337100.d599a", + "id": "28e7193.be6e4e6", "type": "save", "name": "save connectivity relationship in AAI", "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $mdsal-psd.service-data.networks.network[0].network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$mdsal-psd.service-data.networks.network[0].network-id`\" />", "comments": "", "outputs": 1, - "x": 1950.004005432129, - "y": 2205.7543773651123, - "z": "886e5ee7.da286", + "x": 1901.000099182129, + "y": 2223.7504711151123, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "abe0f3b4.f562f", + "id": "5e9a8894.bc5eb8", "type": "comment", "name": "save vpn and its relation to AAI", "info": "", "comments": "", - "x": 1933.0042037963867, - "y": 2074.754587173462, - "z": "886e5ee7.da286", + "x": 1884.0002975463867, + "y": 2092.750680923462, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "13419eef.5a7671", + "id": "5e2345ea.98643c", "type": "set", "name": "set src-ltpId dst-ltpId", "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />", "comments": "", - "x": 1902.004035949707, - "y": 2245.754497528076, - "z": "886e5ee7.da286", + "x": 1853.000129699707, + "y": 2263.750591278076, + "z": "8408bfb2.5391c", "wires": [] }, { - "id": "12ceff59.6da431", + "id": "af1ee321.f9c8f", "type": "save", "name": "save srcLTP relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n", "comments": "", "outputs": 1, - "x": 1936.0039825439453, - "y": 2285.5043773651123, - "z": "886e5ee7.da286", + "x": 1887.0003814697266, + "y": 2303.5008001327515, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "d86cc1ce.6085e", + "id": "9e37cd9e.2c26b", "type": "save", "name": "save dstLTP relationship in AAI", - "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />", + "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n key='vpn-binding.vpn-id = $tmp.vpnName' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />", "comments": "", "outputs": 1, - "x": 1934.0039863586426, - "y": 2331.2543773651123, - "z": "886e5ee7.da286", + "x": 1885.0002136230469, + "y": 2349.250638961792, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "44848e46.5ebac", + "id": "38dcc355.b103ac", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 876.0078430175781, - "y": 596.0078182220459, - "z": "886e5ee7.da286", + "x": 827.0039367675781, + "y": 614.0039119720459, + "z": "8408bfb2.5391c", "wires": [ [ - "5268ad10.1fbc94", - "ffb50ed4.11c7e" + "936be6c0.7bea88", + "e9cdf97c.418498" ] ] }, { - "id": "b29f5799.241a78", + "id": "8ae6fd1b.92978", "type": "execute", "name": "execute RestApiCallNode - get-resource parent service data", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url-psd`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-psd\" />\n\n", "comments": "", "outputs": 1, - "x": 803.0079956054688, - "y": 823.007981300354, - "z": "886e5ee7.da286", + "x": 754.0040893554688, + "y": 841.004075050354, + "z": "8408bfb2.5391c", "wires": [ [ - "7ecc4648.197a88", - "dfe397a0.b9ba28" + "29a80022.cf94", + "6ef3a6c9.24a468" ] ] }, { - "id": "3637e175.005c6e", + "id": "20f5a5d.63f625a", "type": "execute", "name": "get parent-service-data url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url-psd\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 703.0079040527344, - "y": 786.0078144073486, - "z": "886e5ee7.da286", + "x": 654.0039978027344, + "y": 804.0039081573486, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "2865c930.441376", + "id": "5c659a2b.afc754", "type": "execute", "name": "generate tmp.ar-other-url-connection", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-other-url-connection\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.provided-ar.allotted-resource-id`\"/>\n \n\n", "comments": "", "outputs": 1, - "x": 2117.0042572021484, - "y": 942.3373756408691, - "z": "886e5ee7.da286", + "x": 2068.0003509521484, + "y": 960.3334693908691, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "36209682.cdfdca", + "id": "8cf7d234.3dc16", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-other-url-connection`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-other-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 2254.004898071289, - "y": 984.8372402191162, - "z": "886e5ee7.da286", + "x": 2205.000991821289, + "y": 1002.8333339691162, + "z": "8408bfb2.5391c", "wires": [ [ - "2877490b.8d1876", - "bf4a739d.0a26c" + "989dac87.78e81", + "34bec365.7b96ac" ] ] }, { - "id": "2cebb233.b139be", + "id": "710b598a.58f428", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1879.0041770935059, - "y": 1708.0040254592896, - "z": "886e5ee7.da286", + "x": 1830.0002708435059, + "y": 1726.0001192092896, + "z": "8408bfb2.5391c", "wires": [ [] ] }, { - "id": "431946d9.2130a8", + "id": "b9f6cbba.591c38", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1255.9727897644043, - "y": 1733.0042095184326, - "z": "886e5ee7.da286", + "x": 1206.9688835144043, + "y": 1751.0003032684326, + "z": "8408bfb2.5391c", "wires": [ [ - "7306bfe1.33065", - "f51b8e7a.4294a" + "21d3ff91.ea3ad", + "bfb31be6.a42bf8" ] ] } diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json index b785bc4a..0992fa6d 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json @@ -1,20 +1,20 @@ [ { - "id": "c96eae79.08813", + "id": "e71077a5.449178", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 100, - "y": 40, - "z": "307cdf1d.539fd", + "x": 94.00001907348633, + "y": 67.0000991821289, + "z": "ab45b2a0.2d254", "wires": [ [ - "2bbd4a2b.66a236" + "e230874f.1ced38" ] ] }, { - "id": "2bbd4a2b.66a236", + "id": "e230874f.1ced38", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1299 +22,1311 @@ "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": 275.00000381469727, - "y": 112.0000171661377, - "z": "307cdf1d.539fd", + "x": 269.0000228881836, + "y": 139.0001163482666, + "z": "ab45b2a0.2d254", "wires": [ [ - "7de06dac.f33994" + "fda28de9.a9688" ] ] }, { - "id": "7de06dac.f33994", + "id": "fda28de9.a9688", "type": "method", "name": "sotn-attachment-topology-operation-create", "xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 263.0001220703125, - "y": 200, - "z": "307cdf1d.539fd", + "x": 257.0001411437988, + "y": 227.0000991821289, + "z": "ab45b2a0.2d254", "wires": [ [ - "8a29d369.0bab4" + "8e26551b.7dfe18" ] ] }, { - "id": "8a29d369.0bab4", + "id": "8e26551b.7dfe18", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 183.00005340576172, - "y": 949.0002479553223, - "z": "307cdf1d.539fd", + "x": 177.00007247924805, + "y": 976.0003471374512, + "z": "ab45b2a0.2d254", "wires": [ [ - "51f31211.8f114c", - "a2a65745.852438", - "f3044df1.6f232", - "5ba82df.f35b0d4", - "2da52da7.95c362", - "dc7e1c21.4599e", - "7bdd95f3.db24ac", - "371cf69b.dabcaa", - "c34405e1.82d938", - "46e15a07.ae9ba4", - "cd08d99a.10abb8", - "c56a158b.169088", - "3292b995.f13186", - "71214832.584f28", - "23b7a6d1.9a369a", - "4ebfff40.f0aa5", - "cb431e44.1b2d7", - "6c73a0d6.045f8", - "1f74500.b2f7fb", - "6d4b764b.a8a308", - "6e7b925f.51d77c", - "92f874df.f4a158", - "ea8d2a7c.dc1c98", - "5a956e5b.11a09" + "c93c04d7.3e5348", + "9950e65d.3636a8", + "1ae547a2.eaba88", + "65f23dcc.6522b4", + "3e30e763.22be28", + "aa28416d.6d08a", + "15ca2e29.9a7dd2", + "9b1a0521.5c3978", + "f24b78b1.fdc468", + "a64f1b8.759c3e8", + "ab5d9313.ad157", + "6c39c83c.d7b048", + "8b5e7723.d59fc8", + "6b976d2c.2711d4", + "c9e7bba5.2bcb28", + "5aa40ff8.faf21", + "46cb4068.e43d3", + "8bddffb6.5284", + "abedf313.5d507", + "fac542dd.1d112", + "b07d75d2.a2b088", + "26fdc495.60ac0c", + "a63f9a77.c174a8", + "e02c5c21.82a2", + "bde5bdf6.37338" ] ] }, { - "id": "dceaac22.2856", + "id": "c90f1d50.24dc", "type": "comment", "name": "Set allotted resource id if not sent by SO", "info": "", "comments": "", - "x": 667.0767517089844, - "y": 109.4339189529419, - "z": "307cdf1d.539fd", + "x": 661.0767707824707, + "y": 136.4340181350708, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "51f31211.8f114c", + "id": "c93c04d7.3e5348", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n", "comments": "", "outputs": 1, - "x": 613.0000305175781, - "y": 164.99999237060547, - "z": "307cdf1d.539fd", + "x": 607.0000495910645, + "y": 192.00009155273438, + "z": "ab45b2a0.2d254", "wires": [ [ - "5d06a5f3.384e7c", - "a9453642.a0afc8" + "213269bc.4275f6", + "6419db5e.a2c0c4" ] ] }, { - "id": "5d06a5f3.384e7c", + "id": "213269bc.4275f6", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 811.0001182556152, - "y": 134.99998092651367, - "z": "307cdf1d.539fd", + "x": 805.0001373291016, + "y": 162.00008010864258, + "z": "ab45b2a0.2d254", "wires": [ [ - "b367b4cb.81eda8" + "eccd2036.554d7" ] ] }, { - "id": "a9453642.a0afc8", + "id": "6419db5e.a2c0c4", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 810.0000267028809, - "y": 171.99999141693115, - "z": "307cdf1d.539fd", + "x": 804.0000457763672, + "y": 199.00009059906006, + "z": "ab45b2a0.2d254", "wires": [ [ - "b2cd00b8.57706" + "4ab8dc05.8f0984" ] ] }, { - "id": "b2cd00b8.57706", + "id": "4ab8dc05.8f0984", "type": "set", "name": "set tmp.ar.allotted-resource-id", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n", "comments": "", - "x": 1008.0000152587891, - "y": 169.00001049041748, - "z": "307cdf1d.539fd", + "x": 1002.0000343322754, + "y": 196.0001096725464, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "a2a65745.852438", + "id": "9950e65d.3636a8", "type": "set", "name": "set tmp.ar.self-link", "xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n", "comments": "", - "x": 580.9999542236328, - "y": 386.0000991821289, - "z": "307cdf1d.539fd", + "x": 574.9999732971191, + "y": 413.0001983642578, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "f3044df1.6f232", + "id": "1ae547a2.eaba88", "type": "execute", "name": "execute Properties", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n <parameter name='contextPrefix' value='prop' />\n", "comments": "", "outputs": 1, - "x": 581.2618713378906, - "y": 467.66678047180176, - "z": "307cdf1d.539fd", + "x": 575.261890411377, + "y": 494.66687965393066, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "5ba82df.f35b0d4", + "id": "65f23dcc.6522b4", "type": "execute", "name": "generate allotted-resource tmp.ar-url", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 634.2619323730469, - "y": 554.6666984558105, - "z": "307cdf1d.539fd", + "x": 628.2619514465332, + "y": 581.6667976379395, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "b367b4cb.81eda8", + "id": "eccd2036.554d7", "type": "execute", "name": "execute tmp.ar.allotted-resource-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n", "comments": "", "outputs": 1, - "x": 1026.0000953674316, - "y": 135.99998664855957, - "z": "307cdf1d.539fd", + "x": 1020.000114440918, + "y": 163.00008583068848, + "z": "ab45b2a0.2d254", "wires": [ [ - "a3bb33e3.15368" + "90c2cdec.e7c9c" ] ] }, { - "id": "a3bb33e3.15368", + "id": "90c2cdec.e7c9c", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1244.0001373291016, - "y": 135.99995040893555, - "z": "307cdf1d.539fd", + "x": 1238.000156402588, + "y": 163.00004959106445, + "z": "ab45b2a0.2d254", "wires": [ [ - "1a685e2d.8d4cc2" + "a192b9fd.7610f8" ] ] }, { - "id": "1a685e2d.8d4cc2", + "id": "a192b9fd.7610f8", "type": "returnFailure", "name": "return failure", "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n", "comments": "", - "x": 1410.0000915527344, - "y": 135.9999647140503, - "z": "307cdf1d.539fd", + "x": 1404.0001106262207, + "y": 163.0000638961792, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "8b5477db.c5c9d8", + "id": "66a512c5.0faacc", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1140.0002307891846, - "y": 626.777871131897, - "z": "307cdf1d.539fd", + "x": 1134.000249862671, + "y": 653.7779703140259, + "z": "ab45b2a0.2d254", "wires": [ [ - "5b1e701f.600c" + "19566392.15832c" ] ] }, { - "id": "cc9f7f26.8914e", + "id": "2a3354d7.ee765c", "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: Existing connection attachment allotted resource\" />\n \n", "comments": "", - "x": 1873.5186100006104, - "y": 627.8439426422119, - "z": "307cdf1d.539fd", + "x": 1867.5186290740967, + "y": 654.8440418243408, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "65a2f2cb.5edd4c", + "id": "70da4f2f.1d3ca", "type": "comment", "name": "Check for non existence of allotted resource", "info": "", "comments": "", - "x": 996.0001525878906, - "y": 560.7779378890991, - "z": "307cdf1d.539fd", + "x": 990.000171661377, + "y": 587.778037071228, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "2eaa291f.8f6b46", + "id": "66ac283c.bd2348", "type": "for", "name": "for cidx..service-data.consumed-allotted-resources.consumed-allotted-resource[]", "xml": "<for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >\n", "comments": "", "outputs": 1, - "x": 1516.6666984558105, - "y": 771.0000503063202, - "z": "307cdf1d.539fd", + "x": 1510.6667175292969, + "y": 798.0001494884491, + "z": "ab45b2a0.2d254", "wires": [ [ - "1bef4b2b.0d1235" + "c03dacc1.547db" ] ] }, { - "id": "dc7e1c21.4599e", + "id": "aa28416d.6d08a", "type": "switchNode", "name": "switch service-data.consumed-allotted-resources_length", "xml": "<switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 698.6660232543945, - "y": 747.7140827178955, - "z": "307cdf1d.539fd", + "x": 692.6660423278809, + "y": 774.7141819000244, + "z": "ab45b2a0.2d254", "wires": [ [ - "f0ad968c.edb0a8", - "6ec4508a.edb8" + "ae723a2a.13be98", + "1678938e.1bfafc" ] ] }, { - "id": "f0ad968c.edb0a8", + "id": "ae723a2a.13be98", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1002.8089218139648, - "y": 716.5715198516846, - "z": "307cdf1d.539fd", + "x": 996.8089408874512, + "y": 743.5716190338135, + "z": "ab45b2a0.2d254", "wires": [ [ - "1bdd00e8.bfe58f" + "9ff14f9b.0b3b" ] ] }, { - "id": "6ec4508a.edb8", + "id": "1678938e.1bfafc", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 979.8089714050293, - "y": 777.5714750289917, - "z": "307cdf1d.539fd", + "x": 973.8089904785156, + "y": 804.5715742111206, + "z": "ab45b2a0.2d254", "wires": [ [ - "db245e97.27431" + "79d1a933.7fd6a8" ] ] }, { - "id": "db245e97.27431", + "id": "79d1a933.7fd6a8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1139.9360618591309, - "y": 775.6974515914917, - "z": "307cdf1d.539fd", + "x": 1133.9360809326172, + "y": 802.6975507736206, + "z": "ab45b2a0.2d254", "wires": [ [ - "2eaa291f.8f6b46", - "493dd1d2.fc196", - "23139ea3.633f22" + "66ac283c.bd2348", + "3b659fae.e519", + "a32862a8.8af3d" ] ] }, { - "id": "1bdd00e8.bfe58f", + "id": "9ff14f9b.0b3b", "type": "set", "name": "set cidx", "xml": "<set>\n<parameter name='tmp.cidx' value=\"`0`\" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value=\"1\" />\n\n\n", "comments": "", - "x": 1152.6659049987793, - "y": 714.2855701446533, - "z": "307cdf1d.539fd", + "x": 1146.6659240722656, + "y": 741.2856693267822, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "7bdd95f3.db24ac", + "id": "15ca2e29.9a7dd2", "type": "set", "name": "set consumed allotted resources", "xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n", "comments": "", - "x": 627.5233154296875, - "y": 851.285647392273, - "z": "307cdf1d.539fd", + "x": 621.5233345031738, + "y": 878.2857465744019, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "493dd1d2.fc196", + "id": "3b659fae.e519", "type": "switchNode", "name": "switch tmp.found-cidx", "xml": "<switch test='`$tmp.found-cidx`'>\n", "comments": "", "outputs": 1, - "x": 1329.0511093139648, - "y": 807.7089743614197, - "z": "307cdf1d.539fd", + "x": 1323.0511283874512, + "y": 834.7090735435486, + "z": "ab45b2a0.2d254", "wires": [ [ - "2ccff848.6a8838" + "966db31a.47786" ] ] }, { - "id": "2ccff848.6a8838", + "id": "966db31a.47786", "type": "outcomeTrue", "name": "false", "xml": "<outcome value='false'>\n", "comments": "", "outputs": 1, - "x": 1519.0510635375977, - "y": 807.7089114189148, - "z": "307cdf1d.539fd", + "x": 1513.051082611084, + "y": 834.7090106010437, + "z": "ab45b2a0.2d254", "wires": [ [ - "d5d85369.7e688" + "b95410b0.660fd" ] ] }, { - "id": "d5d85369.7e688", + "id": "b95410b0.660fd", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1685.0510635375977, - "y": 807.7089114189148, - "z": "307cdf1d.539fd", + "x": 1679.051082611084, + "y": 834.7090106010437, + "z": "ab45b2a0.2d254", "wires": [ [ - "fa8e9142.85d7d" + "2ab57899.a130b8" ] ] }, { - "id": "1bef4b2b.0d1235", + "id": "c03dacc1.547db", "type": "switchNode", "name": "switch allotted-resource-id", "xml": "<switch test=\"`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`\">\n\n", "comments": "", "outputs": 1, - "x": 1933.7783279418945, - "y": 768.0000772476196, - "z": "307cdf1d.539fd", + "x": 1927.7783470153809, + "y": 795.0001764297485, + "z": "ab45b2a0.2d254", "wires": [ [ - "39a011f4.26c90e" + "ba9ad589.8abb58" ] ] }, { - "id": "39a011f4.26c90e", + "id": "ba9ad589.8abb58", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2115.587902069092, - "y": 768.464524269104, - "z": "307cdf1d.539fd", + "x": 2109.587921142578, + "y": 795.4646234512329, + "z": "ab45b2a0.2d254", "wires": [ [ - "3bd67468.05082c" + "ef75ff36.6e6a8" ] ] }, { - "id": "fa8e9142.85d7d", + "id": "2ab57899.a130b8", "type": "set", "name": "set tmp.cidx", "xml": "<set>\n<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />\n", "comments": "", - "x": 1846.924446105957, - "y": 807.2206125259399, - "z": "307cdf1d.539fd", + "x": 1840.9244651794434, + "y": 834.2207117080688, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "45f09705.29f058", + "id": "e6f158d3.3c83a8", "type": "comment", "name": "Add to consumed service consumed-allotted-resources in mdsal", "info": "Prepare data and add to service-data", "comments": "", - "x": 719.667236328125, - "y": 678.0000467300415, - "z": "307cdf1d.539fd", + "x": 713.6672554016113, + "y": 705.0001459121704, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "7472ca93.259114", + "id": "464592d5.7d3adc", "type": "comment", "name": "This set resource will be added to MDSAL by provider code", "info": "Below we add to service-data.consumed-allotted-resource at last index", "comments": "", - "x": 707.0001525878906, - "y": 816.7781391143799, - "z": "307cdf1d.539fd", + "x": 701.000171661377, + "y": 843.7782382965088, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "ea8d2a7c.dc1c98", + "id": "a63f9a77.c174a8", "type": "update", "name": "save AAI allotted-resource", "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n", "comments": "", "outputs": 1, - "x": 612.6908721923828, - "y": 1866.5318479537964, - "z": "307cdf1d.539fd", + "x": 577.6909523010254, + "y": 1914.5320167541504, + "z": "ab45b2a0.2d254", "wires": [ [ - "951bf335.bca52", - "3aff12ef.b5135e" + "8865c331.63809", + "3795c6dc.0749ba" ] ] }, { - "id": "951bf335.bca52", + "id": "8865c331.63809", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 807.4527854919434, - "y": 1857.4844913482666, - "z": "307cdf1d.539fd", + "x": 801.4528045654297, + "y": 1884.4845905303955, + "z": "ab45b2a0.2d254", "wires": [ [ - "5683eb13.db5c34" + "4e95350f.9bd78c" ] ] }, { - "id": "5683eb13.db5c34", + "id": "4e95350f.9bd78c", "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=\"AAI failed\" />\n", "comments": "", - "x": 973.9766654968262, - "y": 1869.1035623550415, - "z": "307cdf1d.539fd", + "x": 967.9766845703125, + "y": 1896.1036615371704, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "3aff12ef.b5135e", + "id": "3795c6dc.0749ba", "type": "failure", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 814.5480728149414, - "y": 1890.2464590072632, - "z": "307cdf1d.539fd", + "x": 808.5480918884277, + "y": 1917.246558189392, + "z": "ab45b2a0.2d254", "wires": [ [ - "5683eb13.db5c34" + "4e95350f.9bd78c" ] ] }, { - "id": "9b778367.8c46a", + "id": "e8bcac4.3e63b5", "type": "comment", "name": "Save Resource to AAI", "info": "", "comments": "", - "x": 589.50048828125, - "y": 1809.8338623046875, - "z": "307cdf1d.539fd", + "x": 583.5005073547363, + "y": 1836.8339614868164, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "9719bb6e.70a358", + "id": "9ada057d.8d0ed8", "type": "comment", "name": "Set allotted resource type if not sent by SO", "info": "", "comments": "", - "x": 653, - "y": 218, - "z": "307cdf1d.539fd", + "x": 647.0000190734863, + "y": 245.0000991821289, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "2da52da7.95c362", + "id": "3e30e763.22be28", "type": "switchNode", "name": "switch allotted-resource-type", "xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n", "comments": "", "outputs": 1, - "x": 614.9233093261719, - "y": 258.5660562515259, - "z": "307cdf1d.539fd", + "x": 608.9233283996582, + "y": 285.5661554336548, + "z": "ab45b2a0.2d254", "wires": [ [ - "684d8da4.b880e4", - "7ce6426e.522ebc" + "1b1ef42.aa2a50c", + "5b1a6ad6.d32444" ] ] }, { - "id": "684d8da4.b880e4", + "id": "1b1ef42.aa2a50c", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>", "comments": "", "outputs": 1, - "x": 817.9234619140625, - "y": 243.56605911254883, - "z": "307cdf1d.539fd", + "x": 811.9234809875488, + "y": 270.56615829467773, + "z": "ab45b2a0.2d254", "wires": [ [ - "63c4923.3c3426c" + "23a0059d.3f004a" ] ] }, { - "id": "7ce6426e.522ebc", + "id": "5b1a6ad6.d32444", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 810.9232902526855, - "y": 283.5660791397095, - "z": "307cdf1d.539fd", + "x": 804.9233093261719, + "y": 310.5661783218384, + "z": "ab45b2a0.2d254", "wires": [ [ - "bca9b7c7.73b158" + "e101a8fa.94ec78" ] ] }, { - "id": "bca9b7c7.73b158", + "id": "e101a8fa.94ec78", "type": "set", "name": "set tmp.ar.allotted-resource-type", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n", "comments": "", - "x": 1042.9232749938965, - "y": 283.56608390808105, - "z": "307cdf1d.539fd", + "x": 1036.9232940673828, + "y": 310.56618309020996, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "4c5ae3e7.94b54c", + "id": "535c3465.db6a5c", "type": "comment", "name": "For storage in AAI connection-attachment-topology", "info": "", "comments": "", - "x": 677.9999618530273, - "y": 353, - "z": "307cdf1d.539fd", + "x": 671.9999809265137, + "y": 380.0000991821289, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "566d8977.bdc218", + "id": "7158b402.34b20c", "type": "comment", "name": "Obtain different URL, template location etc", "info": "For saving resource information to MDSAL & for AAI", "comments": "", - "x": 652.9999465942383, - "y": 434.8889093399048, - "z": "307cdf1d.539fd", + "x": 646.9999656677246, + "y": 461.8890085220337, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "eba557cf.66dec8", + "id": "8b7046e5.63a738", "type": "comment", "name": "Used for Put AR by id to MDSAL", "info": "", "comments": "", - "x": 619.0000305175781, - "y": 523.8889265060425, - "z": "307cdf1d.539fd", + "x": 613.0000495910645, + "y": 550.8890256881714, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "6d67020a.67de0c", + "id": "41e867cd.171798", "type": "comment", "name": "Obtain the last index in services", "info": "ServiceData is added by Provider code", "comments": "", - "x": 620.4444732666016, - "y": 709.8888711929321, - "z": "307cdf1d.539fd", + "x": 614.4444923400879, + "y": 736.888970375061, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "1f74500.b2f7fb", + "id": "abedf313.5d507", "type": "set", "name": "set output to api handler", "xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n", "comments": "", - "x": 598.2681350708008, - "y": 1773.3591890335083, - "z": "307cdf1d.539fd", + "x": 592.2681541442871, + "y": 1800.3592882156372, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "6d4b764b.a8a308", + "id": "fac542dd.1d112", "type": "returnSuccess", "name": "return success", "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", "comments": "", - "x": 566.6812324523926, - "y": 1977.9749908447266, - "z": "307cdf1d.539fd", + "x": 536.6813507080078, + "y": 2033.975341796875, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "63c4923.3c3426c", + "id": "23a0059d.3f004a", "type": "set", "name": "set tmp.ar.allotted-resource-type", "xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n", "comments": "", - "x": 1057.0001487731934, - "y": 243.99998569488525, - "z": "307cdf1d.539fd", + "x": 1051.0001678466797, + "y": 271.00008487701416, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "e855335b.71b3c", + "id": "77c2c758.5059b8", "type": "call", "name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param", "xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 899.9941558837891, - "y": 1622.4937295913696, - "z": "307cdf1d.539fd", + "x": 893.9941749572754, + "y": 1649.4938287734985, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "6c73a0d6.045f8", + "id": "8bddffb6.5284", "type": "execute", "name": "execute RestApiCallNode - PUT AR by id", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 649.0002670288086, - "y": 1707.0001182556152, - "z": "307cdf1d.539fd", + "x": 643.0002861022949, + "y": 1734.0002174377441, + "z": "ab45b2a0.2d254", "wires": [ [ - "17f1151d.06a5ab", - "ccace23a.27702", - "325329b.e9052d6" + "d13a7894.7c9648", + "a17ed53e.8a7c48", + "2a45ba4f.903ad6" ] ] }, { - "id": "17f1151d.06a5ab", + "id": "d13a7894.7c9648", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 898.6416206359863, - "y": 1745.3314485549927, - "z": "307cdf1d.539fd", + "x": 892.6416397094727, + "y": 1772.3315477371216, + "z": "ab45b2a0.2d254", "wires": [ [ - "503ba1c3.ce81b" + "2a58bb37.857ca4" ] ] }, { - "id": "ccace23a.27702", + "id": "a17ed53e.8a7c48", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 889.6416702270508, - "y": 1713.8314743041992, - "z": "307cdf1d.539fd", + "x": 883.6416893005371, + "y": 1740.8315734863281, + "z": "ab45b2a0.2d254", "wires": [ [ - "503ba1c3.ce81b" + "2a58bb37.857ca4" ] ] }, { - "id": "325329b.e9052d6", + "id": "2a45ba4f.903ad6", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 893.3917083740234, - "y": 1684.1885791793466, - "z": "307cdf1d.539fd", + "x": 887.3917274475098, + "y": 1711.1886783614755, + "z": "ab45b2a0.2d254", "wires": [ [ - "565609af.5fb058" + "4b685690.de2cf8" ] ] }, { - "id": "503ba1c3.ce81b", + "id": "2a58bb37.857ca4", "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 updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1059.3917083740234, - "y": 1714.5814981460571, - "z": "307cdf1d.539fd", + "x": 1053.3917274475098, + "y": 1741.581597328186, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "565609af.5fb058", + "id": "4b685690.de2cf8", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1035.0476760864258, - "y": 1680.3807483687997, - "z": "307cdf1d.539fd", + "x": 1029.047695159912, + "y": 1707.3808475509286, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "cd08d99a.10abb8", + "id": "ab5d9313.ad157", "type": "execute", "name": "execute RestApiCallNode - Update parent provided service AR", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"parent\" />\n\n", "comments": "", "outputs": 1, - "x": 718.9999542236328, - "y": 1133.0001649856567, - "z": "307cdf1d.539fd", + "x": 712.9999732971191, + "y": 1160.0002641677856, + "z": "ab45b2a0.2d254", "wires": [ [ - "ef2f7f10.9941b", - "b03054a4.69fc18", - "8aa9a171.e089b" + "9094ff9e.53d26", + "43bc3599.27bffc", + "fc9fd873.a374e8" ] ] }, { - "id": "ef2f7f10.9941b", + "id": "9094ff9e.53d26", "type": "not-found", "name": "not-found", "xml": "<outcome value='not-found'>\n", "comments": "", "outputs": 1, - "x": 1027.3080139160156, - "y": 1164.9984407424927, - "z": "307cdf1d.539fd", + "x": 1021.308032989502, + "y": 1191.9985399246216, + "z": "ab45b2a0.2d254", "wires": [ [ - "65c0c4d1.41acbc" + "421ec30a.485b8c" ] ] }, { - "id": "b03054a4.69fc18", + "id": "43bc3599.27bffc", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1018.3080635070801, - "y": 1133.4984664916992, - "z": "307cdf1d.539fd", + "x": 1012.3080825805664, + "y": 1160.4985656738281, + "z": "ab45b2a0.2d254", "wires": [ [ - "65c0c4d1.41acbc" + "421ec30a.485b8c" ] ] }, { - "id": "8aa9a171.e089b", + "id": "fc9fd873.a374e8", "type": "success", "name": "success", "xml": "<outcome value='success'>\n", "comments": "", "outputs": 1, - "x": 1022.0581016540527, - "y": 1103.8555713668466, - "z": "307cdf1d.539fd", + "x": 1016.0581207275391, + "y": 1130.8556705489755, + "z": "ab45b2a0.2d254", "wires": [ [ - "c70fcaaf.55a4c8" + "c6163b00.f85308" ] ] }, { - "id": "65c0c4d1.41acbc", + "id": "421ec30a.485b8c", "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 updating md-sal for connection-attachment-allotted-resource\" />\n", "comments": "", - "x": 1188.0581016540527, - "y": 1134.2484903335571, - "z": "307cdf1d.539fd", + "x": 1182.058120727539, + "y": 1161.248589515686, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "c70fcaaf.55a4c8", + "id": "c6163b00.f85308", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1163.714069366455, - "y": 1100.0477405562997, - "z": "307cdf1d.539fd", + "x": 1157.7140884399414, + "y": 1127.0478397384286, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "4609b233.9d833c", + "id": "f91628dc.a22298", "type": "comment", "name": "Put the parent allotted resource in mdsal", "info": "", "comments": "", - "x": 647.9999008178711, - "y": 1095.0000715255737, - "z": "307cdf1d.539fd", + "x": 641.9999198913574, + "y": 1122.0001707077026, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "3292b995.f13186", + "id": "8b5e7723.d59fc8", "type": "set", "name": "set connection-attachment-ar-identifiers", "xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n", "comments": "", - "x": 644.3570861816406, - "y": 1297.5716905593872, - "z": "307cdf1d.539fd", + "x": 638.357105255127, + "y": 1324.571789741516, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "c56a158b.169088", + "id": "6c39c83c.d7b048", "type": "set", "name": "set ar-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />", "comments": "", - "x": 558.2138671875, - "y": 1265.3810472488403, - "z": "307cdf1d.539fd", + "x": 552.2138862609863, + "y": 1292.3811464309692, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "71214832.584f28", + "id": "6b976d2c.2711d4", "type": "set", "name": "set identifiers in overall structure", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n", "comments": "", - "x": 623.1668853759766, - "y": 1331.6668758392334, - "z": "307cdf1d.539fd", + "x": 617.1669044494629, + "y": 1358.6669750213623, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "23b7a6d1.9a369a", + "id": "c9e7bba5.2bcb28", "type": "execute", "name": "execute getTime", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >\n <parameter name=\"outputPath\" value=\"tmp.current-time\" />\n\n", "comments": "", "outputs": 1, - "x": 575.4997253417969, - "y": 1405.0004034042358, - "z": "307cdf1d.539fd", + "x": 569.4997444152832, + "y": 1432.0005025863647, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "4ebfff40.f0aa5", + "id": "5aa40ff8.faf21", "type": "set", "name": "set allotted-resource-oper-status", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n", "comments": "", - "x": 626.4867630004883, - "y": 1460.951636314392, - "z": "307cdf1d.539fd", + "x": 620.4867820739746, + "y": 1487.951735496521, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "cb431e44.1b2d7", + "id": "46cb4068.e43d3", "type": "set", "name": "set model-data", "xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />", "comments": "", - "x": 571.0553817749023, - "y": 1366.5557613372803, - "z": "307cdf1d.539fd", + "x": 565.0554008483887, + "y": 1393.5558605194092, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "10171c26.195644", + "id": "b1148074.b83dc", "type": "comment", "name": "Prepare data for allotted-resource addition to MDSAL", "info": "This will add to allotted-resource which is present inside service.", "comments": "", - "x": 688.3888702392578, - "y": 1231.5556077957153, - "z": "307cdf1d.539fd", + "x": 682.3888893127441, + "y": 1258.5557069778442, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "46e15a07.ae9ba4", + "id": "a64f1b8.759c3e8", "type": "execute", "name": "generate parent-ar url - replace allotted-resource-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n", "comments": "", "outputs": 1, - "x": 683.5000152587891, - "y": 1059.0000104904175, - "z": "307cdf1d.539fd", + "x": 677.5000343322754, + "y": 1086.0001096725464, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "c34405e1.82d938", + "id": "f24b78b1.fdc468", "type": "execute", "name": "generate parent-ar url - replace service-instance-id", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n", "comments": "", "outputs": 1, - "x": 679.4999389648438, - "y": 1016.0001468658447, - "z": "307cdf1d.539fd", + "x": 673.4999580383301, + "y": 1043.0002460479736, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "a521acad.d004d", + "id": "5c890ede.9091d", "type": "comment", "name": "Prepare Parent AR URL", "info": "Preparation to set provided-allotted-resource in parent service instance", "comments": "", - "x": 597.5003967285156, - "y": 945.0001001358032, - "z": "307cdf1d.539fd", + "x": 591.500415802002, + "y": 972.0001993179321, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "371cf69b.dabcaa", + "id": "9b1a0521.5c3978", "type": "set", "name": "set tmp.ar.parent-service-instance-id", "xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n", "comments": "", - "x": 636.5001907348633, - "y": 978.5000395774841, - "z": "307cdf1d.539fd", + "x": 630.5002098083496, + "y": 1005.500138759613, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "471a396d.b72ac8", + "id": "1dce57cb.3a2f28", "type": "comment", "name": "Required for filling template values", "info": "This is done because connection-attachment is generic resource and doesn't have specific parameters", "comments": "", - "x": 826.000358581543, - "y": 1585.4998025894165, - "z": "307cdf1d.539fd", + "x": 820.0003776550293, + "y": 1612.4999017715454, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "3bd67468.05082c", + "id": "ef75ff36.6e6a8", "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 updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n", "comments": "", - "x": 2193.7569732666016, - "y": 816.6458292007446, - "z": "307cdf1d.539fd", + "x": 2187.756992340088, + "y": 843.6459283828735, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "23139ea3.633f22", + "id": "a32862a8.8af3d", "type": "set", "name": "set tmp.found-cidx", "xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n", "comments": "", - "x": 1319.6461448669434, - "y": 728.3125722408295, - "z": "307cdf1d.539fd", + "x": 1313.6461639404297, + "y": 755.3126714229584, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "572750a4.da966", + "id": "46efcfd6.a7a1a", "type": "comment", "name": "Add to parent services provided-allotted-resources in mdsal", "info": "", "comments": "", - "x": 708.2015075683594, - "y": 912.9792566299438, - "z": "307cdf1d.539fd", + "x": 702.2015266418457, + "y": 939.9793558120728, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "c22af7ab.9a1898", + "id": "b6eb1599.cd85e8", "type": "comment", "name": "Add to allotted-resources in mdsal", "info": "", "comments": "", - "x": 628.9686965942383, - "y": 1198.968936920166, - "z": "307cdf1d.539fd", + "x": 622.9687156677246, + "y": 1225.969036102295, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "5b1e701f.600c", + "id": "19566392.15832c", "type": "block", "name": "block: atomic", "xml": "<block atomic=\"true\">\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1302.000051498413, - "y": 626.2777605056763, - "z": "307cdf1d.539fd", + "x": 1296.0000705718994, + "y": 653.2778596878052, + "z": "ab45b2a0.2d254", "wires": [ [ - "f33fd165.6af9d" + "be105cba.576f" ] ] }, { - "id": "f33fd165.6af9d", + "id": "be105cba.576f", "type": "switchNode", "name": "switch cr length", "xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n", "comments": "", "outputs": 1, - "x": 1489.8574314117432, - "y": 626.8968958854675, - "z": "307cdf1d.539fd", + "x": 1483.8574504852295, + "y": 653.8969950675964, + "z": "ab45b2a0.2d254", "wires": [ [ - "30bd1249.6e0cce" + "a5af4603.e786b8" ] ] }, { - "id": "30bd1249.6e0cce", + "id": "a5af4603.e786b8", "type": "other", "name": "outcome 1", "xml": "<outcome value='1'>\n", "comments": "", "outputs": 1, - "x": 1689.1905536651611, - "y": 626.8969745635986, - "z": "307cdf1d.539fd", + "x": 1683.1905727386475, + "y": 653.8970737457275, + "z": "ab45b2a0.2d254", "wires": [ [ - "cc9f7f26.8914e" + "2a3354d7.ee765c" ] ] }, { - "id": "6e7b925f.51d77c", + "id": "b07d75d2.a2b088", "type": "execute", "name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource", "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n", "comments": "", "outputs": 1, - "x": 774.0000534057617, - "y": 621.000036239624, - "z": "307cdf1d.539fd", + "x": 768.000072479248, + "y": 648.0001354217529, + "z": "ab45b2a0.2d254", "wires": [ [ - "8b5477db.c5c9d8", - "94a8a58d.dee408" + "66a512c5.0faacc", + "9a3ff920.b9ec88" ] ] }, { - "id": "94a8a58d.dee408", + "id": "9a3ff920.b9ec88", "type": "failure", "name": "failure", "xml": "<outcome value='failure'>\n", "comments": "", "outputs": 1, - "x": 1142.0000839233398, - "y": 591.0000343322754, - "z": "307cdf1d.539fd", + "x": 1136.0001029968262, + "y": 618.0001335144043, + "z": "ab45b2a0.2d254", "wires": [ [ - "9c37a2ea.b7b0a" + "9cab679f.f79248" ] ] }, { - "id": "9c37a2ea.b7b0a", + "id": "9cab679f.f79248", "type": "block", "name": "block", "xml": "<block>\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1294.0000839233398, - "y": 590.0000343322754, - "z": "307cdf1d.539fd", + "x": 1288.0001029968262, + "y": 617.0001335144043, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "92f874df.f4a158", + "id": "26fdc495.60ac0c", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 570.5556106567383, - "y": 1540.6666536331177, - "z": "307cdf1d.539fd", + "x": 564.5556297302246, + "y": 1567.6667528152466, + "z": "ab45b2a0.2d254", "wires": [ [ - "53c527c9.b22648", - "e855335b.71b3c" + "3267c7d4.904798", + "77c2c758.5059b8" ] ] }, { - "id": "53c527c9.b22648", + "id": "3267c7d4.904798", "type": "for", "name": "for each sotn-get-request-input-param", "xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n", "comments": "", "outputs": 1, - "x": 840.5556755065918, - "y": 1540.6667013168335, - "z": "307cdf1d.539fd", + "x": 834.5556945800781, + "y": 1567.6668004989624, + "z": "ab45b2a0.2d254", "wires": [ [ - "261e5f2.fe442a" + "2605999a.01d556" ] ] }, { - "id": "d5857a39.639db8", + "id": "2051e6d6.e5a81a", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 1380.5554580688477, - "y": 1496.6667346954346, - "z": "307cdf1d.539fd", + "x": 1374.555477142334, + "y": 1523.6668338775635, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "6df2fba8.889c14", + "id": "43dec0c4.9aa5a", "type": "execute", "name": "execute split parameterName", "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n", "comments": "", "outputs": 1, - "x": 1338.5901260375977, - "y": 1531.6458778381348, - "z": "307cdf1d.539fd", + "x": 1332.590145111084, + "y": 1558.6459770202637, + "z": "ab45b2a0.2d254", "wires": [ [] ] }, { - "id": "bd5f9072.2a8a7", + "id": "e2d39b7e.8a6eb8", "type": "set", "name": "set parameterName", "xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n", "comments": "", - "x": 1309.034652709961, - "y": 1564.6458778381348, - "z": "307cdf1d.539fd", + "x": 1303.0346717834473, + "y": 1591.6459770202637, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "4a2aa60e.ed5c08", + "id": "36eb754f.ed7b4a", "type": "comment", "name": "Remove VNFC prefix", "info": "", "comments": "", - "x": 781.5556030273438, - "y": 1508.1110153198242, - "z": "307cdf1d.539fd", + "x": 775.5556221008301, + "y": 1535.1111145019531, + "z": "ab45b2a0.2d254", "wires": [] }, { - "id": "261e5f2.fe442a", + "id": "2605999a.01d556", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1087.5555114746094, - "y": 1539.1110458374023, - "z": "307cdf1d.539fd", + "x": 1081.5555305480957, + "y": 1566.1111450195312, + "z": "ab45b2a0.2d254", "wires": [ [ - "6df2fba8.889c14", - "bd5f9072.2a8a7" + "43dec0c4.9aa5a", + "e2d39b7e.8a6eb8" ] ] }, { - "id": "5a956e5b.11a09", + "id": "e02c5c21.82a2", "type": "save", "name": "save srcLTP relationship in AAI", - "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n", + "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n", "comments": "", "outputs": 1, - "x": 619.0039329528809, - "y": 1925.0039825439453, - "z": "307cdf1d.539fd", + "x": 590.0041046142578, + "y": 1988.0046367645264, + "z": "ab45b2a0.2d254", "wires": [ [] ] + }, + { + "id": "bde5bdf6.37338", + "type": "set", + "name": "set src-ltpId", + "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`\" />\n", + "comments": "", + "x": 534.0001983642578, + "y": 1952.0004014968872, + "z": "ab45b2a0.2d254", + "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml index 23b28c85..7ec1dd82 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-activate.xml @@ -378,8 +378,7 @@ </set> <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" - key="network-resource.network-id = $mdsal-psd.service-data.networks.network[0].network-id - AND pnf.pnf-name = $oof.vpn.access-node-id + key="pnf.pnf-name = $oof.vpn.access-node-id AND depth = '0'" pfx='tmp.aai.pnf' local-only='false' > <outcome value='success'> @@ -431,7 +430,7 @@ </get-resource> <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' > <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" /> - <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + 'restconf/data/ietf-eth-tran-service:etht-svc'`" /> + <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" /> <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" /> <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" /> <parameter name="format" value="json"/> @@ -489,7 +488,7 @@ key='vpn-binding.vpn-id = $tmp.vpnName' force="true" pfx="tmp.AnAI-data"> <parameter name="relationship-list.relationship[0].related-to" value="p-interface" /> - <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $src-ltpId`" /> + <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" /> </save> @@ -497,7 +496,7 @@ key='vpn-binding.vpn-id = $tmp.vpnName' force="true" pfx="tmp.AnAI-data"> <parameter name="relationship-list.relationship[0].related-to" value="p-interface" /> - <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $mdsal-psd.service-data.networks.network[0].network-id + '/pnfs/pnf/' + $oof.vpn.access-node-id '/p-interfaces/p-interface/' + $dst-ltpId`" /> + <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" /> <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$dst-ltpId`" /> </save> @@ -571,8 +570,7 @@ pfx='pfx' local-only='false' force='false'> <parameter name="description" value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`" /> <parameter name="selflink" value="`$tmp.ar.self-link`" /> - <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /> - <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /> + <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /--> <parameter name="operational-status" value="Active" /> <outcome value='failure'> <return status='failure'> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml index e0beaac9..073b4210 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml @@ -270,6 +270,9 @@ value="`$connection-attachment-ar-identifiers.`" /> </return>
</outcome>
</save>
+ <set>
+ <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
+ </set>
<save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
@@ -278,7 +281,7 @@ value="`$connection-attachment-ar-identifiers.`" /> allotted-resource.id = $tmp.ar.allotted-resource-id"
force="true" pfx="tmp.AnAI-data">
<parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $prop.connection-attachment.access-ltp-id`" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
</save>
|