summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main
diff options
context:
space:
mode:
authorMarcus G K Williams <marcus.williams@intel.com>2017-11-14 08:48:46 -0800
committerMarcus G K Williams <marcus.williams@intel.com>2017-11-14 09:10:31 -0800
commita347e10eee024991ff7c0bf7487aa9e2b78f9a84 (patch)
tree4a96d671a3e6faaf1638ea9661ba6de9783dffa7 /platform-logic/generic-resource-api/src/main
parent42fb5723b7b11e94fc7d5ab901ae293b7fd67d7f (diff)
Fix brg-topo DGs
1. Added get vg-mgmt-ip in brg-topo-activate so that vg tunnel could be properple setup 2. Added get vbrg-wan-ip to brg-topo-deactivate so that vxlan tunnels can be removed 3. Updated AA&I updates calls to include correct brg variables for global-customer-id, service-type and service-instance-id Issue-Id: SDNC-195 Change-Id: I9470cd782a3bd00fa9332dd7141c28151054b75f Signed-off-by: Marcus G K Williams <marcus.williams@intel.com> Former-commit-id: becd9978df3428354646a48c2d106177f6477695
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
-rwxr-xr-xplatform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json1360
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json828
-rwxr-xr-xplatform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json1010
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml69
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml5
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml108
6 files changed, 2110 insertions, 1270 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
index b31d50be..3fa89107 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-activate.json
@@ -1,20 +1,20 @@
[
{
- "id":"d9e7e1c2.493d3",
+ "id":"ceb899a7.d341c8",
"type":"dgstart",
"name":"DGSTART",
"outputs":1,
- "x":103,
- "y":46,
- "z":"f97ade34.d219f",
+ "x":153.3333282470703,
+ "y":103.33332824707031,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "9a1b0b6b.996428"
+ "18952f76.559ee1"
]
]
},
{
- "id":"9a1b0b6b.996428",
+ "id":"18952f76.559ee1",
"type":"service-logic",
"name":"GENERIC-RESOURCE-API ${project.version}",
"module":"GENERIC-RESOURCE-API",
@@ -22,156 +22,158 @@
"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":199.23807907104492,
- "y":106.95239067077637,
- "z":"f97ade34.d219f",
+ "x":249.57140731811523,
+ "y":164.28571891784668,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "1b80fdb3.e51d42"
+ "179672e8.9c551d"
]
]
},
{
- "id":"1b80fdb3.e51d42",
+ "id":"179672e8.9c551d",
"type":"method",
"name":"brg-topology-operation-activate",
"xml":"<method rpc='brg-topology-operation-activate' mode='sync'>\n",
"comments":"",
"outputs":1,
- "x":245.15485763549805,
- "y":142.19044589996338,
- "z":"f97ade34.d219f",
+ "x":295.48818588256836,
+ "y":199.5237741470337,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "b9ef2573.e57c88"
+ "9f35bd45.8a6a4"
]
]
},
{
- "id":"b9ef2573.e57c88",
+ "id":"9f35bd45.8a6a4",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"comments":"",
"outputs":1,
- "x":140.97620391845703,
- "y":1138.0237922668457,
- "z":"f97ade34.d219f",
- "wires":[
- [
- "b4a1686c.6724e8",
- "377fb8b4.251228",
- "d661220d.d848d",
- "c5c60948.27fc28",
- "c4711874.0ee758",
- "aceb1a27.11b7a8",
- "a5137e71.81a65",
- "5972a9da.16e978",
- "50e72018.6624",
- "b3b13e68.d59bb",
- "ef8d3b6f.8c3c58",
- "531893c6.c405dc",
- "7c4bd318.44ab8c",
- "14b435e1.73803a",
- "b8e9e857.b4d5e8",
- "970b23d4.8d05e",
- "815c3841.72ff98",
- "a9cc06ef.aed3d8",
- "17504c2b.5ecc04",
- "13ddb22.203944e",
- "75aa4c7c.d1f814",
- "173f16cf.2f6b79",
- "5bcb3869.fa6198",
- "60d1bf52.ad3d6",
- "ac82543e.0a2288",
- "4a0f8ea5.474a2",
- "5f66c498.33c76c",
- "eab64b.710229b8",
- "36e0c301.ee8e2c",
- "5f18f40a.7db70c",
- "ecf121e2.af8c8",
- "496f8c72.09c0b4",
- "9e2897fc.bd5fd8",
- "fc322e28.718d1"
- ]
- ]
- },
- {
- "id":"377fb8b4.251228",
+ "x":191.30953216552734,
+ "y":1195.357120513916,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "5f6476c7.1116b8",
+ "1fd1cf4d.7fed61",
+ "db740f9d.29312",
+ "ecc54a34.453788",
+ "96b93a8e.8fa738",
+ "89375566.2dec58",
+ "af147a22.52b628",
+ "6f832b94.924d84",
+ "3806a837.de7398",
+ "6323c04e.54628",
+ "dfa3f56.72b5808",
+ "3b2fb4.6046004c",
+ "1375a965.f31cb7",
+ "3545827f.8f7f4e",
+ "27f6106d.5aed4",
+ "d538a2c.85a8a6",
+ "d0da56bf.5622e8",
+ "e3151796.db37b8",
+ "247b453a.8a26fa",
+ "34e00507.e2015a",
+ "7f06ccd3.5f4544",
+ "a690ec81.282ab",
+ "7cd4ecac.c5c874",
+ "afbc0299.7c62f",
+ "a76a910b.2c1fa",
+ "43cd6015.f74aa",
+ "a44bc809.331528",
+ "4ebb5d6e.3b72b4",
+ "94c1462c.043b88",
+ "890a1877.5b6b98",
+ "dad15ca1.13a96",
+ "898815a9.12a638",
+ "ddefeb7c.fde178",
+ "127d8c70.64ae14",
+ "59a607df.c64478",
+ "2b05ed04.a37c82"
+ ]
+ ]
+ },
+ {
+ "id":"1fd1cf4d.7fed61",
"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":420.00017166137695,
- "y":2417.3817806243896,
- "z":"f97ade34.d219f",
+ "x":467.8335380554199,
+ "y":2659.7151918411255,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"b4a1686c.6724e8",
+ "id":"5f6476c7.1116b8",
"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='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
"comments":"",
- "x":448.7540855407715,
- "y":2381.5043268203735,
- "z":"f97ade34.d219f",
+ "x":496.58745193481445,
+ "y":2623.8377380371094,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"b3b13e68.d59bb",
+ "id":"6323c04e.54628",
"type":"set",
"name":"set allotted-resource-oper-status",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Active' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
"comments":"",
- "x":459.7542190551758,
- "y":666.0514001846313,
- "z":"f97ade34.d219f",
+ "x":510.0875473022461,
+ "y":723.3847284317017,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"c5c60948.27fc28",
+ "id":"ecc54a34.453788",
"type":"set",
"name":"set tmp.ar.self-link",
"xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n",
"comments":"",
- "x":415.73806381225586,
- "y":259.33332538604736,
- "z":"f97ade34.d219f",
+ "x":466.0713920593262,
+ "y":316.6666536331177,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"d661220d.d848d",
+ "id":"db740f9d.29312",
"type":"set",
"name":"set tmp.ar.allotted-resource-id,etc",
"xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n",
"comments":"",
- "x":462.9973258972168,
- "y":225.59259128570557,
- "z":"f97ade34.d219f",
+ "x":513.3306541442871,
+ "y":282.9259195327759,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"c4711874.0ee758",
+ "id":"96b93a8e.8fa738",
"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":421.9934196472168,
- "y":295.23152446746826,
- "z":"f97ade34.d219f",
+ "x":472.3267478942871,
+ "y":352.5648527145386,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -179,32 +181,32 @@
]
},
{
- "id":"a5137e71.81a65",
+ "id":"af147a22.52b628",
"type":"execute",
"name":"execute RestApiCallNode - Get AR by id",
"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":484.5187530517578,
- "y":456.4594917297363,
- "z":"f97ade34.d219f",
+ "x":534.8520812988281,
+ "y":513.7928199768066,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "edb9e1fa.046de",
- "d98ea5a4.989128"
+ "3d9ecb10.c6dbd4",
+ "5a4abfd2.0da15"
]
]
},
{
- "id":"aceb1a27.11b7a8",
+ "id":"89375566.2dec58",
"type":"execute",
"name":"generate allotted-resource url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.brg-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":450.0648536682129,
- "y":355.0172290802002,
- "z":"f97ade34.d219f",
+ "x":500.3981819152832,
+ "y":412.3505573272705,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -212,307 +214,307 @@
]
},
{
- "id":"edb9e1fa.046de",
+ "id":"3d9ecb10.c6dbd4",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":741.8148918151855,
- "y":455.26725220680237,
- "z":"f97ade34.d219f",
+ "x":792.1482200622559,
+ "y":512.6005804538727,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "52d019c0.82c438"
+ "cb63369d.a052b8"
]
]
},
{
- "id":"5972a9da.16e978",
+ "id":"6f832b94.924d84",
"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.brg.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":492.52931213378906,
- "y":809.4341316223145,
- "z":"f97ade34.d219f",
+ "x":542.8626403808594,
+ "y":866.7674598693848,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "854bd044.7a222",
- "8243312c.4fc6e",
- "a02378bd.a2d368"
+ "39dd55f9.494c7a",
+ "f6c69264.a623a",
+ "622616be.bf16b8"
]
]
},
{
- "id":"854bd044.7a222",
+ "id":"39dd55f9.494c7a",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":1016.8373832702637,
- "y":834.4324235916138,
- "z":"f97ade34.d219f",
+ "x":1067.170711517334,
+ "y":891.7657518386841,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "981caf01.1190d"
+ "7fce7a4f.b0d624"
]
]
},
{
- "id":"8243312c.4fc6e",
+ "id":"f6c69264.a623a",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":1007.8374328613281,
- "y":802.9324493408203,
- "z":"f97ade34.d219f",
+ "x":1058.1707611083984,
+ "y":860.2657775878906,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "981caf01.1190d"
+ "7fce7a4f.b0d624"
]
]
},
{
- "id":"a02378bd.a2d368",
+ "id":"622616be.bf16b8",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":1011.5874710083008,
- "y":773.2895542159677,
- "z":"f97ade34.d219f",
+ "x":1061.920799255371,
+ "y":830.622882463038,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "9efe8414.91ed18"
+ "8786f548.363298"
]
]
},
{
- "id":"981caf01.1190d",
+ "id":"7fce7a4f.b0d624",
"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 brg-allotted-resource\" />\n",
"comments":"",
- "x":1177.5874710083008,
- "y":803.6824731826782,
- "z":"f97ade34.d219f",
+ "x":1227.920799255371,
+ "y":861.0158014297485,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"52d019c0.82c438",
+ "id":"cb63369d.a052b8",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":922.8148460388184,
- "y":455.7672016620636,
- "z":"f97ade34.d219f",
+ "x":973.1481742858887,
+ "y":513.1005299091339,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "515d911f.70f65",
- "388539de.469206"
+ "782b0a71.4c38e4",
+ "69401bf8.f87a84"
]
]
},
{
- "id":"515d911f.70f65",
+ "id":"782b0a71.4c38e4",
"type":"switchNode",
"name":"switch brg length",
"xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n",
"comments":"",
"outputs":1,
- "x":1168.6720924377441,
- "y":490.052964925766,
- "z":"f97ade34.d219f",
+ "x":1219.0054206848145,
+ "y":547.3862931728363,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "a34fd934.5de948"
+ "f019bd43.a19cf"
]
]
},
{
- "id":"a34fd934.5de948",
+ "id":"f019bd43.a19cf",
"type":"other",
"name":"outcome 1",
"xml":"<outcome value='1'>\n",
"comments":"",
"outputs":1,
- "x":1359.6720962524414,
- "y":490.0529625415802,
- "z":"f97ade34.d219f",
+ "x":1410.0054244995117,
+ "y":547.3862907886505,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "1534773e.2f1e69"
+ "35c3a049.ff966"
]
]
},
{
- "id":"d1c6c306.93b2a",
+ "id":"7a62d7f0.004398",
"type":"set",
"name":"set brg-ar from get",
"xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n",
"comments":"",
- "x":1759.5292320251465,
- "y":490.62438678741455,
- "z":"f97ade34.d219f",
+ "x":1809.8625602722168,
+ "y":547.9577150344849,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"1534773e.2f1e69",
+ "id":"35c3a049.ff966",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic='true'>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1530.5290794372559,
- "y":490.6244316101074,
- "z":"f97ade34.d219f",
+ "x":1580.8624076843262,
+ "y":547.9577598571777,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "d1c6c306.93b2a",
- "2feb6861.c55048",
- "834030e7.c71a9"
+ "7a62d7f0.004398",
+ "66f1e6ab.ccdbe8",
+ "929f975e.19d6c8"
]
]
},
{
- "id":"2feb6861.c55048",
+ "id":"66f1e6ab.ccdbe8",
"type":"set",
"name":"set oper-status",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
"comments":"",
- "x":1757.5294761657715,
- "y":558.0529508590698,
- "z":"f97ade34.d219f",
+ "x":1807.8628044128418,
+ "y":615.3862791061401,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"2bb45a1f.a94976",
+ "id":"64c20a9e.a91c44",
"type":"comment",
"name":"GET brg-allotted-resource from mdsal",
"info":"",
"comments":"",
- "x":509.81481552124023,
- "y":419.7671926021576,
- "z":"f97ade34.d219f",
+ "x":560.1481437683105,
+ "y":477.1005208492279,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"834030e7.c71a9",
+ "id":"929f975e.19d6c8",
"type":"switchNode",
"name":"switch order-status",
"xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
"comments":"",
"outputs":1,
- "x":1767.52925491333,
- "y":523.6243848800659,
- "z":"f97ade34.d219f",
+ "x":1817.8625831604004,
+ "y":580.9577131271362,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "930ea57d.0f30f8",
- "4c055a7a.ab9f24"
+ "84ba8f9b.db8be",
+ "29821995.b20746"
]
]
},
{
- "id":"930ea57d.0f30f8",
+ "id":"84ba8f9b.db8be",
"type":"outcome",
"name":"outcome Created",
"xml":"<outcome value='Created'>\n",
"comments":"",
"outputs":1,
- "x":1979.1292114257812,
- "y":484.6243848800659,
- "z":"f97ade34.d219f",
+ "x":2029.4625396728516,
+ "y":541.9577131271362,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "56b9c5ed.fb1fec"
+ "20dc496c.b0ace6"
]
]
},
{
- "id":"4c055a7a.ab9f24",
+ "id":"29821995.b20746",
"type":"outcome",
"name":"outcome Other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":2004.8435859680176,
- "y":520.052975654602,
- "z":"f97ade34.d219f",
+ "x":2055.176914215088,
+ "y":577.3863039016724,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "56b9c5ed.fb1fec"
+ "20dc496c.b0ace6"
]
]
},
{
- "id":"77c5ca77.4678d4",
+ "id":"922a85d1.3ff438",
"type":"comment",
"name":"Set allotted-resource-identifiers",
"info":"",
"comments":"",
- "x":465.33863830566406,
- "y":510.3386459350586,
- "z":"f97ade34.d219f",
+ "x":515.6719665527344,
+ "y":567.6719741821289,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"388539de.469206",
+ "id":"69401bf8.f87a84",
"type":"set",
"name":"save backup copy of mdsal-ar for rollback",
"xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n",
"comments":"",
- "x":1248.3864250183105,
- "y":455.76729369163513,
- "z":"f97ade34.d219f",
+ "x":1298.7197532653809,
+ "y":513.1006219387054,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"ddaea4c6.1d9aa8",
+ "id":"882f991c.81f448",
"type":"comment",
"name":"Create urls for restapi",
"info":"",
"comments":"",
- "x":420.9576606750488,
- "y":324.6243562698364,
- "z":"f97ade34.d219f",
+ "x":471.29098892211914,
+ "y":381.95768451690674,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"9efe8414.91ed18",
+ "id":"8786f548.363298",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1153.2434387207031,
- "y":769.4817234054208,
- "z":"f97ade34.d219f",
+ "x":1203.5767669677734,
+ "y":826.8150516524911,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -520,28 +522,28 @@
]
},
{
- "id":"ff41987d.46ce18",
+ "id":"c480648b.753518",
"type":"comment",
"name":"TO DO: vnf/put parent",
"info":"",
"comments":"",
- "x":423.2433776855469,
- "y":698.1481952667236,
- "z":"f97ade34.d219f",
+ "x":473.5767059326172,
+ "y":755.481523513794,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"50e72018.6624",
+ "id":"3806a837.de7398",
"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":407.24338150024414,
- "y":627.4815549850464,
- "z":"f97ade34.d219f",
+ "x":457.57670974731445,
+ "y":684.8148832321167,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -549,32 +551,32 @@
]
},
{
- "id":"d98ea5a4.989128",
+ "id":"5a4abfd2.0da15",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":741.5766868591309,
- "y":491.4814250469208,
- "z":"f97ade34.d219f",
+ "x":791.9100151062012,
+ "y":548.8147532939911,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "838280a9.26353"
+ "3c47542c.97d11c"
]
]
},
{
- "id":"838280a9.26353",
+ "id":"3c47542c.97d11c",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":921.5766372680664,
- "y":492.1479756832123,
- "z":"f97ade34.d219f",
+ "x":971.9099655151367,
+ "y":549.4813039302826,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -582,29 +584,29 @@
]
},
{
- "id":"ef8d3b6f.8c3c58",
+ "id":"dfa3f56.72b5808",
"type":"set",
"name":"set id",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />",
"comments":"",
- "x":390.24342346191406,
- "y":547.1481666564941,
- "z":"f97ade34.d219f",
+ "x":440.5767517089844,
+ "y":604.4814949035645,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"56b9c5ed.fb1fec",
+ "id":"20dc496c.b0ace6",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":2193.5997276306152,
- "y":486.0000190734863,
- "z":"f97ade34.d219f",
+ "x":2243.9330558776855,
+ "y":543.3333473205566,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -612,157 +614,157 @@
]
},
{
- "id":"531893c6.c405dc",
+ "id":"3b2fb4.6046004c",
"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 = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.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=\"operational-status\" value=\"in-service-path\" />\n",
+ "xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.service-information.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=\"operational-status\" value=\"in-service-path\" />\n",
"comments":"",
"outputs":1,
- "x":450.85716247558594,
- "y":731.2380628585815,
- "z":"f97ade34.d219f",
+ "x":501.19049072265625,
+ "y":788.5713911056519,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "35b2a07f.fbd7b",
- "172a8c52.4cd114"
+ "c7a69233.94f79",
+ "ce83f5c3.d60868"
]
]
},
{
- "id":"35b2a07f.fbd7b",
+ "id":"c7a69233.94f79",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":706.6190567016602,
- "y":714.1905598640442,
- "z":"f97ade34.d219f",
+ "x":756.9523849487305,
+ "y":771.5238881111145,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "22b0ba82.e21336"
+ "7c662771.7ce4e8"
]
]
},
{
- "id":"22b0ba82.e21336",
+ "id":"7c662771.7ce4e8",
"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":873.142936706543,
- "y":725.8096308708191,
- "z":"f97ade34.d219f",
+ "x":923.4762649536133,
+ "y":783.1429591178894,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"172a8c52.4cd114",
+ "id":"ce83f5c3.d60868",
"type":"failure",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":713.7143440246582,
- "y":746.9525275230408,
- "z":"f97ade34.d219f",
+ "x":764.0476722717285,
+ "y":804.2858557701111,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "22b0ba82.e21336"
+ "7c662771.7ce4e8"
]
]
},
{
- "id":"7c4bd318.44ab8c",
+ "id":"1375a965.f31cb7",
"type":"execute",
"name":"execute RestApiCallNode - setup BRG to vgMux vxlan tunnel port",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`\" />\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
"comments":"",
"outputs":1,
- "x":563.0000610351562,
- "y":1300.6668300628662,
- "z":"f97ade34.d219f",
+ "x":613.3333892822266,
+ "y":1358.0001583099365,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "37688fbb.e25e1",
- "ac4b28e5.62c318",
- "12690113.8980bf"
+ "fd8e4870.195298",
+ "92c4dc6.6a3982",
+ "86d54efc.3f1a1"
]
]
},
{
- "id":"37688fbb.e25e1",
+ "id":"fd8e4870.195298",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":896.9748497009277,
- "y":1359.9984420761466,
- "z":"f97ade34.d219f",
+ "x":947.308177947998,
+ "y":1417.331770323217,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "5f4a9e0d.9b39c"
+ "4274110.a4e27f"
]
]
},
{
- "id":"ac4b28e5.62c318",
+ "id":"92c4dc6.6a3982",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":887.9748992919922,
- "y":1328.4984678253531,
- "z":"f97ade34.d219f",
+ "x":938.3082275390625,
+ "y":1385.8317960724235,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "5f4a9e0d.9b39c"
+ "4274110.a4e27f"
]
]
},
{
- "id":"12690113.8980bf",
+ "id":"86d54efc.3f1a1",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":891.7249374389648,
- "y":1298.8555727005005,
- "z":"f97ade34.d219f",
+ "x":942.0582656860352,
+ "y":1356.1889009475708,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "2f4610c6.cb40f"
+ "784b51ef.400f4"
]
]
},
{
- "id":"5f4a9e0d.9b39c",
+ "id":"4274110.a4e27f",
"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 brg-allotted-resource\" />\n",
+ "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 setting up vxlan tunnel\" />\n",
"comments":"",
- "x":1057.7249374389648,
- "y":1329.248491667211,
- "z":"f97ade34.d219f",
+ "x":1108.0582656860352,
+ "y":1386.5818199142814,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"2f4610c6.cb40f",
+ "id":"784b51ef.400f4",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1033.3809051513672,
- "y":1295.0477418899536,
- "z":"f97ade34.d219f",
+ "x":1083.7142333984375,
+ "y":1352.381070137024,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -770,95 +772,95 @@
]
},
{
- "id":"14b435e1.73803a",
+ "id":"3545827f.8f7f4e",
"type":"execute",
"name":"execute RestApiCallNode - setup BRG vxlan bridge domain",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.templatefile`\" />\n <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
"comments":"",
"outputs":1,
- "x":544.6668243408203,
- "y":1447.3336246013641,
- "z":"f97ade34.d219f",
+ "x":595.0001525878906,
+ "y":1504.6669528484344,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "3797ac64.379644",
- "fce58130.bb12a",
- "6c45ae8b.a4da4"
+ "71f58f94.4f0b1",
+ "bdcf9d06.49209",
+ "5ea463eb.75999c"
]
]
},
{
- "id":"3797ac64.379644",
+ "id":"71f58f94.4f0b1",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":965.9747314453125,
- "y":1502.9985536560416,
- "z":"f97ade34.d219f",
+ "x":1016.3080596923828,
+ "y":1560.331881903112,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "5e305e58.bfbe4"
+ "9a478018.6afc7"
]
]
},
{
- "id":"fce58130.bb12a",
+ "id":"bdcf9d06.49209",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":956.974781036377,
- "y":1471.4985794052482,
- "z":"f97ade34.d219f",
+ "x":1007.3081092834473,
+ "y":1528.8319076523185,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "5e305e58.bfbe4"
+ "9a478018.6afc7"
]
]
},
{
- "id":"6c45ae8b.a4da4",
+ "id":"5ea463eb.75999c",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":960.7248191833496,
- "y":1441.8556842803955,
- "z":"f97ade34.d219f",
+ "x":1011.0581474304199,
+ "y":1499.1890125274658,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "fb3d8268.ba343"
+ "ccb19ee2.88d68"
]
]
},
{
- "id":"5e305e58.bfbe4",
+ "id":"9a478018.6afc7",
"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 brg-allotted-resource\" />\n",
+ "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 setting up bridge domain\" />\n",
"comments":"",
- "x":1126.7248191833496,
- "y":1472.248603247106,
- "z":"f97ade34.d219f",
+ "x":1177.05814743042,
+ "y":1529.5819314941764,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"fb3d8268.ba343",
+ "id":"ccb19ee2.88d68",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1102.380786895752,
- "y":1438.0478534698486,
- "z":"f97ade34.d219f",
+ "x":1152.7141151428223,
+ "y":1495.381181716919,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -866,28 +868,28 @@
]
},
{
- "id":"815c3841.72ff98",
+ "id":"d0da56bf.5622e8",
"type":"set",
"name":"set BRG to vgMUX VXLAN Tunnel Port Props",
- "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
"comments":"",
- "x":499.1112060546875,
- "y":1165.6670894622803,
- "z":"f97ade34.d219f",
+ "x":549.4445343017578,
+ "y":1223.0004177093506,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"970b23d4.8d05e",
+ "id":"d538a2c.85a8a6",
"type":"execute",
"name":"generate full brg-vpp-honeycomb url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n",
"comments":"",
"outputs":1,
- "x":470.77784729003906,
- "y":1220.6668682098389,
- "z":"f97ade34.d219f",
+ "x":521.1111755371094,
+ "y":1278.0001964569092,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -895,15 +897,15 @@
]
},
{
- "id":"b8e9e857.b4d5e8",
+ "id":"27f6106d.5aed4",
"type":"execute",
"name":"generate honeycomb-url to vBRG",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`\"/>\n",
"comments":"",
"outputs":1,
- "x":461.7778778076172,
- "y":1109.3333940505981,
- "z":"f97ade34.d219f",
+ "x":512.1112060546875,
+ "y":1166.6667222976685,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -911,260 +913,260 @@
]
},
{
- "id":"a9cc06ef.aed3d8",
+ "id":"e3151796.db37b8",
"type":"set",
"name":"set BRG Bridge Domain Props",
"xml":"<set>\n<parameter name='tmp.bridge-domain' value=\"bridge-domain-10\" />\n<parameter name='tmp.split-horizon-group' value=\"2\" />",
"comments":"",
- "x":454.1111602783203,
- "y":1372.3334999084473,
- "z":"f97ade34.d219f",
+ "x":504.4444885253906,
+ "y":1429.6668281555176,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"a0257b81.5e78c8",
+ "id":"ebe53f21.39491",
"type":"comment",
"name":"save service data for BRG to md-sal for SO to do GET ",
"info":"http://c1.vm1.sdnc.simpledemo.openecomp.org:8282/restconf/config/GENERIC-RESOURCE-API:services/service/e565bb6b-de14-4a5c-a992-65a681771a7a/service-data/service-topology/\n\n\nservice-instance-id is of the vBRG (in VNF-API data)",
"comments":"",
- "x":199.2949981689453,
- "y":1965.7714748382568,
- "z":"f97ade34.d219f",
+ "x":247.12836456298828,
+ "y":2208.1048860549927,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"13ddb22.203944e",
+ "id":"34e00507.e2015a",
"type":"execute",
"name":"execute RestApiCallNode - Get service-data by vnf-id",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.vnf-api-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=\"service-data\" />\n\n",
"comments":"",
"outputs":1,
- "x":531.5014686584473,
- "y":2092.834963798523,
- "z":"f97ade34.d219f",
+ "x":579.3348350524902,
+ "y":2335.168375015259,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "855aaba9.6b3aa8",
- "a699d7fa.a36428"
+ "f9a3195e.f8ac28",
+ "2f908e03.72ab72"
]
]
},
{
- "id":"855aaba9.6b3aa8",
+ "id":"f9a3195e.f8ac28",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":820.3213882446289,
- "y":2090.214307308197,
- "z":"f97ade34.d219f",
+ "x":868.1547546386719,
+ "y":2332.547718524933,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "f2f0f6cf.5680f8"
+ "67a6daca.f23f14"
]
]
},
{
- "id":"f2f0f6cf.5680f8",
+ "id":"67a6daca.f23f14",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1001.3213424682617,
- "y":2090.7142567634583,
- "z":"f97ade34.d219f",
+ "x":1049.1547088623047,
+ "y":2333.047667980194,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "4bd61641.b9f8b8",
- "917b8b10.4cc338"
+ "7f905621.dda338",
+ "d4baf35f.de2e1"
]
]
},
{
- "id":"4bd61641.b9f8b8",
+ "id":"7f905621.dda338",
"type":"switchNode",
"name":"switch brg length",
"xml":"<switch test='`$service-data.service-data_length`'>\n",
"comments":"",
"outputs":1,
- "x":1247.1785888671875,
- "y":2125.0000200271606,
- "z":"f97ade34.d219f",
+ "x":1295.0119552612305,
+ "y":2367.3334312438965,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "8fd40478.4d0058"
+ "a000e4e8.1af5b8"
]
]
},
{
- "id":"8fd40478.4d0058",
+ "id":"a000e4e8.1af5b8",
"type":"other",
"name":"outcome 1",
"xml":"<outcome value='1'>\n",
"comments":"",
"outputs":1,
- "x":1438.1785926818848,
- "y":2125.000017642975,
- "z":"f97ade34.d219f",
+ "x":1486.0119590759277,
+ "y":2367.3334288597107,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "dfcd0278.2218"
+ "999b1e9e.5bfaf"
]
]
},
{
- "id":"b0e5cf35.cee86",
+ "id":"6e5d66df.97f278",
"type":"set",
"name":"set service-data from get",
"xml":"<set>\n<parameter name='tmp.service-data.' value='$service-data.service-data[0].' />\n",
"comments":"",
- "x":1838.0357284545898,
- "y":2125.571441888809,
- "z":"f97ade34.d219f",
+ "x":1885.8690948486328,
+ "y":2367.904853105545,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"dfcd0278.2218",
+ "id":"999b1e9e.5bfaf",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic='true'>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1609.0355758666992,
- "y":2125.571486711502,
- "z":"f97ade34.d219f",
+ "x":1656.8689422607422,
+ "y":2367.904897928238,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "b0e5cf35.cee86",
- "86e0cd73.efb82"
+ "6e5d66df.97f278",
+ "1332711d.1fdf5f"
]
]
},
{
- "id":"e935998f.98c578",
+ "id":"3cfd785e.b271f8",
"type":"comment",
"name":"GET vnf-api service info",
"info":"",
"comments":"",
- "x":436.8927230834961,
- "y":2056.142660140991,
- "z":"f97ade34.d219f",
+ "x":484.72608947753906,
+ "y":2298.476071357727,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"86e0cd73.efb82",
+ "id":"1332711d.1fdf5f",
"type":"switchNode",
"name":"switch order-status",
"xml":"<switch test='`$tmp.service-data.order-status`'>\n",
"comments":"",
"outputs":1,
- "x":1821.7499465942383,
- "y":2177.142867088318,
- "z":"f97ade34.d219f",
+ "x":1869.5833129882812,
+ "y":2419.4762783050537,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "80a04a27.27e6e8",
- "bd91de80.00dd6"
+ "5742a527.99787c",
+ "2015a1f1.ad28de"
]
]
},
{
- "id":"80a04a27.27e6e8",
+ "id":"5742a527.99787c",
"type":"outcome",
"name":"outcome Created",
"xml":"<outcome value='Created'>\n",
"comments":"",
"outputs":1,
- "x":2061.635509490967,
- "y":2141.571415901184,
- "z":"f97ade34.d219f",
+ "x":2109.4688758850098,
+ "y":2383.90482711792,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "e6bcc367.5fb5e"
+ "bf4dbc1f.29998"
]
]
},
{
- "id":"bd91de80.00dd6",
+ "id":"2015a1f1.ad28de",
"type":"outcome",
"name":"outcome Other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":2087.349884033203,
- "y":2177.00000667572,
- "z":"f97ade34.d219f",
+ "x":2135.183250427246,
+ "y":2419.333417892456,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "e6bcc367.5fb5e"
+ "bf4dbc1f.29998"
]
]
},
{
- "id":"ead3daba.b613a8",
+ "id":"ab18aec0.ff514",
"type":"comment",
"name":"Set service-data",
"info":"",
"comments":"",
- "x":410.9879837036133,
- "y":2140.9998531341553,
- "z":"f97ade34.d219f",
+ "x":458.8213348388672,
+ "y":2423.3332872390747,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"917b8b10.4cc338",
+ "id":"d4baf35f.de2e1",
"type":"set",
"name":"save backup copy of mdsal-ar for rollback",
"xml":"<set>\n<parameter name='bk-service-data' value='$service-data.' />\n",
"comments":"",
- "x":1326.892921447754,
- "y":2090.71434879303,
- "z":"f97ade34.d219f",
+ "x":1374.7262878417969,
+ "y":2333.0477600097656,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"a699d7fa.a36428",
+ "id":"2f908e03.72ab72",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":820.0831832885742,
- "y":2126.4284801483154,
- "z":"f97ade34.d219f",
+ "x":867.9165496826172,
+ "y":2368.7618913650513,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "bcb372d0.e3af8"
+ "1386528.5f8f8ae"
]
]
},
{
- "id":"bcb372d0.e3af8",
+ "id":"1386528.5f8f8ae",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1000.0831336975098,
- "y":2127.095030784607,
- "z":"f97ade34.d219f",
+ "x":1047.9165000915527,
+ "y":2369.428442001343,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1172,16 +1174,16 @@
]
},
{
- "id":"e6bcc367.5fb5e",
+ "id":"bf4dbc1f.29998",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":2276.106025695801,
- "y":2142.9470500946045,
- "z":"f97ade34.d219f",
+ "x":2323.9393920898438,
+ "y":2385.2804613113403,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1189,15 +1191,15 @@
]
},
{
- "id":"17504c2b.5ecc04",
+ "id":"247b453a.8a26fa",
"type":"execute",
"name":"generate vnf service-info url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vnf-api.service-information`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vnf-api-url\"/>\n <parameter name=\"target\" value=\"{vnf-id}\"/>\n <parameter name=\"replacement\" value=\"`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`\"/>\n",
"comments":"",
"outputs":1,
- "x":452.3109130859375,
- "y":2014.2635564804077,
- "z":"f97ade34.d219f",
+ "x":500.14427947998047,
+ "y":2256.5969676971436,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1205,95 +1207,95 @@
]
},
{
- "id":"173f16cf.2f6b79",
+ "id":"a690ec81.282ab",
"type":"execute",
"name":"execute RestApiCallNode - PUT service into service",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.services.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.services-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":531.5966529846191,
- "y":2269.5020151138306,
- "z":"f97ade34.d219f",
+ "x":579.4300193786621,
+ "y":2511.8354263305664,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "5cf17dae.c40c44",
- "35de11e4.9a122e",
- "95e02b4f.ebd798"
+ "39a87d6f.57f612",
+ "88676ff2.098cf",
+ "3d4681e7.6871ae"
]
]
},
{
- "id":"5cf17dae.c40c44",
+ "id":"39a87d6f.57f612",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":1037.8095092773438,
- "y":2264.024027824402,
- "z":"f97ade34.d219f",
+ "x":1085.6428756713867,
+ "y":2506.3574390411377,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "6d015df7.3af934"
+ "2f4ba713.bd1b78"
]
]
},
{
- "id":"35de11e4.9a122e",
+ "id":"88676ff2.098cf",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":1028.8095588684082,
- "y":2232.5240535736084,
- "z":"f97ade34.d219f",
+ "x":1076.6429252624512,
+ "y":2474.8574647903442,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "6d015df7.3af934"
+ "2f4ba713.bd1b78"
]
]
},
{
- "id":"95e02b4f.ebd798",
+ "id":"3d4681e7.6871ae",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":1032.5595970153809,
- "y":2202.8811584487557,
- "z":"f97ade34.d219f",
+ "x":1080.3929634094238,
+ "y":2445.2145696654916,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "90681ac.479fee8"
+ "e4df1de4.99fab"
]
]
},
{
- "id":"6d015df7.3af934",
+ "id":"2f4ba713.bd1b78",
"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 brg-allotted-resource\" />\n",
"comments":"",
- "x":1198.5595970153809,
- "y":2233.2740774154663,
- "z":"f97ade34.d219f",
+ "x":1246.3929634094238,
+ "y":2475.607488632202,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"90681ac.479fee8",
+ "id":"e4df1de4.99fab",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1174.2155647277832,
- "y":2199.073327638209,
- "z":"f97ade34.d219f",
+ "x":1222.0489311218262,
+ "y":2441.4067388549447,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1301,15 +1303,15 @@
]
},
{
- "id":"75aa4c7c.d1f814",
+ "id":"7f06ccd3.5f4544",
"type":"execute",
"name":"generate services url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.services`\"/>\n <parameter name=\"outputPath\" value=\"tmp.services-url\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.service-data.service-information.service-instance-id`\"/>\n",
"comments":"",
"outputs":1,
- "x":434.9299964904785,
- "y":2229.0258140563965,
- "z":"f97ade34.d219f",
+ "x":482.7633628845215,
+ "y":2471.3592252731323,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1317,15 +1319,15 @@
]
},
{
- "id":"5bcb3869.fa6198",
+ "id":"7cd4ecac.c5c874",
"type":"get-resource",
"name":"get-resource IPADDR from dmaap DHCP_MAP ",
"xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key=\"SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address\" pfx=\"tmp.brg-wan-ip\" >\n",
"comments":"",
"outputs":1,
- "x":507.85716247558594,
- "y":857.7501087188721,
- "z":"f97ade34.d219f",
+ "x":558.1904907226562,
+ "y":915.0834369659424,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1333,41 +1335,41 @@
]
},
{
- "id":"60d1bf52.ad3d6",
+ "id":"afbc0299.7c62f",
"type":"set",
"name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />\n",
"comments":"",
- "x":594.0000305175781,
- "y":907.0000267028809,
- "z":"f97ade34.d219f",
+ "x":644.3333587646484,
+ "y":964.3333549499512,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"ac82543e.0a2288",
+ "id":"a76a910b.2c1fa",
"type":"set",
"name":"set tmp.ar.consuming-service-instance-id to find vgmux-lan-ip",
"xml":"<set>\n<parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
"comments":"",
- "x":554.9999694824219,
- "y":954.9998550415039,
- "z":"f97ade34.d219f",
+ "x":605.3332977294922,
+ "y":1012.3331832885742,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"4a0f8ea5.474a2",
+ "id":"43cd6015.f74aa",
"type":"call",
- "name":"call GENERIC-RESOURCE-API:get-vgmux-lan-ip",
- "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-vgmux-lan-ip' mode='sync' >\n",
+ "name":"call GENERIC-RESOURCE-API:get-tunnelxconn-ar",
+ "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' >\n",
"comments":"",
"outputs":1,
- "x":515.0000152587891,
- "y":1003.3331918716431,
- "z":"f97ade34.d219f",
+ "x":565.3333435058594,
+ "y":1060.6665201187134,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1375,121 +1377,121 @@
]
},
{
- "id":"5f66c498.33c76c",
+ "id":"a44bc809.331528",
"type":"set",
"name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />\n",
"comments":"",
- "x":593.3332672119141,
- "y":1056.6665697097778,
- "z":"f97ade34.d219f",
+ "x":643.6665954589844,
+ "y":1113.9998979568481,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"e5c25a7.36cf4a8",
+ "id":"45028fce.bc261",
"type":"comment",
"name":"Change to POST and just update service?",
"info":"",
"comments":"",
- "x":627.8571662902832,
- "y":2293.928587913513,
- "z":"f97ade34.d219f",
+ "x":675.6905326843262,
+ "y":2536.261999130249,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"9e2897fc.bd5fd8",
+ "id":"ddefeb7c.fde178",
"type":"execute",
- "name":"execute RestApiCallNode - setup BRG to vgMux vxlan tunnel port",
+ "name":"execute RestApiCallNode - setup vG to vgMux vxlan tunnel port",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`\" />\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
"comments":"",
"outputs":1,
- "x":571.6666870117188,
- "y":1769.1666793823242,
- "z":"f97ade34.d219f",
+ "x":619.5000534057617,
+ "y":2011.50009059906,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "d26a8b7a.d9ece8",
- "fbdedf10.5454a",
- "57356d95.5d51a4"
+ "3f1edea5.6a50d2",
+ "8888b0ab.16315",
+ "3526cde7.569032"
]
]
},
{
- "id":"d26a8b7a.d9ece8",
+ "id":"3f1edea5.6a50d2",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":905.6414756774902,
- "y":1828.4982913956046,
- "z":"f97ade34.d219f",
+ "x":953.4748420715332,
+ "y":2070.8317026123405,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "44fec79e.04adb8"
+ "c0fc11de.72caa"
]
]
},
{
- "id":"fbdedf10.5454a",
+ "id":"8888b0ab.16315",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":896.6415252685547,
- "y":1796.9983171448112,
- "z":"f97ade34.d219f",
+ "x":944.4748916625977,
+ "y":2039.331728361547,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "44fec79e.04adb8"
+ "c0fc11de.72caa"
]
]
},
{
- "id":"57356d95.5d51a4",
+ "id":"3526cde7.569032",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":900.3915634155273,
- "y":1767.3554220199585,
- "z":"f97ade34.d219f",
+ "x":948.2249298095703,
+ "y":2009.6888332366943,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "267bd26d.8679be"
+ "efec532d.a134e"
]
]
},
{
- "id":"44fec79e.04adb8",
+ "id":"c0fc11de.72caa",
"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 brg-allotted-resource\" />\n",
+ "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 setting up vxlan tunnel\" />\n",
"comments":"",
- "x":1066.3915634155273,
- "y":1797.748340986669,
- "z":"f97ade34.d219f",
+ "x":1114.2249298095703,
+ "y":2040.081752203405,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"267bd26d.8679be",
+ "id":"efec532d.a134e",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1042.0475311279297,
- "y":1763.5475912094116,
- "z":"f97ade34.d219f",
+ "x":1089.8808975219727,
+ "y":2005.8810024261475,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1497,95 +1499,95 @@
]
},
{
- "id":"fc322e28.718d1",
+ "id":"127d8c70.64ae14",
"type":"execute",
"name":"execute RestApiCallNode - setup BRG vxlan bridge domain",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.bridge-domain.templatefile`\" />\n <parameter name='restapiUrl' value=\"`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `\" />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
"comments":"",
"outputs":1,
- "x":551.6668167114258,
- "y":1875.833604812622,
- "z":"f97ade34.d219f",
+ "x":599.5001831054688,
+ "y":2118.167016029358,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "2e288f38.66f4a",
- "bb6fb110.a62d",
- "2d9ebec0.87afb2"
+ "4d574e47.5fa9a",
+ "5d98b669.650688",
+ "d9d3976b.be5808"
]
]
},
{
- "id":"2e288f38.66f4a",
+ "id":"4d574e47.5fa9a",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":896.3081550598145,
- "y":1956.498349569738,
- "z":"f97ade34.d219f",
+ "x":944.1415214538574,
+ "y":2198.8317607864738,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "171f1a40.fd48f6"
+ "414d312.d89cfd"
]
]
},
{
- "id":"bb6fb110.a62d",
+ "id":"5d98b669.650688",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":887.3082046508789,
- "y":1924.9983753189445,
- "z":"f97ade34.d219f",
+ "x":935.1415710449219,
+ "y":2167.3317865356803,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "171f1a40.fd48f6"
+ "414d312.d89cfd"
]
]
},
{
- "id":"2d9ebec0.87afb2",
+ "id":"d9d3976b.be5808",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":891.0582427978516,
- "y":1895.3554801940918,
- "z":"f97ade34.d219f",
+ "x":938.8916091918945,
+ "y":2137.6888914108276,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
- "8bfdc2b2.d6b66"
+ "ea34928b.af361"
]
]
},
{
- "id":"171f1a40.fd48f6",
+ "id":"414d312.d89cfd",
"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 brg-allotted-resource\" />\n",
+ "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 setting up bridge domain\" />\n",
"comments":"",
- "x":1057.0582427978516,
- "y":1925.7483991608024,
- "z":"f97ade34.d219f",
+ "x":1104.8916091918945,
+ "y":2168.081810377538,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"8bfdc2b2.d6b66",
+ "id":"ea34928b.af361",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1032.714210510254,
- "y":1891.547649383545,
- "z":"f97ade34.d219f",
+ "x":1080.5475769042969,
+ "y":2133.8810606002808,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1593,28 +1595,28 @@
]
},
{
- "id":"ecf121e2.af8c8",
+ "id":"dad15ca1.13a96",
"type":"set",
"name":"set vG to vgMUX VXLAN Tunnel Port Props",
- "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
"comments":"",
- "x":501.4445343017578,
- "y":1669.1668691635132,
- "z":"f97ade34.d219f",
+ "x":549.2779006958008,
+ "y":1911.500280380249,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"496f8c72.09c0b4",
+ "id":"898815a9.12a638",
"type":"execute",
- "name":"generate full brg-vpp-honeycomb url",
+ "name":"generate full vg-vpp-honeycomb url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n",
"comments":"",
"outputs":1,
- "x":481.1111755371094,
- "y":1724.1666479110718,
- "z":"f97ade34.d219f",
+ "x":528.9445419311523,
+ "y":1966.5000591278076,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1622,15 +1624,15 @@
]
},
{
- "id":"5f18f40a.7db70c",
+ "id":"890a1877.5b6b98",
"type":"execute",
"name":"generate honeycomb-url to vG",
- "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip`\"/>\n",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip`\"/>\n",
"comments":"",
"outputs":1,
- "x":460.44456481933594,
- "y":1609.499843597412,
- "z":"f97ade34.d219f",
+ "x":508.2779312133789,
+ "y":1851.833254814148,
+ "z":"5fc74ec4.a79bd",
"wires":[
[
@@ -1638,53 +1640,299 @@
]
},
{
- "id":"eab64b.710229b8",
+ "id":"4ebb5d6e.3b72b4",
"type":"set",
"name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n",
"comments":"",
- "x":570.0000457763672,
- "y":1506.666633605957,
- "z":"f97ade34.d219f",
+ "x":620.3333740234375,
+ "y":1563.9999618530273,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"36e0c301.ee8e2c",
+ "id":"94c1462c.043b88",
"type":"set",
"name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />\n",
"comments":"",
- "x":608.3333435058594,
- "y":1556.6665630340576,
- "z":"f97ade34.d219f",
+ "x":658.6666717529297,
+ "y":1613.999891281128,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"a70320e9.12944",
+ "id":"cf968917.b69b88",
"type":"comment",
"name":"Setup VXLAN Tunnel - vG to vgMUX",
"info":"",
"comments":"",
- "x":155,
- "y":1509.999852180481,
- "z":"f97ade34.d219f",
+ "x":205.3333282470703,
+ "y":1567.3331804275513,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
},
{
- "id":"a334503d.66fee",
+ "id":"e863c266.46b5f",
"type":"comment",
"name":"Setup VXLAN Tunnel - vBRG to vgMUX",
"info":"",
"comments":"",
- "x":157.1666717529297,
- "y":860.0001373291016,
- "z":"f97ade34.d219f",
+ "x":207.5,
+ "y":917.3334655761719,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"80306115.be919",
+ "type":"comment",
+ "name":"Get vg-mgmt-ip",
+ "info":"brg tunnelxconnn consuming-service-instance-id\nfound in services as service-instance-id",
+ "comments":"",
+ "x":203.33334350585938,
+ "y":1761.6669359207153,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"2b05ed04.a37c82",
+ "type":"set",
+ "name":"set tmp.search.consuming-service-instance-id to find vg-mgmt-ip",
+ "xml":"<set>\n<parameter name='tmp.search.consuming-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
+ "comments":"",
+ "x":606.4999313354492,
+ "y":1685.6662950515747,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"64e3c820.beeeb8",
+ "type":"for",
+ "name":"for tmp.servicedata.services",
+ "xml":"<for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1460.666519165039,
+ "y":1628.333200454712,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "437927a8.b53de8"
+ ]
+ ]
+ },
+ {
+ "id":"59a607df.c64478",
+ "type":"get-resource",
+ "name":"get-resource generic-resource-api:services ",
+ "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":544.0000381469727,
+ "y":1762.9997386932373,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "d452dcaa.3bee9",
+ "6e818aeb.a4aa04",
+ "eac2b2a0.0610f"
+ ]
+ ]
+ },
+ {
+ "id":"437927a8.b53de8",
+ "type":"switchNode",
+ "name":"switch parent-service-instance-id matches",
+ "xml":"<switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1545.3333435058594,
+ "y":1709.0000143051147,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "82666621.1fed58"
+ ]
+ ]
+ },
+ {
+ "id":"82666621.1fed58",
+ "type":"success",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1799.3333358764648,
+ "y":1701.6665935516357,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "d33ebff.e8b004"
+ ]
+ ]
+ },
+ {
+ "id":"d452dcaa.3bee9",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1140.6666259765625,
+ "y":1664.999797821045,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "64e3c820.beeeb8"
+ ]
+ ]
+ },
+ {
+ "id":"eac2b2a0.0610f",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1118.999984741211,
+ "y":1731.6664905548096,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "7856f029.11793"
+ ]
+ ]
+ },
+ {
+ "id":"6e818aeb.a4aa04",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1110.0000343322754,
+ "y":1700.166516304016,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "7856f029.11793"
+ ]
+ ]
+ },
+ {
+ "id":"7856f029.11793",
+ "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 getting GENERIC-RESOURCE-API:services\" />\n",
+ "comments":"",
+ "x":1279.750072479248,
+ "y":1700.916540145874,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d33ebff.e8b004",
+ "type":"for",
+ "name":"for service vnfs",
+ "xml":"<for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1937.6664505004883,
+ "y":1549.9999027252197,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "ee53e172.1bc7a"
+ ]
+ ]
+ },
+ {
+ "id":"150fc701.eb64c9",
+ "type":"switchNode",
+ "name":"switch parent-service-instance-id matches",
+ "xml":"<switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2409.666473388672,
+ "y":1631.6666069030762,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "48cef87f.eedc58"
+ ]
+ ]
+ },
+ {
+ "id":"48cef87f.eedc58",
+ "type":"success",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2659.6665573120117,
+ "y":1633.3333415985107,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "f0d4ba11.70cc48"
+ ]
+ ]
+ },
+ {
+ "id":"ee53e172.1bc7a",
+ "type":"for",
+ "name":"for service vnf vf-modules",
+ "xml":"<for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2074.666603088379,
+ "y":1634.9998846054077,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "e6adb279.1c4ce"
+ ]
+ ]
+ },
+ {
+ "id":"e6adb279.1c4ce",
+ "type":"for",
+ "name":"for service vnfs vf-modules parameters",
+ "xml":"<for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2164.6665802001953,
+ "y":1719.9998531341553,
+ "z":"5fc74ec4.a79bd",
+ "wires":[
+ [
+ "150fc701.eb64c9"
+ ]
+ ]
+ },
+ {
+ "id":"f0d4ba11.70cc48",
+ "type":"set",
+ "name":"set vg-mgmt-ip",
+ "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />\n",
+ "comments":"",
+ "x":2841.333106994629,
+ "y":1629.999900817871,
+ "z":"5fc74ec4.a79bd",
"wires":[
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
index 0fa18c02..e0c246b3 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-assign.json
@@ -1,20 +1,20 @@
[
{
- "id":"447755b1.5a154c",
+ "id":"e5ee9a68.8f74a8",
"type":"dgstart",
"name":"DGSTART",
"outputs":1,
- "x":275,
- "y":195,
- "z":"d3629202.0e9a9",
+ "x":125,
+ "y":52.5,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "66bfcde5.5d96c4"
+ "393cc04a.70965"
]
]
},
{
- "id":"66bfcde5.5d96c4",
+ "id":"393cc04a.70965",
"type":"service-logic",
"name":"GENERIC-RESOURCE-API ${project.version}",
"module":"GENERIC-RESOURCE-API",
@@ -22,602 +22,602 @@
"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":371.2380790710449,
- "y":255.95239067077637,
- "z":"d3629202.0e9a9",
+ "x":221.23807907104492,
+ "y":113.45239067077637,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "2dfe1c17.827494"
+ "8d790a6c.626248"
]
]
},
{
- "id":"2dfe1c17.827494",
+ "id":"8d790a6c.626248",
"type":"method",
"name":"brg-topology-operation-assign",
"xml":"<method rpc='brg-topology-operation-assign' mode='sync'>\n",
"comments":"",
"outputs":1,
- "x":417.15485763549805,
- "y":291.1904458999634,
- "z":"d3629202.0e9a9",
+ "x":267.15485763549805,
+ "y":148.69044589996338,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "8e0c81af.52e65"
+ "709e013b.ec7ed"
]
]
},
{
- "id":"8e0c81af.52e65",
+ "id":"709e013b.ec7ed",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"comments":"",
"outputs":1,
- "x":325.47619247436523,
- "y":434.5237879753113,
- "z":"d3629202.0e9a9",
+ "x":175.47619247436523,
+ "y":292.0237879753113,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "28efce96.95a252",
- "74f2d05d.d128",
- "b05fdf22.36f2",
- "3df4d53c.54c6ca",
- "c8732493.f72838"
+ "5341126d.beb3cc",
+ "18e0684.02efa98",
+ "3d25a078.5fbfa",
+ "4f907ab1.9b90b4",
+ "8f923afe.9146b8"
]
]
},
{
- "id":"2755b2a9.79da1e",
+ "id":"3cb0dbf.eb62a24",
"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":1168.6666564941406,
- "y":2361.5477046966553,
- "z":"d3629202.0e9a9",
+ "x":1018.6666564941406,
+ "y":2219.0477046966553,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"12aa04eb.1fdf1b",
+ "id":"b4a4d9bb.64b1c8",
"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='tunnelxconn-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
"comments":"",
- "x":1205.7540550231934,
- "y":2240.432439804077,
- "z":"d3629202.0e9a9",
+ "x":1055.7540550231934,
+ "y":2097.932439804077,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"9736c0da.28d34",
+ "id":"77739892.271138",
"type":"set",
"name":"set allotted-resource-oper-status",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
"comments":"",
- "x":1277.468376159668,
- "y":1657.6228160858154,
- "z":"d3629202.0e9a9",
+ "x":1127.468376159668,
+ "y":1515.1228160858154,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"74f2d05d.d128",
+ "id":"18e0684.02efa98",
"type":"set",
"name":"set tmp.ar.self-link",
"xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/tunnelxconn-topology/'` \" />\n\n",
"comments":"",
- "x":755.7380676269531,
- "y":326.33331298828125,
- "z":"d3629202.0e9a9",
+ "x":605.7380676269531,
+ "y":183.83331298828125,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"28efce96.95a252",
+ "id":"5341126d.beb3cc",
"type":"set",
"name":"set tmp.ar.allotted-resource-id,etc",
"xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
"comments":"",
- "x":808.997314453125,
- "y":288.59259033203125,
- "z":"d3629202.0e9a9",
+ "x":658.997314453125,
+ "y":146.09259033203125,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"b6562205.a7488",
+ "id":"2eb376c7.9249fa",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":958.8148803710938,
- "y":474.26727294921875,
- "z":"d3629202.0e9a9",
+ "x":808.8148803710938,
+ "y":331.76727294921875,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "af1477fd.c2ef48"
+ "bfb84d8.6226eb"
]
]
},
{
- "id":"72e34d2d.88e074",
+ "id":"98be663.e803998",
"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.brg.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":1298.8626251220703,
- "y":1882.1008231639862,
- "z":"d3629202.0e9a9",
+ "x":1148.8626251220703,
+ "y":1739.6008231639862,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "d589ef8a.4b767",
- "6a9fa011.f03d8",
- "851f57de.ccd048"
+ "567616cd.4d0bc8",
+ "34674551.1ef96a",
+ "c49baabf.6ac098"
]
]
},
{
- "id":"d589ef8a.4b767",
+ "id":"567616cd.4d0bc8",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":1567.5040016174316,
- "y":1933.4322349056602,
- "z":"d3629202.0e9a9",
+ "x":1417.5040016174316,
+ "y":1790.9322349056602,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "e12a7d91.5e076"
+ "1afb211c.3db5af"
]
]
},
{
- "id":"6a9fa011.f03d8",
+ "id":"34674551.1ef96a",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":1558.504051208496,
- "y":1901.9322606548667,
- "z":"d3629202.0e9a9",
+ "x":1408.504051208496,
+ "y":1759.4322606548667,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "e12a7d91.5e076"
+ "1afb211c.3db5af"
]
]
},
{
- "id":"851f57de.ccd048",
+ "id":"c49baabf.6ac098",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":1562.2540893554688,
- "y":1872.289365530014,
- "z":"d3629202.0e9a9",
+ "x":1412.2540893554688,
+ "y":1729.789365530014,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "92379d68.800b2"
+ "24c4fc44.bfefd4"
]
]
},
{
- "id":"e12a7d91.5e076",
+ "id":"1afb211c.3db5af",
"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 tunnelxconn-allotted-resource\" />\n",
"comments":"",
- "x":1728.2540893554688,
- "y":1902.6822844967246,
- "z":"d3629202.0e9a9",
+ "x":1578.2540893554688,
+ "y":1760.1822844967246,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"fe3888af.6a0dc8",
+ "id":"b9913138.178af",
"type":"set",
"name":"set oper-status",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
"comments":"",
- "x":1308.5294189453125,
- "y":575.0529174804688,
- "z":"d3629202.0e9a9",
+ "x":1158.5294189453125,
+ "y":432.55291748046875,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"3526b3c4.21b13c",
+ "id":"23613fee.e7e3c",
"type":"comment",
"name":"Save consumed-allotted-resources to mdsal",
"info":"",
"comments":"",
- "x":1376.2434692382812,
- "y":1256.7196044921875,
- "z":"d3629202.0e9a9",
+ "x":1226.2434692382812,
+ "y":1114.2196044921875,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"e7882796.2e25a8",
+ "id":"c3ce8536.056418",
"type":"comment",
"name":"GET tunnelxconn-allotted-resource from mdsal",
"info":"",
"comments":"",
- "x":681.8148193359375,
- "y":444.7672119140625,
- "z":"d3629202.0e9a9",
+ "x":531.8148193359375,
+ "y":302.2672119140625,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"af1477fd.c2ef48",
+ "id":"bfb84d8.6226eb",
"type":"returnFailure",
"name":"return failure - tunnelxconn already exists",
"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 brg-allotted-resource with order status of ' + $mdsal-ar.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
"comments":"",
- "x":1268.129150390625,
- "y":470.6243896484375,
- "z":"d3629202.0e9a9",
+ "x":1118.129150390625,
+ "y":328.1243896484375,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"5ce4ff52.c3598",
+ "id":"adfbfac.9b9f208",
"type":"set",
"name":"set brg-ar-identifiers",
"xml":"<set>\n<parameter name='brg-ar-identifiers.consuming-service-instance-id' value=\"`$brg-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='brg-ar-identifiers.parent-service-instance-id' value=\"`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-type' value=\"`$brg-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='brg-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
"comments":"",
- "x":1318.38623046875,
- "y":668.6243896484375,
- "z":"d3629202.0e9a9",
+ "x":1168.38623046875,
+ "y":526.1243896484375,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"72aaacf.5bef354",
+ "id":"dfee41c5.0d9b3",
"type":"comment",
"name":"Set allotted-resource-identifiers",
"info":"",
"comments":"",
- "x":1345.338623046875,
- "y":627.338623046875,
- "z":"d3629202.0e9a9",
+ "x":1195.338623046875,
+ "y":484.838623046875,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"e4f1d676.269118",
+ "id":"ea01d74e.35b878",
"type":"set",
"name":"set identifiers in overall structure",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.allotted-resource-identifiers.' \nvalue=\"`$brg-ar-identifiers.`\" />\n\n\n",
"comments":"",
- "x":1335.38623046875,
- "y":976.910400390625,
- "z":"d3629202.0e9a9",
+ "x":1185.38623046875,
+ "y":834.410400390625,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"af5a8dd4.2718",
+ "id":"33b72d9b.8a20c2",
"type":"set",
"name":"set onap model information from input",
"xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.brg-topology.onap-model-information.' \nvalue=\"`$brg-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n",
"comments":"",
- "x":1363.957763671875,
- "y":711.9100952148438,
- "z":"d3629202.0e9a9",
+ "x":1213.957763671875,
+ "y":569.4100952148438,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"6487f749.00d688",
+ "id":"afbfed3a.08159",
"type":"switchNode",
"name":"switch model-invariant-uuid is null",
"xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n",
"comments":"",
"outputs":1,
- "x":1343.8148193359375,
- "y":751.19580078125,
- "z":"d3629202.0e9a9",
+ "x":1193.8148193359375,
+ "y":608.69580078125,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "ac9d6ff3.e94f3"
+ "40b2b772.23c3f8"
]
]
},
{
- "id":"ac9d6ff3.e94f3",
+ "id":"40b2b772.23c3f8",
"type":"outcome",
"name":"outcome null",
"xml":"<outcome value=''>\n",
"comments":"",
"outputs":1,
- "x":1571.9576988220215,
- "y":752.6243271827698,
- "z":"d3629202.0e9a9",
+ "x":1421.9576988220215,
+ "y":610.1243271827698,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "6de39e79.3ed02"
+ "853c921b.506c8"
]
]
},
{
- "id":"6de39e79.3ed02",
+ "id":"853c921b.506c8",
"type":"set",
"name":"set model-invariant-uuid",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n",
"comments":"",
- "x":1773.38627243042,
- "y":752.0528798103333,
- "z":"d3629202.0e9a9",
+ "x":1623.38627243042,
+ "y":609.5528798103333,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"62ed5c3a.385604",
+ "id":"d3ea34e9.368c88",
"type":"switchNode",
"name":"switch model-uuid is null",
"xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n",
"comments":"",
"outputs":1,
- "x":1316.2434158325195,
- "y":785.4815106391907,
- "z":"d3629202.0e9a9",
+ "x":1166.2434158325195,
+ "y":642.9815106391907,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "94d93434.23d938"
+ "e20ffb32.51cf08"
]
]
},
{
- "id":"94d93434.23d938",
+ "id":"e20ffb32.51cf08",
"type":"outcome",
"name":"outcome null",
"xml":"<outcome value=''>\n",
"comments":"",
"outputs":1,
- "x":1517.6719818115234,
- "y":786.0529322624207,
- "z":"d3629202.0e9a9",
+ "x":1367.6719818115234,
+ "y":643.5529322624207,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "aa516303.e0eee"
+ "3277974f.69b6d8"
]
]
},
{
- "id":"aa516303.e0eee",
+ "id":"3277974f.69b6d8",
"type":"set",
"name":"set model-uuid",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n",
"comments":"",
- "x":1710.529140472412,
- "y":786.0528540611267,
- "z":"d3629202.0e9a9",
+ "x":1560.529140472412,
+ "y":643.5528540611267,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"15675ff3.fe7c9",
+ "id":"40fda3ea.8add9c",
"type":"switchNode",
"name":"switch model-version is null",
"xml":"<switch test='$brg-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n",
"comments":"",
"outputs":1,
- "x":1324.8148193359375,
- "y":818.3386378288269,
- "z":"d3629202.0e9a9",
+ "x":1174.8148193359375,
+ "y":675.8386378288269,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "baad5acc.7ffcb8"
+ "f1c91438.54f678"
]
]
},
{
- "id":"baad5acc.7ffcb8",
+ "id":"f1c91438.54f678",
"type":"outcome",
"name":"outcome null",
"xml":"<outcome value=''>\n",
"comments":"",
"outputs":1,
- "x":1574.8148002624512,
- "y":818.3386225700378,
- "z":"d3629202.0e9a9",
+ "x":1424.8148002624512,
+ "y":675.8386225700378,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "ff89d62f.a88838"
+ "dd6dede8.36e8b"
]
]
},
{
- "id":"ff89d62f.a88838",
+ "id":"dd6dede8.36e8b",
"type":"set",
"name":"set model-version",
"xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version' \nvalue=\"`$ar-model.version`\" />\n\n\n",
"comments":"",
- "x":1767.6719589233398,
- "y":818.3385443687439,
- "z":"d3629202.0e9a9",
+ "x":1617.6719589233398,
+ "y":675.8385443687439,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"4359a5ff.7933ac",
+ "id":"c14238e7.7fc528",
"type":"switchNode",
"name":"switch ar-model.ecomp-generated-naming",
"xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n",
"comments":"",
"outputs":1,
- "x":1388.38623046875,
- "y":920.7672729492188,
- "z":"d3629202.0e9a9",
+ "x":1238.38623046875,
+ "y":778.2672729492188,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "caaf3501.3ba9c8",
- "2ae9bf81.d8366"
+ "e1eb2b6.299a9d8",
+ "b14c2617.4ba278"
]
]
},
{
- "id":"caaf3501.3ba9c8",
+ "id":"e1eb2b6.299a9d8",
"type":"other",
"name":"outcome Y",
"xml":"<outcome value='Y'>\n",
"comments":"",
"outputs":1,
- "x":1674.3862915039062,
- "y":920.1958618164062,
- "z":"d3629202.0e9a9",
+ "x":1524.3862915039062,
+ "y":777.6958618164062,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "e333882f.732e78"
+ "cb449102.0bfe4"
]
]
},
{
- "id":"e333882f.732e78",
+ "id":"cb449102.0bfe4",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"true",
"comments":"",
"outputs":1,
- "x":1828.1363525390625,
- "y":922.69580078125,
- "z":"d3629202.0e9a9",
+ "x":1678.1363525390625,
+ "y":780.19580078125,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "68a80432.57affc"
+ "6222201e.ef0d1"
]
]
},
{
- "id":"2ae9bf81.d8366",
+ "id":"b14c2617.4ba278",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":1693.608642578125,
- "y":1009.1958618164062,
- "z":"d3629202.0e9a9",
+ "x":1543.608642578125,
+ "y":866.6958618164062,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "363e0870.e596f8"
+ "ba1cec2.367321"
]
]
},
{
- "id":"363e0870.e596f8",
+ "id":"ba1cec2.367321",
"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 in allotted-resource-model data. Ecomp-generated-naming should be true\" />\n\n",
"comments":"",
- "x":1876.608642578125,
- "y":1014.1958618164062,
- "z":"d3629202.0e9a9",
+ "x":1726.608642578125,
+ "y":871.6958618164062,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"68a80432.57affc",
+ "id":"6222201e.ef0d1",
"type":"switchNode",
"name":"switch ar-model.ecomp-generated-naming",
"xml":"<switch test='`$ar-model.naming-policy`'>\n",
"comments":"",
"outputs":1,
- "x":1964.38623046875,
- "y":971.767333984375,
- "z":"d3629202.0e9a9",
+ "x":1814.38623046875,
+ "y":829.267333984375,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "b9e5730f.7b10e",
- "1e6aef5f.dbbe91"
+ "82b261b0.84ccc",
+ "d8af7c81.cbd5"
]
]
},
{
- "id":"b9e5730f.7b10e",
+ "id":"82b261b0.84ccc",
"type":"other",
"name":"outcome oam_network_policy",
"xml":"<outcome value='oam_network_policy'>\n",
"comments":"",
"outputs":1,
- "x":2339.244140625,
- "y":975.3453369140625,
- "z":"d3629202.0e9a9",
+ "x":2189.244140625,
+ "y":832.8453369140625,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "272bfe84.8b7ee2"
+ "a16beaa7.a8be68"
]
]
},
{
- "id":"1e6aef5f.dbbe91",
+ "id":"d8af7c81.cbd5",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":2253.671875,
- "y":1052.1958618164062,
- "z":"d3629202.0e9a9",
+ "x":2103.671875,
+ "y":909.6958618164062,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "272bfe84.8b7ee2"
+ "a16beaa7.a8be68"
]
]
},
{
- "id":"23093b95.f9aaa4",
+ "id":"b92b0ebd.ec97e",
"type":"set",
"name":"set ar_name",
"xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n",
"comments":"",
- "x":2645.100830078125,
- "y":1010.7672729492188,
- "z":"d3629202.0e9a9",
+ "x":2495.100830078125,
+ "y":868.2672729492188,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"1a68705f.d6389",
+ "id":"ff0ac1c6.8d99",
"type":"execute",
"name":"execute SliStringUtils - replace TenantOAMNetworkRole",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n <parameter name=\"target\" value=\"$TenantOAMNetworkRole\"/>\n <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`\"/>\n\n",
"comments":"",
"outputs":1,
- "x":2789.2437858581543,
- "y":1054.6244196891785,
- "z":"d3629202.0e9a9",
+ "x":2639.2437858581543,
+ "y":912.1244196891785,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
@@ -625,15 +625,15 @@
]
},
{
- "id":"7aa8e90e.1063e8",
+ "id":"11a52a68.e2bc36",
"type":"execute",
"name":"execute SliStringUtils - replace LandingNetworkRole",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.ar-name`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-name\"/>\n <parameter name=\"target\" value=\"$LandingNetworkRole\"/>\n <parameter name=\"replacement\" value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`\"/>\n\n",
"comments":"",
"outputs":1,
- "x":2776.243896484375,
- "y":1094.7672729492188,
- "z":"d3629202.0e9a9",
+ "x":2626.243896484375,
+ "y":952.2672729492188,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
@@ -641,274 +641,274 @@
]
},
{
- "id":"272bfe84.8b7ee2",
+ "id":"a16beaa7.a8be68",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic='true'>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":2453.5292015075684,
- "y":1050.3387522697449,
- "z":"d3629202.0e9a9",
+ "x":2303.5292015075684,
+ "y":907.8387522697449,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "23093b95.f9aaa4",
- "1a68705f.d6389",
- "7aa8e90e.1063e8",
- "4308f250.0d061c"
+ "b92b0ebd.ec97e",
+ "ff0ac1c6.8d99",
+ "11a52a68.e2bc36",
+ "24287aef.ab1756"
]
]
},
{
- "id":"4308f250.0d061c",
+ "id":"24287aef.ab1756",
"type":"set",
"name":"set identifiers.allotted-resource-name",
"xml":"<set>\n<parameter name='brg-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n",
"comments":"",
- "x":2734.1005859375,
- "y":1145.052978515625,
- "z":"d3629202.0e9a9",
+ "x":2584.1005859375,
+ "y":1002.552978515625,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"18920617.98a00a",
+ "id":"16a390f2.71716f",
"type":"set",
"name":"set assignments in overall structure",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.' \nvalue=\"`$brg-ar-assignments.`\" />\n\n\n",
"comments":"",
- "x":1343.8624572753906,
- "y":1181.6246919631958,
- "z":"d3629202.0e9a9",
+ "x":1193.8624572753906,
+ "y":1039.1246919631958,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"21493890.2a9e08",
+ "id":"57bd8950.360d48",
"type":"set",
"name":"Handle brg-ar-assignments",
"xml":"<set>\n<parameter name='brg-ar-assignments.vbrg-wan-ip' value='127.0.0.1'/>\n",
"comments":"",
- "x":1323.529052734375,
- "y":1078.0530395507812,
- "z":"d3629202.0e9a9",
+ "x":1173.529052734375,
+ "y":935.5530395507812,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"d4e58fd3.5a831",
+ "id":"ad1d1f47.0fd92",
"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":2361.8155822753906,
- "y":1455.0411586761475,
- "z":"d3629202.0e9a9",
+ "x":2211.8155822753906,
+ "y":1312.5411586761475,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "c0a127f7.72a988"
+ "9eff53f5.fba2e"
]
]
},
{
- "id":"d68f413c.e0018",
+ "id":"4ca1ffaf.2765",
"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":1392.8148193359375,
- "y":1342.505126953125,
- "z":"d3629202.0e9a9",
+ "x":1242.8148193359375,
+ "y":1200.005126953125,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "d8f09bad.98faa8",
- "980eb422.8bc7a8"
+ "44b6b7be.364a78",
+ "d6f3204f.2e124"
]
]
},
{
- "id":"d8f09bad.98faa8",
+ "id":"44b6b7be.364a78",
"type":"other",
"name":"outcome Null",
"xml":"<outcome value=''>\n",
"comments":"",
"outputs":1,
- "x":1768.2077865600586,
- "y":1347.1124458312988,
- "z":"d3629202.0e9a9",
+ "x":1618.2077865600586,
+ "y":1204.6124458312988,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "19b4289e.1770d7"
+ "da9136e5.9a43c8"
]
]
},
{
- "id":"980eb422.8bc7a8",
+ "id":"d6f3204f.2e124",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":1766.9577865600586,
- "y":1437.1124477386475,
- "z":"d3629202.0e9a9",
+ "x":1616.9577865600586,
+ "y":1294.6124477386475,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "1162545f.50c16c"
+ "e4b52287.ffa4f"
]
]
},
{
- "id":"c0a127f7.72a988",
+ "id":"9eff53f5.fba2e",
"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":2796.4106826782227,
- "y":1456.85085105896,
- "z":"d3629202.0e9a9",
+ "x":2646.4106826782227,
+ "y":1314.35085105896,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "ff33ae53.f22d8"
+ "4247aaf2.34bc24"
]
]
},
{
- "id":"ff33ae53.f22d8",
+ "id":"4247aaf2.34bc24",
"type":"outcomeTrue",
"name":"true",
"xml":"<outcome value='true'>\n",
"comments":"",
"outputs":1,
- "x":3003.220375061035,
- "y":1460.064962387085,
- "z":"d3629202.0e9a9",
+ "x":2853.220375061035,
+ "y":1317.564962387085,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "d155597e.e18e78"
+ "4915e942.23f368"
]
]
},
{
- "id":"1162545f.50c16c",
+ "id":"e4b52287.ffa4f",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"outputs":1,
- "x":1924.834976196289,
- "y":1443.4885501861572,
- "z":"d3629202.0e9a9",
+ "x":1774.834976196289,
+ "y":1300.9885501861572,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "d4e58fd3.5a831",
- "e918e4d2.1efcf8"
+ "ad1d1f47.0fd92",
+ "f259b5a9.563638"
]
]
},
{
- "id":"d155597e.e18e78",
+ "id":"4915e942.23f368",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"outputs":1,
- "x":3171.4817276000977,
- "y":1464.9222631454468,
- "z":"d3629202.0e9a9",
+ "x":3021.4817276000977,
+ "y":1322.4222631454468,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "c63d8f00.d8d8c",
- "83bc7036.c8dd5"
+ "fbb9a58b.3d9f98",
+ "f2f48ed3.1ccda"
]
]
},
{
- "id":"19b4289e.1770d7",
+ "id":"da9136e5.9a43c8",
"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":1947.0647735595703,
- "y":1349.3266830444336,
- "z":"d3629202.0e9a9",
+ "x":1797.0647735595703,
+ "y":1206.8266830444336,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"c63d8f00.d8d8c",
+ "id":"fbb9a58b.3d9f98",
"type":"set",
"name":"set tmp.cidx and ctx.consumed-ar",
"xml":"<set>\n<parameter name='tmp.cidx' value='`$cidx`' />\n<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />\n<parameter name='tmp.found-cidx' value='true' />",
"comments":"",
- "x":3417.3391876220703,
- "y":1459.4937419891357,
- "z":"d3629202.0e9a9",
+ "x":3267.3391876220703,
+ "y":1316.9937419891357,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"61be16d.26f08e8",
+ "id":"44d4d3b9.bceb9c",
"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=\"`$brg-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":1303.6720123291016,
- "y":1507.826681137085,
- "z":"d3629202.0e9a9",
+ "x":1153.6720123291016,
+ "y":1365.326681137085,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"92379d68.800b2",
+ "id":"24c4fc44.bfefd4",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1703.910057067871,
- "y":1868.4815347194672,
- "z":"d3629202.0e9a9",
+ "x":1553.910057067871,
+ "y":1725.9815347194672,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "c74947a6.46a2b8"
+ "ee4c753c.c76778"
]
]
},
{
- "id":"8606840b.b8ce78",
+ "id":"d6830d95.f9764",
"type":"comment",
"name":"Add BRG AR to mdsal",
"info":"",
"comments":"",
- "x":1228.148208618164,
- "y":1843.1957080364227,
- "z":"d3629202.0e9a9",
+ "x":1078.148208618164,
+ "y":1700.6957080364227,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"a3f8e39.226902",
+ "id":"85496e20.c7fce",
"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":1244.4814224243164,
- "y":1581.671986579895,
- "z":"d3629202.0e9a9",
+ "x":1094.4814224243164,
+ "y":1439.171986579895,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
@@ -916,282 +916,282 @@
]
},
{
- "id":"681e6bc2.d5fc84",
+ "id":"5ce074ae.26955c",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":964.57666015625,
- "y":525.4814453125,
- "z":"d3629202.0e9a9",
+ "x":814.57666015625,
+ "y":382.9814453125,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "4c28d627.be47d8"
+ "eac1d1df.4a04c"
]
]
},
{
- "id":"4c28d627.be47d8",
+ "id":"eac1d1df.4a04c",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":912.57666015625,
- "y":1021.2908325195312,
- "z":"d3629202.0e9a9",
+ "x":762.57666015625,
+ "y":878.7908325195312,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "75b209f7.c1c7f8",
- "5ce4ff52.c3598",
- "af5a8dd4.2718",
- "6487f749.00d688",
- "62ed5c3a.385604",
- "15675ff3.fe7c9",
- "fe3888af.6a0dc8",
- "4359a5ff.7933ac",
- "e4f1d676.269118",
- "21493890.2a9e08",
- "18920617.98a00a",
- "d68f413c.e0018",
- "61be16d.26f08e8",
- "a3f8e39.226902",
- "9736c0da.28d34",
- "c78f845.d573978",
- "72e34d2d.88e074",
- "12aa04eb.1fdf1b",
- "2755b2a9.79da1e"
+ "2e500645.0f8a1a",
+ "adfbfac.9b9f208",
+ "33b72d9b.8a20c2",
+ "afbfed3a.08159",
+ "d3ea34e9.368c88",
+ "40fda3ea.8add9c",
+ "b9913138.178af",
+ "c14238e7.7fc528",
+ "ea01d74e.35b878",
+ "57bd8950.360d48",
+ "16a390f2.71716f",
+ "4ca1ffaf.2765",
+ "44d4d3b9.bceb9c",
+ "85496e20.c7fce",
+ "77739892.271138",
+ "c3886b00.abce88",
+ "98be663.e803998",
+ "b4a4d9bb.64b1c8",
+ "3cb0dbf.eb62a24"
]
]
},
{
- "id":"75b209f7.c1c7f8",
+ "id":"2e500645.0f8a1a",
"type":"set",
"name":"set id",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />",
"comments":"",
- "x":1283.2434387207031,
- "y":531.433837890625,
- "z":"d3629202.0e9a9",
+ "x":1133.2434387207031,
+ "y":388.933837890625,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"c78f845.d573978",
+ "id":"c3886b00.abce88",
"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 = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.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=\"`$tunnelxconn-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=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n",
+ "xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.service-information.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=\"`$tunnelxconn-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=\"`$ar-model.invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$ar-model.uuid`\" />\n\t<parameter name=\"operational-status\" value=\"null\" />\n",
"comments":"",
"outputs":1,
- "x":1265.0529327392578,
- "y":1749.5767517089844,
- "z":"d3629202.0e9a9",
+ "x":1115.0529327392578,
+ "y":1607.0767517089844,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "fd42eaba.bcea98",
- "44f6df87.e6131"
+ "7ca7c810.8af8c8",
+ "27b10af8.032016"
]
]
},
{
- "id":"fd42eaba.bcea98",
+ "id":"7ca7c810.8af8c8",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":1520.814842224121,
- "y":1732.5292553901672,
- "z":"d3629202.0e9a9",
+ "x":1370.814842224121,
+ "y":1590.0292553901672,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "cf813c6.4773dc"
+ "2112b130.25219e"
]
]
},
{
- "id":"cf813c6.4773dc",
+ "id":"2112b130.25219e",
"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":1687.338722229004,
- "y":1744.1483263969421,
- "z":"d3629202.0e9a9",
+ "x":1537.338722229004,
+ "y":1601.6483263969421,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"44f6df87.e6131",
+ "id":"27b10af8.032016",
"type":"failure",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":1527.9101295471191,
- "y":1765.2912230491638,
- "z":"d3629202.0e9a9",
+ "x":1377.9101295471191,
+ "y":1622.7912230491638,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "cf813c6.4773dc"
+ "2112b130.25219e"
]
]
},
{
- "id":"e918e4d2.1efcf8",
+ "id":"f259b5a9.563638",
"type":"switchNode",
"name":"switch tmp.found-cidx",
"xml":"<switch test='`$tmp.found-cidx`'>\n",
"comments":"",
"outputs":1,
- "x":2176.743423461914,
- "y":1701.2315921783447,
- "z":"d3629202.0e9a9",
+ "x":2026.743423461914,
+ "y":1558.7315921783447,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "97cac5ec.6c2cb8"
+ "74a25a57.2f53b4"
]
]
},
{
- "id":"97cac5ec.6c2cb8",
+ "id":"74a25a57.2f53b4",
"type":"outcomeTrue",
"name":"false",
"xml":"<outcome value='false'>\n",
"comments":"",
"outputs":1,
- "x":2366.743377685547,
- "y":1701.2315292358398,
- "z":"d3629202.0e9a9",
+ "x":2216.743377685547,
+ "y":1558.7315292358398,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "79bcb05d.e925c"
+ "c642818d.c82e8"
]
]
},
{
- "id":"79bcb05d.e925c",
+ "id":"c642818d.c82e8",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"outputs":1,
- "x":2532.743377685547,
- "y":1701.2315292358398,
- "z":"d3629202.0e9a9",
+ "x":2382.743377685547,
+ "y":1558.7315292358398,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "e7aa5ffb.99baf"
+ "94c7e089.4dbec"
]
]
},
{
- "id":"e7aa5ffb.99baf",
+ "id":"94c7e089.4dbec",
"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":2778.600706100464,
- "y":1701.8030033111572,
- "z":"d3629202.0e9a9",
+ "x":2628.600706100464,
+ "y":1559.3030033111572,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"c74947a6.46a2b8",
+ "id":"ee4c753c.c76778",
"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='DELETE' />\n <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
"comments":"",
"outputs":1,
- "x":2054.9521980285645,
- "y":1868.1904199123383,
- "z":"d3629202.0e9a9",
+ "x":1904.9521980285645,
+ "y":1725.6904199123383,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "779e9c7a.0850b4",
- "9d87709f.92daf",
- "1c59440e.45623c"
+ "772b0aab.94a794",
+ "cb34fc4a.b6aaa",
+ "18d615d.09d0cea"
]
]
},
{
- "id":"889dce84.ffc52",
+ "id":"633a71f3.b98a8",
"type":"comment",
"name":"Rollback parent",
"info":"",
"comments":"",
- "x":1898.9521255493164,
- "y":1837.8570504188538,
- "z":"d3629202.0e9a9",
+ "x":1748.9521255493164,
+ "y":1695.3570504188538,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"779e9c7a.0850b4",
+ "id":"772b0aab.94a794",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":2426.2602462768555,
- "y":1928.8553862571716,
- "z":"d3629202.0e9a9",
+ "x":2276.2602462768555,
+ "y":1786.3553862571716,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "b6ba7293.f6aed"
+ "17d2c2c8.78357d"
]
]
},
{
- "id":"9d87709f.92daf",
+ "id":"cb34fc4a.b6aaa",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":2417.26029586792,
- "y":1897.3554120063782,
- "z":"d3629202.0e9a9",
+ "x":2267.26029586792,
+ "y":1754.8554120063782,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "b6ba7293.f6aed"
+ "17d2c2c8.78357d"
]
]
},
{
- "id":"1c59440e.45623c",
+ "id":"18d615d.09d0cea",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":2421.0103340148926,
- "y":1867.7125168815255,
- "z":"d3629202.0e9a9",
+ "x":2271.0103340148926,
+ "y":1725.2125168815255,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "b6ba7293.f6aed"
+ "17d2c2c8.78357d"
]
]
},
{
- "id":"b6ba7293.f6aed",
+ "id":"17d2c2c8.78357d",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":2562.666301727295,
- "y":1863.9046860709786,
- "z":"d3629202.0e9a9",
+ "x":2412.666301727295,
+ "y":1721.4046860709786,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
@@ -1199,45 +1199,45 @@
]
},
{
- "id":"fbee093c.3938b8",
+ "id":"9883554f.db10a8",
"type":"comment",
"name":"Generate naming",
"info":"",
"comments":"",
- "x":1319.3862762451172,
- "y":878.7672252655029,
- "z":"d3629202.0e9a9",
+ "x":1169.3862762451172,
+ "y":736.2672252655029,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
},
{
- "id":"b05fdf22.36f2",
+ "id":"3d25a078.5fbfa",
"type":"get-resource",
"name":"get-resource tunnelxconn-allotted-resource",
"xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='brg-allotted-resources/brg-allotted-resource/$brg-topology-operation-input.allotted-resource-information.allotted-resource-id/' pfx='mdsal-ar' >\n",
"comments":"",
"outputs":1,
- "x":664,
- "y":479,
- "z":"d3629202.0e9a9",
+ "x":514,
+ "y":336.5,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
- "b6562205.a7488",
- "681e6bc2.d5fc84"
+ "2eb376c7.9249fa",
+ "5ce074ae.26955c"
]
]
},
{
- "id":"3df4d53c.54c6ca",
+ "id":"4f907ab1.9b90b4",
"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":740,
- "y":368,
- "z":"d3629202.0e9a9",
+ "x":590,
+ "y":225.5,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
@@ -1245,15 +1245,15 @@
]
},
{
- "id":"c8732493.f72838",
+ "id":"8f923afe.9146b8",
"type":"execute",
"name":"generate allotted-resource url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.brg-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":747,
- "y":408,
- "z":"d3629202.0e9a9",
+ "x":597,
+ "y":265.5,
+ "z":"25bf3deb.2eabd2",
"wires":[
[
@@ -1261,14 +1261,14 @@
]
},
{
- "id":"83bc7036.c8dd5",
+ "id":"f2f48ed3.1ccda",
"type":"break",
"name":"break",
"xml":"<break>\n",
"comments":"",
- "x":3330.243507385254,
- "y":1504.7316856384277,
- "z":"d3629202.0e9a9",
+ "x":3180.243507385254,
+ "y":1362.2316856384277,
+ "z":"25bf3deb.2eabd2",
"wires":[
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
index 4a2921bf..25e2c1e6 100755
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
[
{
- "id":"b1368b6a.79f1a8",
+ "id":"19d07461.d6c8dc",
"type":"dgstart",
"name":"DGSTART",
"outputs":1,
- "x":190,
- "y":152,
- "z":"cfbd0a6c.d9ad88",
+ "x":295,
+ "y":230,
+ "z":"e9217625.0cac48",
"wires":[
[
- "12b1f941.e5c857"
+ "b51a5c82.11d2c"
]
]
},
{
- "id":"12b1f941.e5c857",
+ "id":"b51a5c82.11d2c",
"type":"service-logic",
"name":"GENERIC-RESOURCE-API ${project.version}",
"module":"GENERIC-RESOURCE-API",
@@ -22,138 +22,150 @@
"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":286.2380790710449,
- "y":212.95239067077637,
- "z":"cfbd0a6c.d9ad88",
+ "x":391.2380790710449,
+ "y":290.95239067077637,
+ "z":"e9217625.0cac48",
"wires":[
[
- "ead35ce1.7590c"
+ "cbce84a6.ea6878"
]
]
},
{
- "id":"ead35ce1.7590c",
+ "id":"cbce84a6.ea6878",
"type":"method",
"name":"brg-topology-operation-deactivate",
"xml":"<method rpc='brg-topology-operation-deactivate' mode='sync'>\n",
"comments":"",
"outputs":1,
- "x":332.15485763549805,
- "y":248.19044589996338,
- "z":"cfbd0a6c.d9ad88",
+ "x":437.15485763549805,
+ "y":326.1904458999634,
+ "z":"e9217625.0cac48",
"wires":[
[
- "43ac6a92.ae5614"
+ "d87b2e8f.9e2a"
]
]
},
{
- "id":"43ac6a92.ae5614",
+ "id":"d87b2e8f.9e2a",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"comments":"",
"outputs":1,
- "x":240.47619247436523,
- "y":391.5237879753113,
- "z":"cfbd0a6c.d9ad88",
+ "x":307.1428680419922,
+ "y":1181.1903924942017,
+ "z":"e9217625.0cac48",
"wires":[
[
- "5240106e.51f63",
- "4041ad49.6fc0d4",
- "8ab3e562.da6e08",
- "93b0d070.cd7e4",
- "1ece8431.af7f1c",
- "ed70c5f.ebd7238",
- "200bf55c.cf936a",
- "1b6f2d6b.b6acc3",
- "2a34aedb.e483f2",
- "b55b0b52.943508",
- "5aa308ce.dba788",
- "626eb0d9.80b5f",
- "5cd8e25b.be574c",
- "7f3389ec.e8f508",
- "eafe9188.1bdec",
- "cfdbb6d9.39b868"
+ "7ae0972.e4f1268",
+ "26fbe137.e4574e",
+ "aaf75937.121618",
+ "b30da41f.59e8b8",
+ "eb6cb316.78bb2",
+ "f3f334a7.8ab7b8",
+ "b0c0958f.205828",
+ "9feaac31.accea",
+ "8072d7bb.d79ca8",
+ "a4c2b092.b5846",
+ "9bf033cd.906e8",
+ "2df95cec.fa5264",
+ "22dee26e.7d616e",
+ "61e540d8.506e5",
+ "4ae758c7.df5428",
+ "8327d1cf.254a7",
+ "9ae0d8e5.63af48",
+ "8261fdb3.cd771",
+ "1191ada7.aeacf2",
+ "2ab5bcc1.a3bc14",
+ "2271a9db.dcd166",
+ "b4b8750b.6fbcb8",
+ "f73b7075.c24df",
+ "1a8316bd.e83579",
+ "2bcd212a.e454ce",
+ "e1525574.ab65b8",
+ "ad5e9d69.70e36",
+ "8bd7c7a7.dbe958"
]
]
},
{
- "id":"4041ad49.6fc0d4",
+ "id":"26fbe137.e4574e",
"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":499.00007247924805,
- "y":1351.2144346237183,
- "z":"cfbd0a6c.d9ad88",
+ "x":604.0001449584961,
+ "y":2012.5478963851929,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"5240106e.51f63",
+ "id":"7ae0972.e4f1268",
"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='brg-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $brg-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
"comments":"",
- "x":527.7539863586426,
- "y":1315.3369808197021,
- "z":"cfbd0a6c.d9ad88",
+ "x":632.7540588378906,
+ "y":1976.6704425811768,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"b55b0b52.943508",
+ "id":"a4c2b092.b5846",
"type":"set",
"name":"set allotted-resource-oper-status",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-topology-operation-input.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
"comments":"",
- "x":546.7542419433594,
- "y":772.0514221191406,
- "z":"cfbd0a6c.d9ad88",
+ "x":651.7542419433594,
+ "y":850.0514221191406,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"93b0d070.cd7e4",
+ "id":"b30da41f.59e8b8",
"type":"set",
"name":"set tmp.ar.self-link",
"xml":"<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:brg-allotted-resources/brg-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/brg-topology/'` \" />\n\n",
"comments":"",
- "x":502.73806381225586,
- "y":365.33332538604736,
- "z":"cfbd0a6c.d9ad88",
+ "x":607.7380638122559,
+ "y":443.33332538604736,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"8ab3e562.da6e08",
+ "id":"aaf75937.121618",
"type":"set",
"name":"set tmp.ar.allotted-resource-id,etc",
"xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$brg-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n<parameter name='tmp.ar.brg-vnf-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.brg-assignments.brg-vnf-id`' />\n\n\n",
"comments":"",
- "x":549.9973258972168,
- "y":331.59259128570557,
- "z":"cfbd0a6c.d9ad88",
+ "x":654.9973258972168,
+ "y":409.59259128570557,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"1ece8431.af7f1c",
+ "id":"eb6cb316.78bb2",
"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":508.9934196472168,
- "y":401.23152446746826,
- "z":"cfbd0a6c.d9ad88",
+ "x":613.9934196472168,
+ "y":479.23152446746826,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -161,32 +173,32 @@
]
},
{
- "id":"200bf55c.cf936a",
+ "id":"b0c0958f.205828",
"type":"execute",
"name":"execute RestApiCallNode - Get AR by id",
"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":571.5187530517578,
- "y":562.4594917297363,
- "z":"cfbd0a6c.d9ad88",
+ "x":676.5187530517578,
+ "y":640.4594917297363,
+ "z":"e9217625.0cac48",
"wires":[
[
- "f39b8deb.2497f",
- "d49f2a4f.e657d8"
+ "3d7103cd.4568dc",
+ "b351e6c5.43b968"
]
]
},
{
- "id":"ed70c5f.ebd7238",
+ "id":"f3f334a7.8ab7b8",
"type":"execute",
"name":"generate allotted-resource url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.brg-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":537.0648536682129,
- "y":461.0172290802002,
- "z":"cfbd0a6c.d9ad88",
+ "x":642.0648536682129,
+ "y":539.0172290802002,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -194,307 +206,307 @@
]
},
{
- "id":"f39b8deb.2497f",
+ "id":"3d7103cd.4568dc",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":828.8148918151855,
- "y":561.2672522068024,
- "z":"cfbd0a6c.d9ad88",
+ "x":933.8148918151855,
+ "y":639.2672522068024,
+ "z":"e9217625.0cac48",
"wires":[
[
- "ce9ddc22.dec85"
+ "d40621a.b89f9e"
]
]
},
{
- "id":"1b6f2d6b.b6acc3",
+ "id":"9feaac31.accea",
"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.brg.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":579.5293121337891,
- "y":915.4341316223145,
- "z":"cfbd0a6c.d9ad88",
+ "x":684.5293121337891,
+ "y":993.4341316223145,
+ "z":"e9217625.0cac48",
"wires":[
[
- "db318a86.7bd678",
- "474202ef.7e725c",
- "926f3792.9db948"
+ "dbc1a30c.d1d4b",
+ "d6035553.162138",
+ "27b4f86b.b5c548"
]
]
},
{
- "id":"db318a86.7bd678",
+ "id":"dbc1a30c.d1d4b",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":849.837329864502,
- "y":968.432332418859,
- "z":"cfbd0a6c.d9ad88",
+ "x":954.837329864502,
+ "y":1046.432332418859,
+ "z":"e9217625.0cac48",
"wires":[
[
- "5154d5ef.e6843c"
+ "29141af9.f07796"
]
]
},
{
- "id":"474202ef.7e725c",
+ "id":"d6035553.162138",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":840.8373794555664,
- "y":936.9323581680655,
- "z":"cfbd0a6c.d9ad88",
+ "x":945.8373794555664,
+ "y":1014.9323581680655,
+ "z":"e9217625.0cac48",
"wires":[
[
- "5154d5ef.e6843c"
+ "29141af9.f07796"
]
]
},
{
- "id":"926f3792.9db948",
+ "id":"27b4f86b.b5c548",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":844.5874176025391,
- "y":907.2894630432129,
- "z":"cfbd0a6c.d9ad88",
+ "x":949.5874176025391,
+ "y":985.2894630432129,
+ "z":"e9217625.0cac48",
"wires":[
[
- "8791e6de.a42b98"
+ "d196b6e8.482b88"
]
]
},
{
- "id":"5154d5ef.e6843c",
+ "id":"29141af9.f07796",
"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 brg-allotted-resource\" />\n",
"comments":"",
- "x":1010.5874176025391,
- "y":937.6823820099235,
- "z":"cfbd0a6c.d9ad88",
+ "x":1115.587417602539,
+ "y":1015.6823820099235,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"ce9ddc22.dec85",
+ "id":"d40621a.b89f9e",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1009.8148460388184,
- "y":561.7672016620636,
- "z":"cfbd0a6c.d9ad88",
+ "x":1114.8148460388184,
+ "y":639.7672016620636,
+ "z":"e9217625.0cac48",
"wires":[
[
- "ff1004f9.28ea78",
- "19849de2.3d4d92"
+ "8b0ae8d2.ae99c8",
+ "7e3f871e.ecf428"
]
]
},
{
- "id":"ff1004f9.28ea78",
+ "id":"8b0ae8d2.ae99c8",
"type":"switchNode",
"name":"switch brg length",
"xml":"<switch test='`$mdsal-ar.brg-allotted-resource_length`'>\n",
"comments":"",
"outputs":1,
- "x":1255.6720924377441,
- "y":596.052964925766,
- "z":"cfbd0a6c.d9ad88",
+ "x":1360.6720924377441,
+ "y":674.052964925766,
+ "z":"e9217625.0cac48",
"wires":[
[
- "458ac54.5835d3c"
+ "3519e6a7.d8988a"
]
]
},
{
- "id":"458ac54.5835d3c",
+ "id":"3519e6a7.d8988a",
"type":"other",
"name":"outcome 1",
"xml":"<outcome value='1'>\n",
"comments":"",
"outputs":1,
- "x":1446.6720962524414,
- "y":596.0529625415802,
- "z":"cfbd0a6c.d9ad88",
+ "x":1551.6720962524414,
+ "y":674.0529625415802,
+ "z":"e9217625.0cac48",
"wires":[
[
- "136fba4.57e3046"
+ "7664af61.543e6"
]
]
},
{
- "id":"1ea71bb3.19d8e4",
+ "id":"1e13655e.0cb03b",
"type":"set",
"name":"set brg-ar from get",
"xml":"<set>\n<parameter name='brg-ar.' value='$mdsal-ar.brg-allotted-resource[0].' />\n",
"comments":"",
- "x":1846.5292320251465,
- "y":596.6243867874146,
- "z":"cfbd0a6c.d9ad88",
+ "x":1951.5292320251465,
+ "y":674.6243867874146,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"136fba4.57e3046",
+ "id":"7664af61.543e6",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic='true'>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1617.5290794372559,
- "y":596.6244316101074,
- "z":"cfbd0a6c.d9ad88",
+ "x":1722.5290794372559,
+ "y":674.6244316101074,
+ "z":"e9217625.0cac48",
"wires":[
[
- "1ea71bb3.19d8e4",
- "15299399.5fe66c",
- "7d67802a.2315b"
+ "1e13655e.0cb03b",
+ "110fdea6.c07091",
+ "8aa660c8.2e3bc"
]
]
},
{
- "id":"15299399.5fe66c",
+ "id":"110fdea6.c07091",
"type":"set",
"name":"set oper-status",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$brg-ar.allotted-resource-status.rpc-action`' />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
"comments":"",
- "x":1844.5294761657715,
- "y":664.0529508590698,
- "z":"cfbd0a6c.d9ad88",
+ "x":1949.5294761657715,
+ "y":742.0529508590698,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"6ea9033a.90574c",
+ "id":"370dee36.76c892",
"type":"comment",
"name":"GET brg-allotted-resource from mdsal",
"info":"",
"comments":"",
- "x":596.8148155212402,
- "y":525.7671926021576,
- "z":"cfbd0a6c.d9ad88",
+ "x":701.8148155212402,
+ "y":603.7671926021576,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"7d67802a.2315b",
+ "id":"8aa660c8.2e3bc",
"type":"switchNode",
"name":"switch order-status",
"xml":"<switch test='`$brg-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
"comments":"",
"outputs":1,
- "x":1854.52925491333,
- "y":629.6243848800659,
- "z":"cfbd0a6c.d9ad88",
+ "x":1959.52925491333,
+ "y":707.6243848800659,
+ "z":"e9217625.0cac48",
"wires":[
[
- "fc9ac41f.bda4b8",
- "9800dbd8.9df6f8"
+ "82998854.7cca78",
+ "e508d9e1.961e08"
]
]
},
{
- "id":"fc9ac41f.bda4b8",
+ "id":"82998854.7cca78",
"type":"outcome",
"name":"outcome Created",
"xml":"<outcome value='Created'>\n",
"comments":"",
"outputs":1,
- "x":2066.1292114257812,
- "y":590.6243848800659,
- "z":"cfbd0a6c.d9ad88",
+ "x":2171.1292114257812,
+ "y":668.6243848800659,
+ "z":"e9217625.0cac48",
"wires":[
[
- "4ecdc306.3d668c"
+ "50f62ac1.c59a04"
]
]
},
{
- "id":"9800dbd8.9df6f8",
+ "id":"e508d9e1.961e08",
"type":"outcome",
"name":"outcome Other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":2091.8435859680176,
- "y":626.052975654602,
- "z":"cfbd0a6c.d9ad88",
+ "x":2196.8435859680176,
+ "y":704.052975654602,
+ "z":"e9217625.0cac48",
"wires":[
[
- "4ecdc306.3d668c"
+ "50f62ac1.c59a04"
]
]
},
{
- "id":"a5baa812.7889a8",
+ "id":"fb0878b6.3dd068",
"type":"comment",
"name":"Set allotted-resource-identifiers",
"info":"",
"comments":"",
- "x":552.3386383056641,
- "y":616.3386459350586,
- "z":"cfbd0a6c.d9ad88",
+ "x":657.3386383056641,
+ "y":694.3386459350586,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"19849de2.3d4d92",
+ "id":"7e3f871e.ecf428",
"type":"set",
"name":"save backup copy of mdsal-ar for rollback",
"xml":"<set>\n<parameter name='bk-brg-ar' value='$mdsal-ar.' />\n",
"comments":"",
- "x":1335.3864250183105,
- "y":561.7672936916351,
- "z":"cfbd0a6c.d9ad88",
+ "x":1440.3864250183105,
+ "y":639.7672936916351,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"2e3d5c7a.18d844",
+ "id":"bee5e191.1671a",
"type":"comment",
"name":"Create urls for restapi",
"info":"",
"comments":"",
- "x":507.9576606750488,
- "y":430.6243562698364,
- "z":"cfbd0a6c.d9ad88",
+ "x":612.9576606750488,
+ "y":508.6243562698364,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"8791e6de.a42b98",
+ "id":"d196b6e8.482b88",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":986.2433853149414,
- "y":903.481632232666,
- "z":"cfbd0a6c.d9ad88",
+ "x":1091.2433853149414,
+ "y":981.481632232666,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -502,28 +514,28 @@
]
},
{
- "id":"2006c488.4b571c",
+ "id":"6b4e5a43.fa5094",
"type":"comment",
"name":"TO DO: vnf/put parent",
"info":"",
"comments":"",
- "x":514.5290908813477,
- "y":808.9101696014404,
- "z":"cfbd0a6c.d9ad88",
+ "x":619.5290908813477,
+ "y":886.9101696014404,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"2a34aedb.e483f2",
+ "id":"8072d7bb.d79ca8",
"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":494.24338150024414,
- "y":733.4815549850464,
- "z":"cfbd0a6c.d9ad88",
+ "x":600.9100952148438,
+ "y":808.1482043266296,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -531,32 +543,32 @@
]
},
{
- "id":"d49f2a4f.e657d8",
+ "id":"b351e6c5.43b968",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":828.5766868591309,
- "y":597.4814250469208,
- "z":"cfbd0a6c.d9ad88",
+ "x":933.5766868591309,
+ "y":675.4814250469208,
+ "z":"e9217625.0cac48",
"wires":[
[
- "86c72346.242ce"
+ "a6e56111.1a042"
]
]
},
{
- "id":"86c72346.242ce",
+ "id":"a6e56111.1a042",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1008.5766372680664,
- "y":598.1479756832123,
- "z":"cfbd0a6c.d9ad88",
+ "x":1113.5766372680664,
+ "y":676.1479756832123,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -564,29 +576,29 @@
]
},
{
- "id":"5aa308ce.dba788",
+ "id":"9bf033cd.906e8",
"type":"set",
"name":"set id",
"xml":"<set>\n<parameter name='brg-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='brg-ar.allotted-resource-status.action' value=\"`$brg-topology-operation-input.request-information.request-action` \" />\n<parameter name='brg-ar.allotted-resource-status.rpc-name' value=\"brg-topology-operation\" />\n<parameter name='brg-ar.allotted-resource-status.rpc-action' value=\"`$brg-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$brg-topology-operation-input.request-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$brg-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$brg-topology-operation-input.service-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$brg-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.' value=\"`$brg-topology-operation-input.brg-request-input.` \" />",
"comments":"",
- "x":477.24342346191406,
- "y":653.1481666564941,
- "z":"cfbd0a6c.d9ad88",
+ "x":572.2434272766113,
+ "y":732.8148908615112,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"4ecdc306.3d668c",
+ "id":"50f62ac1.c59a04",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":2280.5997276306152,
- "y":592.0000190734863,
- "z":"cfbd0a6c.d9ad88",
+ "x":2385.5997276306152,
+ "y":670.0000190734863,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -594,157 +606,157 @@
]
},
{
- "id":"626eb0d9.80b5f",
+ "id":"2df95cec.fa5264",
"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 = $service-data.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $service-data.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $service-data.service-information.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=\"operational-status\" value=\"out-of-service-path\" />\n",
+ "xml":"<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $brg-topology-operation-input.service-information.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=\"operational-status\" value=\"out-of-service-path\" />\n",
"comments":"",
"outputs":1,
- "x":541.4285736083984,
- "y":850.571418762207,
- "z":"cfbd0a6c.d9ad88",
+ "x":641.4286422729492,
+ "y":928.5714282989502,
+ "z":"e9217625.0cac48",
"wires":[
[
- "55679e7c.9aaca",
- "9789b3b6.f6b9b"
+ "735fa50a.5aedac",
+ "f4f3106d.3709a"
]
]
},
{
- "id":"55679e7c.9aaca",
+ "id":"735fa50a.5aedac",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":797.1904830932617,
- "y":833.5239224433899,
- "z":"cfbd0a6c.d9ad88",
+ "x":902.1904830932617,
+ "y":911.5239224433899,
+ "z":"e9217625.0cac48",
"wires":[
[
- "d1259b.54422a68"
+ "acbfb4ad.063528"
]
]
},
{
- "id":"d1259b.54422a68",
+ "id":"acbfb4ad.063528",
"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":963.7143630981445,
- "y":845.1429934501648,
- "z":"cfbd0a6c.d9ad88",
+ "x":1068.7143630981445,
+ "y":923.1429934501648,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"9789b3b6.f6b9b",
+ "id":"f4f3106d.3709a",
"type":"failure",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":804.2857704162598,
- "y":866.2858901023865,
- "z":"cfbd0a6c.d9ad88",
+ "x":909.2857704162598,
+ "y":944.2858901023865,
+ "z":"e9217625.0cac48",
"wires":[
[
- "d1259b.54422a68"
+ "acbfb4ad.063528"
]
]
},
{
- "id":"cfdbb6d9.39b868",
+ "id":"8327d1cf.254a7",
"type":"execute",
"name":"execute RestApiCallNode - delete BRG to vgMux vxlan tunnel port",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
"comments":"",
"outputs":1,
- "x":651.999885559082,
- "y":1190.9600343704224,
- "z":"cfbd0a6c.d9ad88",
+ "x":757.0000038146973,
+ "y":1469.37672996521,
+ "z":"e9217625.0cac48",
"wires":[
[
- "60fe5d9f.60f184",
- "12fb290a.532107",
- "8c68b450.cb4ca8"
+ "6e32aa45.5f8194",
+ "a77ca19a.6e5a6",
+ "ad3f19e9.8b3568"
]
]
},
{
- "id":"60fe5d9f.60f184",
+ "id":"6e32aa45.5f8194",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":1073.9747009277344,
- "y":1228.2916730865836,
- "z":"cfbd0a6c.d9ad88",
+ "x":1178.9748191833496,
+ "y":1506.7083686813712,
+ "z":"e9217625.0cac48",
"wires":[
[
- "3f807288.3735ae"
+ "bf98dc87.5b3c4"
]
]
},
{
- "id":"12fb290a.532107",
+ "id":"a77ca19a.6e5a6",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":1064.9747505187988,
- "y":1196.7916988357902,
- "z":"cfbd0a6c.d9ad88",
+ "x":1169.974868774414,
+ "y":1475.2083944305778,
+ "z":"e9217625.0cac48",
"wires":[
[
- "3f807288.3735ae"
+ "bf98dc87.5b3c4"
]
]
},
{
- "id":"8c68b450.cb4ca8",
+ "id":"ad3f19e9.8b3568",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":1068.7247886657715,
- "y":1167.1488037109375,
- "z":"cfbd0a6c.d9ad88",
+ "x":1173.7249069213867,
+ "y":1445.565499305725,
+ "z":"e9217625.0cac48",
"wires":[
[
- "c8426dda.6a34f"
+ "6e42584e.b2d738"
]
]
},
{
- "id":"3f807288.3735ae",
+ "id":"bf98dc87.5b3c4",
"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 brg-allotted-resource\" />\n",
+ "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 deleting vxlan tunnel\" />\n",
"comments":"",
- "x":1234.7247886657715,
- "y":1197.541722677648,
- "z":"cfbd0a6c.d9ad88",
+ "x":1339.7249069213867,
+ "y":1475.9584182724357,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"c8426dda.6a34f",
+ "id":"6e42584e.b2d738",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1210.3807563781738,
- "y":1163.3409729003906,
- "z":"cfbd0a6c.d9ad88",
+ "x":1315.380874633789,
+ "y":1441.7576684951782,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -752,28 +764,28 @@
]
},
{
- "id":"7f3389ec.e8f508",
+ "id":"61e540d8.506e5",
"type":"set",
- "name":"set BRG to vgMUX VXLAN Tunnel Port Props",
- "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` \" />",
+ "name":"set BRG to vgMUX VXLAN Tunnel Name",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` \" />",
"comments":"",
- "x":590.1111335754395,
- "y":1089.9602737426758,
- "z":"cfbd0a6c.d9ad88",
+ "x":681.7779541015625,
+ "y":1368.3770236968994,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"eafe9188.1bdec",
+ "id":"4ae758c7.df5428",
"type":"execute",
"name":"generate full brg-vpp-honeycomb url",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n",
"comments":"",
"outputs":1,
- "x":559.7776985168457,
- "y":1134.9600372314453,
- "z":"cfbd0a6c.d9ad88",
+ "x":664.7778167724609,
+ "y":1413.376732826233,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -781,15 +793,15 @@
]
},
{
- "id":"5cd8e25b.be574c",
+ "id":"22dee26e.7d616e",
"type":"execute",
"name":"generate honeycomb-url to vBRG",
"xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`\"/>\n",
"comments":"",
"outputs":1,
- "x":553.777774810791,
- "y":1046.6264476776123,
- "z":"cfbd0a6c.d9ad88",
+ "x":658.7778930664062,
+ "y":1325.0431432724,
+ "z":"e9217625.0cac48",
"wires":[
[
@@ -797,27 +809,485 @@
]
},
{
- "id":"696d020f.3bfa3c",
- "type":"comment",
- "name":"TO DO: assign brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip",
- "info":"need to quary mdsal-ar and get information assigned in tunnelxconn DG?",
+ "id":"9ae0d8e5.63af48",
+ "type":"get-resource",
+ "name":"get-resource IPADDR from dmaap DHCP_MAP ",
+ "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key=\"SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address\" pfx=\"tmp.brg-wan-ip\" >\n",
+ "comments":"",
+ "outputs":1,
+ "x":700.9999847412109,
+ "y":1075.8332653045654,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"8261fdb3.cd771",
+ "type":"set",
+ "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip",
+ "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />\n",
+ "comments":"",
+ "x":787.142822265625,
+ "y":1123.416519165039,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"1191ada7.aeacf2",
+ "type":"set",
+ "name":"set tmp.ar.consuming-service-instance-id to find vgmux-lan-ip",
+ "xml":"<set>\n<parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />\n",
+ "comments":"",
+ "x":748.1427612304688,
+ "y":1171.416347503662,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"2ab5bcc1.a3bc14",
+ "type":"set",
+ "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip",
+ "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />\n",
"comments":"",
- "x":715.3333206176758,
- "y":1003.79332447052,
- "z":"cfbd0a6c.d9ad88",
+ "x":791.4760894775391,
+ "y":1268.0829801559448,
+ "z":"e9217625.0cac48",
"wires":[
]
},
{
- "id":"e67f5695.27f668",
+ "id":"56899e0f.9f0a9",
"type":"comment",
- "name":"<--- TO DO: vgmux-bearer-ip is part of brg-requiest-input but need vgmux-lan-ip",
+ "name":"Setup VXLAN Tunnel - vBRG to vgMUX",
"info":"",
"comments":"",
- "x":1038.0000305175781,
- "y":1088.0000324249268,
- "z":"cfbd0a6c.d9ad88",
+ "x":350.30946350097656,
+ "y":1076.4166297912598,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"2271a9db.dcd166",
+ "type":"call",
+ "name":"call GENERIC-RESOURCE-API:get-tunnelxconn-ar",
+ "xml":"<call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":716.6666107177734,
+ "y":1216.6665077209473,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"ad5e9d69.70e36",
+ "type":"execute",
+ "name":"execute RestApiCallNode - setup vG to vgMux vxlan tunnel port",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />\n <parameter name='restapiUser' value='`$prop.honeycomb.user`' />\n <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":750.7049789428711,
+ "y":1825.0618782043457,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "b97f57b9.da4a38",
+ "edd6cfd6.0c5c6",
+ "a1875f2b.49a61"
+ ]
+ ]
+ },
+ {
+ "id":"b97f57b9.da4a38",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1084.6797676086426,
+ "y":1884.393490217626,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "8f0443c6.63f49"
+ ]
+ ]
+ },
+ {
+ "id":"edd6cfd6.0c5c6",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1075.679817199707,
+ "y":1852.8935159668326,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "8f0443c6.63f49"
+ ]
+ ]
+ },
+ {
+ "id":"a1875f2b.49a61",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1079.4298553466797,
+ "y":1823.25062084198,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "ee0fe1f7.5d9d6"
+ ]
+ ]
+ },
+ {
+ "id":"8f0443c6.63f49",
+ "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 setting up vxlan tunnel\" />\n",
+ "comments":"",
+ "x":1245.4298553466797,
+ "y":1853.6435398086905,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"ee0fe1f7.5d9d6",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1221.085823059082,
+ "y":1819.442790031433,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"2bcd212a.e454ce",
+ "type":"set",
+ "name":"set vG to vgMUX VXLAN Tunnel Name",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` \" />\n",
+ "comments":"",
+ "x":672.1494979858398,
+ "y":1721.7288551330566,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"e1525574.ab65b8",
+ "type":"execute",
+ "name":"generate full vg-vpp-honeycomb url",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.vpp-honeycomb`\"/>\n <parameter name=\"outputPath\" value=\"tmp.vpp-honeycomb-url\"/>\n <parameter name=\"target\" value=\"{tunnel-name}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.tunnel-name`\"/>\n",
+ "comments":"",
+ "outputs":1,
+ "x":660.1494674682617,
+ "y":1780.0618467330933,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"1a8316bd.e83579",
+ "type":"execute",
+ "name":"generate honeycomb-url to vG",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.honeycomb.url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.honeycomb.url\"/>\n <parameter name=\"target\" value=\"{honeycomb-instance-ip}\"/>\n <parameter name=\"replacement\" value=\"`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip`\"/>\n",
+ "comments":"",
+ "outputs":1,
+ "x":647.1495361328125,
+ "y":1668.7282466888428,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"eaa53259.f5fbf",
+ "type":"comment",
+ "name":"Get vg-mgmt-ip",
+ "info":"brg tunnelxconnn consuming-service-instance-id\nfound in services as service-instance-id",
+ "comments":"",
+ "x":347.8716354370117,
+ "y":1616.8953161239624,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"9bd5631.49aaba",
+ "type":"for",
+ "name":"for tmp.servicedata.services",
+ "xml":"<for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1491.5382080078125,
+ "y":1607.2283487319946,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "5387ccd0.736d34"
+ ]
+ ]
+ },
+ {
+ "id":"f73b7075.c24df",
+ "type":"get-resource",
+ "name":"get-resource generic-resource-api:services ",
+ "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":684.8716583251953,
+ "y":1619.89475440979,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "da8a3a08.847948",
+ "c7e2b4a3.bcd4c8",
+ "4e104241.ba90cc"
+ ]
+ ]
+ },
+ {
+ "id":"5387ccd0.736d34",
+ "type":"switchNode",
+ "name":"switch parent-service-instance-id matches",
+ "xml":"<switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1596.2050170898438,
+ "y":1714.5616245269775,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "27b2238f.48bacc"
+ ]
+ ]
+ },
+ {
+ "id":"27b2238f.48bacc",
+ "type":"success",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1851.8715934753418,
+ "y":1665.561752319336,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "d6b8cc2c.e7ed2"
+ ]
+ ]
+ },
+ {
+ "id":"da8a3a08.847948",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1176.5382614135742,
+ "y":1623.8948411941528,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "9bd5631.49aaba"
+ ]
+ ]
+ },
+ {
+ "id":"4e104241.ba90cc",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1154.8716201782227,
+ "y":1690.5615339279175,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "95609128.36e19"
+ ]
+ ]
+ },
+ {
+ "id":"c7e2b4a3.bcd4c8",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1145.871669769287,
+ "y":1659.061559677124,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "95609128.36e19"
+ ]
+ ]
+ },
+ {
+ "id":"95609128.36e19",
+ "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 getting GENERIC-RESOURCE-API:services\" />\n",
+ "comments":"",
+ "x":1315.6217079162598,
+ "y":1659.811583518982,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d6b8cc2c.e7ed2",
+ "type":"for",
+ "name":"for service vnfs",
+ "xml":"<for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1885.5381240844727,
+ "y":1566.8949918746948,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "dc75c31d.21ba2"
+ ]
+ ]
+ },
+ {
+ "id":"d6733026.3d178",
+ "type":"switchNode",
+ "name":"switch parent-service-instance-id matches",
+ "xml":"<switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2445.5381088256836,
+ "y":1590.561650276184,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "43171d7f.7e6834"
+ ]
+ ]
+ },
+ {
+ "id":"43171d7f.7e6834",
+ "type":"success",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2695.5381927490234,
+ "y":1592.2283849716187,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "3f1e667b.61b1aa"
+ ]
+ ]
+ },
+ {
+ "id":"dc75c31d.21ba2",
+ "type":"for",
+ "name":"for service vnf vf-modules",
+ "xml":"<for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2110.5382385253906,
+ "y":1593.8949279785156,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "d918ac81.8d655"
+ ]
+ ]
+ },
+ {
+ "id":"d918ac81.8d655",
+ "type":"for",
+ "name":"for service vnfs vf-modules parameters",
+ "xml":"<for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >\n\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2200.538215637207,
+ "y":1678.8948965072632,
+ "z":"e9217625.0cac48",
+ "wires":[
+ [
+ "d6733026.3d178"
+ ]
+ ]
+ },
+ {
+ "id":"3f1e667b.61b1aa",
+ "type":"set",
+ "name":"set vg-mgmt-ip",
+ "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />\n",
+ "comments":"",
+ "x":2877.2047424316406,
+ "y":1588.894944190979,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"8bd7c7a7.dbe958",
+ "type":"set",
+ "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip",
+ "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />\n",
+ "comments":"",
+ "x":762.8334503173828,
+ "y":1518.3331851959229,
+ "z":"e9217625.0cac48",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"b4b8750b.6fbcb8",
+ "type":"set",
+ "name":"set brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip",
+ "xml":"<set>\n<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />\n",
+ "comments":"",
+ "x":798.8333930969238,
+ "y":1572.666563987732,
+ "z":"e9217625.0cac48",
"wires":[
]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
index 8a0333c2..5109fdd5 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml
@@ -82,10 +82,7 @@
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
- key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
- service-subscription.service-type = $service-data.service-information.subscription-service-type AND
- service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
- allotted-resource.id = $tmp.ar.allotted-resource-id"
+ key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"
pfx='pfx' local-only='false' force='false'>
<parameter name="operational-status" value="in-service-path" />
<outcome value='failure'>
@@ -136,7 +133,7 @@
<set>
<parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
</set>
- <call module='GENERIC-RESOURCE-API' rpc='get-vgmux-lan-ip' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' ></call>
<set>
<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />
</set>
@@ -147,7 +144,7 @@
<parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`"/>
</execute>
<set>
- <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` " />
+ <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />
<parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip` " />
<parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip` " />
<parameter name='tmp.tunnel-vni' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` " />
@@ -173,14 +170,14 @@
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up vxlan tunnel" />
</return>
</outcome>
<outcome value='not-found'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up vxlan tunnel" />
</return>
</outcome>
</execute>
@@ -203,14 +200,14 @@
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up bridge domain" />
</return>
</outcome>
<outcome value='not-found'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up bridge domain" />
</return>
</outcome>
</execute>
@@ -220,14 +217,54 @@
<set>
<parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />
</set>
+ <set>
+ <parameter name='tmp.search.consuming-service-instance-id' value='`$brg-topology-operation-input.allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
+ </set>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >
+ <outcome value='success'>
+ <for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >
+ <switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>
+ <outcome value='true'>
+ <for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >
+ <for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
+ <for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
+ <switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ </for>
+ </for>
+ </outcome>
+ </switch>
+ </for>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error getting GENERIC-RESOURCE-API:services" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error getting GENERIC-RESOURCE-API:services" />
+ </return>
+ </outcome>
+ </get-resource>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.honeycomb.url`"/>
<parameter name="outputPath" value="tmp.honeycomb.url"/>
<parameter name="target" value="{honeycomb-instance-ip}"/>
- <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip`"/>
+ <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip`"/>
</execute>
<set>
- <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` " />
+ <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
<parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
<parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip` " />
<parameter name='tmp.tunnel-vni' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` " />
@@ -253,14 +290,14 @@
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up vxlan tunnel" />
</return>
</outcome>
<outcome value='not-found'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up vxlan tunnel" />
</return>
</outcome>
</execute>
@@ -279,14 +316,14 @@
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up bridge domain" />
</return>
</outcome>
<outcome value='not-found'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error setting up bridge domain" />
</return>
</outcome>
</execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
index c242bf07..fdd868d2 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml
@@ -202,10 +202,7 @@
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
- key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
- service-subscription.service-type = $service-data.service-information.subscription-service-type AND
- service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
- allotted-resource.id = $tmp.ar.allotted-resource-id"
+ key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"
pfx='pfx' local-only='false' force='false'>
<parameter name="description" value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type`" />
<parameter name="selflink" value="`$tmp.ar.self-link`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
index 40bfb673..0fda4176 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml
@@ -82,10 +82,7 @@
</set>
<update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
resource="allotted-resource"
- key="customer.global-customer-id = $service-data.service-information.global-customer-id AND
- service-subscription.service-type = $service-data.service-information.subscription-service-type AND
- service-instance.service-instance-id = $service-data.service-information.service-instance-id AND
- allotted-resource.id = $tmp.ar.allotted-resource-id"
+ key="customer.global-customer-id = $brg-topology-operation-input.service-information.global-customer-id AND service-subscription.service-type = $brg-topology-operation-input.service-information.subscription-service-type AND service-instance.service-instance-id = $brg-topology-operation-input.service-information.service-instance-id AND allotted-resource.id = $tmp.ar.allotted-resource-id"
pfx='pfx' local-only='false' force='false'>
<parameter name="operational-status" value="out-of-service-path" />
<outcome value='failure'>
@@ -129,6 +126,17 @@
</return>
</outcome>
</execute>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='IPADDR' key="SELECT min(ip_addr) ip from DHCP_MAP where mac_addr = $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-mac-address" pfx="tmp.brg-wan-ip" ></get-resource>
+ <set>
+ <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip' value='`$tmp.brg-wan-ip.ip`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.consuming-service-instance-id' value='`$allotted-resource-data.brg-topology.allotted-resource-identifiers.consuming-service-instance-id`' />
+ </set>
+ <call module='GENERIC-RESOURCE-API' rpc='get-tunnelxconn-ar' mode='sync' ></call>
+ <set>
+ <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-lan-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip`' />
+ </set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.honeycomb.url`"/>
<parameter name="outputPath" value="tmp.honeycomb.url"/>
@@ -136,10 +144,7 @@
<parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vbrg-wan-ip`"/>
</execute>
<set>
- <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />
- <parameter name='tmp.tunnel-dest-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` " />
- <parameter name='tmp.tunnel-src-ip' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.brg-wan-ip-address` " />
- <parameter name='tmp.tunnel-vni' value="`$brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vni` " />
+ <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.allotted-resource-operation-information.brg-request-input.vgmux-lan-ip` " />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
<parameter name="source" value="`$prop.restapi.vpp-honeycomb`"/>
@@ -161,14 +166,97 @@
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error deleting vxlan tunnel" />
</return>
</outcome>
<outcome value='not-found'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error updating md-sal for brg-allotted-resource" />
+ <parameter name="error-message" value="Error deleting vxlan tunnel" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip`' />
+ </set>
+ <set>
+ <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip' value='`$tmp.tunnelxconn-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`' />
+ </set>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='GENERIC-RESOURCE-API' key='services' pfx='tmp.servicedata' >
+ <outcome value='success'>
+ <for index='serviceidx' start='0' end='`$tmp.servicedata.services.service_length`' >
+ <switch test='`$tmp.servicedata.services.service[$serviceidx].service-instance-id == $tmp.search.consuming-service-instance-id`'>
+ <outcome value='true'>
+ <for index='vnfidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf_length`' >
+ <for index='vfmoduleidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module_length`' >
+ <for index='paramidx' start='0' end='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param_length`' >
+ <switch test='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].name == vgw_private_ip_1`'>
+ <outcome value='true'>
+ <set>
+ <parameter name='brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip' value='`$tmp.servicedata.services.service[$serviceidx].service-data.vnfs.vnf[$vnfidx].vnf-data.vf-modules.vf-module[$vfmoduleidx].vf-module-data.vf-module-topology.vf-module-parameters.param[$paramidx].value`' />
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ </for>
+ </for>
+ </outcome>
+ </switch>
+ </for>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error getting GENERIC-RESOURCE-API:services" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error getting GENERIC-RESOURCE-API:services" />
+ </return>
+ </outcome>
+ </get-resource>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.honeycomb.url`"/>
+ <parameter name="outputPath" value="tmp.honeycomb.url"/>
+ <parameter name="target" value="{honeycomb-instance-ip}"/>
+ <parameter name="replacement" value="`$brg-ar.allotted-resource-data.brg-topology.brg-assignments.vg-mgmt-ip`"/>
+ </execute>
+ <set>
+ <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $brg-ar.allotted-resource-data.brg-topology.brg-assignments.vgmux-bearer-ip` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.vpp-honeycomb`"/>
+ <parameter name="outputPath" value="tmp.vpp-honeycomb-url"/>
+ <parameter name="target" value="{tunnel-name}"/>
+ <parameter name="replacement" value="`$tmp.tunnel-name`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url`' />
+ <parameter name='restapiUser' value='`$prop.honeycomb.user`' />
+ <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='DELETE' />
+ <parameter name="responsePrefix" value="honeycomb-vnf" />
+ <outcome value='success'>
+ <block></block>
+ </outcome>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error setting up vxlan tunnel" />
+ </return>
+ </outcome>
+ <outcome value='not-found'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error setting up vxlan tunnel" />
</return>
</outcome>
</execute>