summaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic/generic-resource-api/src')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_manage-ipaddr-assignment.json212
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json1554
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json1538
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json866
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json1102
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml37
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml6
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml597
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml97
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml355
10 files changed, 4917 insertions, 1447 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_manage-ipaddr-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_manage-ipaddr-assignment.json
index 98f31c04..952535f4 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_manage-ipaddr-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_manage-ipaddr-assignment.json
@@ -1 +1,211 @@
-[{"id":"6c77e0ff.812608","type":"dgstart","name":"DGSTART","outputs":1,"x":115,"y":68,"z":"3d31b783.83364","wires":[["eeca2dac.71c38"]]},{"id":"eeca2dac.71c38","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"Reserve/release VNI","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":298,"y":157,"z":"3d31b783.83364","wires":[["5622528.2d1752c"]]},{"id":"5622528.2d1752c","type":"method","name":"manage-ipaddr-assignment","xml":"<method rpc='manage-ipaddr-assignment' mode='sync'>\n","comments":"","outputs":1,"x":400,"y":229,"z":"3d31b783.83364","wires":[["928c2075.c1ea38"]]},{"id":"6b987445.22932c","type":"switchNode","name":"switch $tmp.manageIpaddr.action","xml":"<switch test='`$tmp.manageIpaddr.action`'>\n","comments":"","outputs":1,"x":874,"y":262,"z":"3d31b783.83364","wires":[["c7842702.edc6a8","bdab292c.3fb228"]]},{"id":"c7842702.edc6a8","type":"outcome","name":"reserve","xml":"<outcome value='reserve'>\n","comments":"","outputs":1,"x":1156,"y":261,"z":"3d31b783.83364","wires":[["fe238eec.5c8f68"]]},{"id":"fe238eec.5c8f68","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1328,"y":263,"z":"3d31b783.83364","wires":[["b640d0c8.5d0da8"]]},{"id":"b640d0c8.5d0da8","type":"get-resource","name":"get-resource IPADDR from IPV4_ADDRESS_POOL","xml":"<get-resource plugin='`$tmp.sql.plugin`' resource='VNI' key=\"SELECT min(ipv4_addr) ip from IPV4_ADDRESS_POOL where universe = $tmp.manageIpaddr.pool and status='AVAILABLE'\" pfx=\"tmp.manageIpaddr\" >\n","comments":"","outputs":1,"x":1609,"y":264,"z":"3d31b783.83364","wires":[["834dd8d3.47713"]]},{"id":"928c2075.c1ea38","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":632,"y":228,"z":"3d31b783.83364","wires":[["faee9c.6ff1d968","6b987445.22932c"]]},{"id":"faee9c.6ff1d968","type":"set","name":"set sql plugin name","xml":"<set>\n<parameter name='tmp.sql.plugin' value='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' />\n","comments":"","x":839,"y":187,"z":"3d31b783.83364","wires":[]},{"id":"834dd8d3.47713","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1881,"y":262,"z":"3d31b783.83364","wires":[["c03409b6.2bb5d"]]},{"id":"c03409b6.2bb5d","type":"save","name":"Mark ip address reserved","xml":"<save plugin='`$tmp.sql.plugin`' resource='IPADDR' key=\"UPDATE IPV4_ADDRESS_POOL set status='RESERVED' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip\" force='false'>\n\n","comments":"","outputs":1,"x":2098,"y":264,"z":"3d31b783.83364","wires":[[]]},{"id":"bdab292c.3fb228","type":"outcome","name":"release","xml":"<outcome value='release'>\n","comments":"","outputs":1,"x":1154,"y":328,"z":"3d31b783.83364","wires":[["22501595.859f1a"]]},{"id":"22501595.859f1a","type":"save","name":"Mark ipaddress available","xml":"<save plugin='`$tmp.sql.plugin`' resource='IPADDR' key=\"UPDATE IPV4_ADDRESS_POOL set status='AVAILABLE' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip\" force='false'>\n\n","comments":"","outputs":1,"x":1340,"y":331,"z":"3d31b783.83364","wires":[[]]}] \ No newline at end of file
+[
+ {
+ "id":"d81e50c6.10867",
+ "type":"dgstart",
+ "name":"DGSTART",
+ "outputs":1,
+ "x":186,
+ "y":168,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "794b3924.54ea18"
+ ]
+ ]
+ },
+ {
+ "id":"794b3924.54ea18",
+ "type":"service-logic",
+ "name":"GENERIC-RESOURCE-API ${project.version}",
+ "module":"GENERIC-RESOURCE-API",
+ "version":"${project.version}",
+ "comments":"Reserve/release IP",
+ "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":369,
+ "y":257,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "3876df34.9cbea"
+ ]
+ ]
+ },
+ {
+ "id":"3876df34.9cbea",
+ "type":"method",
+ "name":"manage-ipaddr-assignment",
+ "xml":"<method rpc='manage-ipaddr-assignment' mode='sync'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":471,
+ "y":329,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "255e6973.efa936"
+ ]
+ ]
+ },
+ {
+ "id":"eac5864f.de8f18",
+ "type":"switchNode",
+ "name":"switch $tmp.manageIpaddr.action",
+ "xml":"<switch test='`$tmp.manageIpaddr.action`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":945,
+ "y":362,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "980f17d0.c10a28",
+ "2fb21d9f.e9b6e2"
+ ]
+ ]
+ },
+ {
+ "id":"980f17d0.c10a28",
+ "type":"outcome",
+ "name":"reserve",
+ "xml":"<outcome value='reserve'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1227,
+ "y":361,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "ab295c0b.78142"
+ ]
+ ]
+ },
+ {
+ "id":"ab295c0b.78142",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic='true'>",
+ "atomic":"true",
+ "comments":"",
+ "outputs":1,
+ "x":1399,
+ "y":363,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "8fd400db.0432d"
+ ]
+ ]
+ },
+ {
+ "id":"8fd400db.0432d",
+ "type":"get-resource",
+ "name":"get-resource IPADDR from IPV4_ADDRESS_POOL",
+ "xml":"<get-resource plugin='`$tmp.sql.plugin`' resource='IPADDR' key=\"SELECT min(ipv4_addr) ip from IPV4_ADDRESS_POOL where universe = $tmp.manageIpaddr.pool and status='AVAILABLE'\" pfx=\"tmp.manageIpaddr\" >\n",
+ "comments":"",
+ "outputs":1,
+ "x":1680,
+ "y":364,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "7fb7948a.ed39dc"
+ ]
+ ]
+ },
+ {
+ "id":"255e6973.efa936",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic='true'>",
+ "atomic":"true",
+ "comments":"",
+ "outputs":1,
+ "x":703,
+ "y":328,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "d5fece9.ea5c63",
+ "eac5864f.de8f18"
+ ]
+ ]
+ },
+ {
+ "id":"d5fece9.ea5c63",
+ "type":"set",
+ "name":"set sql plugin name",
+ "xml":"<set>\n<parameter name='tmp.sql.plugin' value='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' />\n",
+ "comments":"",
+ "x":910,
+ "y":287,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"7fb7948a.ed39dc",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1952,
+ "y":362,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "7a9dcfdb.a10f9"
+ ]
+ ]
+ },
+ {
+ "id":"7a9dcfdb.a10f9",
+ "type":"save",
+ "name":"Mark ip address reserved",
+ "xml":"<save plugin='`$tmp.sql.plugin`' resource='IPADDR' key=\"UPDATE IPV4_ADDRESS_POOL set status='RESERVED' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip\" force='false'>\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":2169,
+ "y":364,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"2fb21d9f.e9b6e2",
+ "type":"outcome",
+ "name":"release",
+ "xml":"<outcome value='release'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1225,
+ "y":428,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+ "a8f883cf.1ee52"
+ ]
+ ]
+ },
+ {
+ "id":"a8f883cf.1ee52",
+ "type":"save",
+ "name":"Mark ipaddress available",
+ "xml":"<save plugin='`$tmp.sql.plugin`' resource='IPADDR' key=\"UPDATE IPV4_ADDRESS_POOL set status='AVAILABLE' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip\" force='false'>\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":1411,
+ "y":431,
+ "z":"ee2bc85b.58f498",
+ "wires":[
+ [
+
+ ]
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
index 82569490..dc7dae8e 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json
@@ -1,20 +1,20 @@
[
{
- "id": "a804e8b3.b56458",
+ "id": "c755dc6.4fb532",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 152.03125,
- "y": 61.999969482421875,
- "z": "e07ef8ab.015e18",
+ "x": 98,
+ "y": 69,
+ "z": "d1c71750.37b338",
"wires": [
[
- "18e447a7.6f0858"
+ "80264a38.3fce88"
]
]
},
{
- "id": "18e447a7.6f0858",
+ "id": "80264a38.3fce88",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,2227 +22,2227 @@
"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": 364.03125381469727,
- "y": 133.99998664855957,
- "z": "e07ef8ab.015e18",
+ "x": 310.00000381469727,
+ "y": 141.0000171661377,
+ "z": "d1c71750.37b338",
"wires": [
[
- "256df46c.ff714c"
+ "8d5d312f.9d9cd"
]
]
},
{
- "id": "256df46c.ff714c",
+ "id": "8d5d312f.9d9cd",
"type": "method",
"name": "method network-topology-operation-create",
"xml": "<method rpc='network-topology-operation-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 352.0313720703125,
- "y": 221.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 298.0001220703125,
+ "y": 229,
+ "z": "d1c71750.37b338",
"wires": [
[
- "7cf0fc5e.374144"
+ "b2241a21.76a97"
]
]
},
{
- "id": "7cf0fc5e.374144",
+ "id": "b2241a21.76a97",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 428.03125,
- "y": 620,
- "z": "e07ef8ab.015e18",
+ "x": 374,
+ "y": 627.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e8bdc14b.b11af",
- "2a05068a.e6721a",
- "e16012fc.ef0af",
- "179dd935.bb3747",
- "37b4efd2.368ed",
- "e431fd19.db908",
- "60db19ec.521588",
- "6a3a805.948d08",
- "77fa32c0.09c32c",
- "cbfd620a.85d71",
- "37c9fe5c.d39282",
- "bb4e39dc.aefd28",
- "90e757cc.0959f8",
- "8c153068.d865f",
- "b9935276.cc7ee",
- "e891bd7f.8fb2d",
- "c20c2a08.dc6768",
- "56419be7.895d24",
- "a13270b7.6c1f5",
- "fb767200.4ff718"
+ "5f4a6be2.122adc",
+ "3b31c47b.b0ee54",
+ "bde939b5.904ee8",
+ "e986dd0a.7fdf58",
+ "ba17de0c.0ea5e",
+ "39b02aa1.204f3e",
+ "eb55ec0a.7da3a8",
+ "bee6a021.504aa8",
+ "f7d82967.39b968",
+ "e292252a.39cff8",
+ "31c5a0ea.7876c",
+ "f41c462f.8589a",
+ "58848908.ffbbb",
+ "7b14c9f6.80d72",
+ "a66c7c7d.376898",
+ "30879b4d.be3994",
+ "dd6bc2bc.fdc89",
+ "d54c20dc.cf6128",
+ "b11968d4.007e68",
+ "725ceec3.c5b2"
]
]
},
{
- "id": "1fd5d87a.f37a68",
+ "id": "ec4c3437.b9425",
"type": "execute",
"name": "execute RestApiCallNode Create IPWAN L3VPN",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 1175.0314331054688,
- "y": 992.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1121.0001831054688,
+ "y": 1000,
+ "z": "d1c71750.37b338",
"wires": [
[
- "52fc73ef.e7aa0c",
- "b81affca.012b9"
+ "d40cc8a7.624908",
+ "550c17e5.cfd818"
]
]
},
{
- "id": "8d9313d.965c4f",
+ "id": "715951e.aa50f3",
"type": "set",
"name": "set controller data",
"xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n",
"comments": "",
- "x": 1329.0313110351562,
- "y": 266.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1275.0000610351562,
+ "y": 274,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "e16012fc.ef0af",
+ "id": "bde939b5.904ee8",
"type": "for",
"name": "for each network-input-parameters",
"xml": "<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 870.6978759765625,
- "y": 182.6666259765625,
- "z": "e07ef8ab.015e18",
+ "x": 816.6666259765625,
+ "y": 189.66665649414062,
+ "z": "d1c71750.37b338",
"wires": [
[
- "a0a289d3.8a3128"
+ "d3d6530.ff1843"
]
]
},
{
- "id": "e7cb4067.6cda1",
+ "id": "257293b6.92d5cc",
"type": "execute",
"name": "execute RestApiCallNode Create SPTN L3VPN",
- "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+ "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"$prop.restapi.templateDir +'/sptn-l3vpn-template.json'\"/>\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"restapiUser\" value=\"$prop.sdncRestApi.thirdpartySdnc.user\"/>\n<parameter name=\"restapiPassword\" value=\"$prop.sdncRestApi.thirdpartySdnc.password\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
"comments": "",
"outputs": 1,
- "x": 1211.6981201171875,
- "y": 1232.6667175292969,
- "z": "e07ef8ab.015e18",
+ "x": 1157.6668701171875,
+ "y": 1239.666748046875,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "2a05068a.e6721a",
+ "id": "3b31c47b.b0ee54",
"type": "execute",
"name": "execute vpn-policy1-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy1-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 873.6978759765625,
- "y": 455.6666564941406,
- "z": "e07ef8ab.015e18",
+ "x": 819.6666259765625,
+ "y": 462.66668701171875,
+ "z": "d1c71750.37b338",
"wires": [
[
- "dfa32502.bd43b8"
+ "c0078e33.2f6078"
]
]
},
{
- "id": "dfa32502.bd43b8",
+ "id": "c0078e33.2f6078",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1098.6978759765625,
- "y": 458.6666259765625,
- "z": "e07ef8ab.015e18",
+ "x": 1044.6666259765625,
+ "y": 465.6666564941406,
+ "z": "d1c71750.37b338",
"wires": [
[
- "317318fb.4e9e28"
+ "c5ccda76.692ed"
]
]
},
{
- "id": "317318fb.4e9e28",
+ "id": "c5ccda76.692ed",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
"comments": "",
- "x": 1279.6978759765625,
- "y": 456.6666259765625,
- "z": "e07ef8ab.015e18",
+ "x": 1225.6666259765625,
+ "y": 463.6666564941406,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "e8bdc14b.b11af",
+ "id": "5f4a6be2.122adc",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 925.53125,
- "y": 98.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 871.5,
+ "y": 106,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "c20c2a08.dc6768",
+ "id": "dd6bc2bc.fdc89",
"type": "get-resource",
"name": "get-resource esr-thirdparty-sdnc",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.thirdparty-sdnc-id AND \n\t\t depth = '1'\"\n pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
"comments": "",
"outputs": 1,
- "x": 886.53125,
- "y": 332.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 832.5,
+ "y": 340,
+ "z": "d1c71750.37b338",
"wires": [
[
- "13f02083.f3783f",
- "ef2a8a2e.104fc8",
- "212aed64.086862"
+ "8dbd8bc6.d1cbd8",
+ "4c28930c.3740a4",
+ "e399b426.d74ce"
]
]
},
{
- "id": "13f02083.f3783f",
+ "id": "8dbd8bc6.d1cbd8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1131.53125,
- "y": 278.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1077.5,
+ "y": 286,
+ "z": "d1c71750.37b338",
"wires": [
[
- "8d9313d.965c4f"
+ "715951e.aa50f3"
]
]
},
{
- "id": "ef2a8a2e.104fc8",
+ "id": "4c28930c.3740a4",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1135.022216796875,
- "y": 326.5740051269531,
- "z": "e07ef8ab.015e18",
+ "x": 1080.990966796875,
+ "y": 333.57403564453125,
+ "z": "d1c71750.37b338",
"wires": [
[
- "be218957.42e218"
+ "ed8f061.2ee11f8"
]
]
},
{
- "id": "212aed64.086862",
+ "id": "e399b426.d74ce",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1130.355224609375,
- "y": 367.9073181152344,
- "z": "e07ef8ab.015e18",
+ "x": 1076.323974609375,
+ "y": 374.9073486328125,
+ "z": "d1c71750.37b338",
"wires": [
[
- "53967fa5.5f3e"
+ "37b86197.b131ae"
]
]
},
{
- "id": "be218957.42e218",
+ "id": "ed8f061.2ee11f8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 1311.5936279296875,
- "y": 314.8597412109375,
- "z": "e07ef8ab.015e18",
+ "x": 1257.5623779296875,
+ "y": 321.8597717285156,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "53967fa5.5f3e",
+ "id": "37b86197.b131ae",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
"comments": "",
- "x": 1318.1277809143066,
- "y": 363.346510887146,
- "z": "e07ef8ab.015e18",
+ "x": 1264.0965309143066,
+ "y": 370.3465414047241,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "8ed22fd9.4d3dc",
+ "id": "79980939.27992",
"type": "switchNode",
"name": "switch name",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1663.53125,
- "y": 33,
- "z": "e07ef8ab.015e18",
+ "x": 1609.5,
+ "y": 40.000030517578125,
+ "z": "d1c71750.37b338",
"wires": [
[
- "80b3ba44.055788"
+ "485e0689.38ce3"
]
]
},
{
- "id": "efdd2674.739ce8",
+ "id": "6566447b.cd16fc",
"type": "switchNode",
"name": "switch service-type",
- "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`\">\n",
+ "xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1667.5311889648438,
- "y": 90.5999755859375,
- "z": "e07ef8ab.015e18",
+ "x": 1613.4999389648438,
+ "y": 97.60000610351562,
+ "z": "d1c71750.37b338",
"wires": [
[
- "6d4384b9.0ebe7c"
+ "95810552.2e3558"
]
]
},
{
- "id": "80b3ba44.055788",
+ "id": "485e0689.38ce3",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1850.53125,
- "y": 29,
- "z": "e07ef8ab.015e18",
+ "x": 1796.5,
+ "y": 36.000030517578125,
+ "z": "d1c71750.37b338",
"wires": [
[
- "9fbc359d.c51268"
+ "8905bcbf.11f838"
]
]
},
{
- "id": "6d4384b9.0ebe7c",
+ "id": "95810552.2e3558",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1852.5311889648438,
- "y": 88.5999755859375,
- "z": "e07ef8ab.015e18",
+ "x": 1798.4999389648438,
+ "y": 95.60000610351562,
+ "z": "d1c71750.37b338",
"wires": [
[
- "afc95f0c.000e8"
+ "4a110462.b2e7b4"
]
]
},
{
- "id": "9fbc359d.c51268",
+ "id": "8905bcbf.11f838",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2018.53125,
- "y": 29.600006103515625,
- "z": "e07ef8ab.015e18",
+ "x": 1964.5,
+ "y": 36.60003662109375,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "afc95f0c.000e8",
+ "id": "4a110462.b2e7b4",
"type": "set",
"name": "set service-type",
"xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2021.5311889648438,
- "y": 86.5999755859375,
- "z": "e07ef8ab.015e18",
+ "x": 1967.4999389648438,
+ "y": 93.60000610351562,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "f576c53a.7be778",
+ "id": "db1ad825.26052",
"type": "switchNode",
"name": "switch topology",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'topology'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1666.53125,
- "y": 151.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 1612.5,
+ "y": 159,
+ "z": "d1c71750.37b338",
"wires": [
[
- "c58b51de.9dcfb"
+ "8e30a166.dc4c3"
]
]
},
{
- "id": "f5da2a66.76d6a8",
+ "id": "612a1bef.8a1a9c",
"type": "switchNode",
"name": "switch technology",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'technology'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1669.53125,
- "y": 204.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 1615.5,
+ "y": 212,
+ "z": "d1c71750.37b338",
"wires": [
[
- "22ac483f.40cd08"
+ "4a904aae.350a04"
]
]
},
{
- "id": "9322169f.7e6468",
+ "id": "32815667.56769a",
"type": "switchNode",
"name": "switch site1_name",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1674.53125,
- "y": 266.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1620.5,
+ "y": 274,
+ "z": "d1c71750.37b338",
"wires": [
[
- "38b6d1b6.17180e"
+ "8796222c.6fa77"
]
]
},
{
- "id": "41e22f2d.675b9",
+ "id": "d99350c4.40314",
"type": "switchNode",
"name": "switch site2_name",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site2_name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1669.53125,
- "y": 329.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1615.5,
+ "y": 337,
+ "z": "d1c71750.37b338",
"wires": [
[
- "486c488e.0a32b8"
+ "f4f0e78c.aadc4"
]
]
},
{
- "id": "fc7aed60.65dde",
+ "id": "e54a4b77.575f08",
"type": "switchNode",
"name": "switch sna1_name",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna1_name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1674.53125,
- "y": 389.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1620.5,
+ "y": 397,
+ "z": "d1c71750.37b338",
"wires": [
[
- "915000f3.1120f"
+ "877c7d0f.86dd"
]
]
},
{
- "id": "3fbbe309.27a1fc",
+ "id": "a16ad1af.30669",
"type": "switchNode",
"name": "switch sna2_name",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'sna2_name'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1669.53125,
- "y": 453.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1615.5,
+ "y": 461,
+ "z": "d1c71750.37b338",
"wires": [
[
- "f4543b5c.8e0d38"
+ "d7e263ff.d62088"
]
]
},
{
- "id": "a2bdcc47.ae6fd",
+ "id": "a9d432.f245a3d",
"type": "switchNode",
"name": "switch pe1_id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1674.53125,
- "y": 515.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1620.5,
+ "y": 523,
+ "z": "d1c71750.37b338",
"wires": [
[
- "5f3dc9f6.e27f38"
+ "d8f67746.e97618"
]
]
},
{
- "id": "5ff7d202.bbe52c",
+ "id": "89f7d244.7bed58",
"type": "switchNode",
"name": "switch pe2_id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'pe2_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1689.53125,
- "y": 575.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1635.5,
+ "y": 583,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e42f30ff.07bec"
+ "1af5cef.1a18eb1"
]
]
},
{
- "id": "70478129.46c8",
+ "id": "9e107c02.44f758",
"type": "switchNode",
"name": "switch ac1_id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1684.53125,
- "y": 647.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1630.5,
+ "y": 655,
+ "z": "d1c71750.37b338",
"wires": [
[
- "88f3112.2d2fdf"
+ "837e8793.ef9c9"
]
]
},
{
- "id": "5b2c84b5.c4133c",
+ "id": "37c58153.b2998e",
"type": "switchNode",
"name": "switch ac2_id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1683.53125,
- "y": 706.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1629.5,
+ "y": 714,
+ "z": "d1c71750.37b338",
"wires": [
[
- "b0791125.97403"
+ "cc628d9.cda75f"
]
]
},
{
- "id": "5f56629a.41d4bc",
+ "id": "9ab7bd24.8d06c8",
"type": "switchNode",
"name": "switch ac1_ip",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_ip'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1660.53125,
- "y": 769.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1606.5,
+ "y": 777,
+ "z": "d1c71750.37b338",
"wires": [
[
- "8a66ca.58098938"
+ "b6eb1b8b.204bb"
]
]
},
{
- "id": "88ead0cd.822bb",
+ "id": "c98044e2.7a0fd",
"type": "switchNode",
"name": "switch ac2_ip",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_ip'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1663.53125,
- "y": 826.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1609.5,
+ "y": 834,
+ "z": "d1c71750.37b338",
"wires": [
[
- "955fbd96.c1d04"
+ "67413744.703078"
]
]
},
{
- "id": "166443d5.94dbbc",
+ "id": "9c377089.4d9f3",
"type": "switchNode",
"name": "switch ac1_peer_ip",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_peer_ip'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1669.53125,
- "y": 878.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1615.5,
+ "y": 886,
+ "z": "d1c71750.37b338",
"wires": [
[
- "4db2da85.85e3f4"
+ "762be29b.5e95bc"
]
]
},
{
- "id": "2e267b3e.323f94",
+ "id": "6227130a.b283dc",
"type": "switchNode",
"name": "switch ac2_peer_ip",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_peer_ip'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1670.53125,
- "y": 933.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1616.5,
+ "y": 941,
+ "z": "d1c71750.37b338",
"wires": [
[
- "b13a698.e747198"
+ "b47203e8.02223"
]
]
},
{
- "id": "291e6ccb.4ad7e4",
+ "id": "87656c47.a73838",
"type": "switchNode",
"name": "switch ac1_svlan",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_svlan'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1682.53125,
- "y": 982.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1628.5,
+ "y": 990,
+ "z": "d1c71750.37b338",
"wires": [
[
- "551bf76.d690308"
+ "f47a7f0.182ed8"
]
]
},
{
- "id": "c859e422.4eadc8",
+ "id": "9d6a7f28.4304b",
"type": "switchNode",
"name": "switch ac2_svlan",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_svlan'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1675.53125,
- "y": 1033.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1621.5,
+ "y": 1041,
+ "z": "d1c71750.37b338",
"wires": [
[
- "dc1c7d76.2b839"
+ "88ef93af.1ec22"
]
]
},
{
- "id": "335bcb16.8452b4",
+ "id": "b0373753.70f0a",
"type": "switchNode",
"name": "switch ac1_protocol",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1668.53125,
- "y": 1091.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1614.5,
+ "y": 1099,
+ "z": "d1c71750.37b338",
"wires": [
[
- "4da810c6.50b18"
+ "b0c70aaf.aa196"
]
]
},
{
- "id": "b8ac331e.cf80f",
+ "id": "a53453dd.69ab28",
"type": "switchNode",
"name": "switch ac2_protocol",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1669.53125,
- "y": 1151.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1615.5,
+ "y": 1159,
+ "z": "d1c71750.37b338",
"wires": [
[
- "44c491a0.0f4c8"
+ "6f144e4b.8ca8a"
]
]
},
{
- "id": "eddb16e2.7d3ca8",
+ "id": "9abdda02.3e776",
"type": "switchNode",
"name": "switch ac1_protocol_bgp_as",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_protocol_bgp_as'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1663.53125,
- "y": 1337.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1609.5,
+ "y": 1345,
+ "z": "d1c71750.37b338",
"wires": [
[
- "b3981d6b.c0a51"
+ "7db2780.3608008"
]
]
},
{
- "id": "445b45a7.1c9e2c",
+ "id": "e12d824c.4650c8",
"type": "switchNode",
"name": "switch ac2_protocol_bgp_as",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_protocol_bgp_as'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1669.53125,
- "y": 1388.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1615.5,
+ "y": 1396,
+ "z": "d1c71750.37b338",
"wires": [
[
- "d1610ea6.e197e"
+ "7f6622dd.022f64"
]
]
},
{
- "id": "ff841f48.1f039",
+ "id": "46a813fb.9bd0f4",
"type": "switchNode",
"name": "switch af_type",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'af_type'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1636.53125,
- "y": 1479.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1582.5,
+ "y": 1487,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e0fac181.ab5ff"
+ "b96483f6.45c738"
]
]
},
{
- "id": "c58b51de.9dcfb",
+ "id": "8e30a166.dc4c3",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1841.53125,
- "y": 147.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 1787.5,
+ "y": 155,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e6e45965.586a08"
+ "5c246487.156d2c"
]
]
},
{
- "id": "22ac483f.40cd08",
+ "id": "4a904aae.350a04",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1847.53125,
- "y": 200.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 1793.5,
+ "y": 208,
+ "z": "d1c71750.37b338",
"wires": [
[
- "48d17e6e.f36ff"
+ "aef4e4d3.e357c"
]
]
},
{
- "id": "38b6d1b6.17180e",
+ "id": "8796222c.6fa77",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1856.53125,
- "y": 262.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1802.5,
+ "y": 270,
+ "z": "d1c71750.37b338",
"wires": [
[
- "b956de5c.88109"
+ "913fcc28.6f8338"
]
]
},
{
- "id": "486c488e.0a32b8",
+ "id": "f4f0e78c.aadc4",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1854.53125,
- "y": 325.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1800.5,
+ "y": 333,
+ "z": "d1c71750.37b338",
"wires": [
[
- "6c41f36c.55709c"
+ "785ee992.13114"
]
]
},
{
- "id": "915000f3.1120f",
+ "id": "877c7d0f.86dd",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1859.53125,
- "y": 387.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1805.5,
+ "y": 395,
+ "z": "d1c71750.37b338",
"wires": [
[
- "681b49b2.42ea78"
+ "e33dfd5b.4d737"
]
]
},
{
- "id": "f4543b5c.8e0d38",
+ "id": "d7e263ff.d62088",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1851.53125,
- "y": 445.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1797.5,
+ "y": 453,
+ "z": "d1c71750.37b338",
"wires": [
[
- "f14e641f.9e6788"
+ "a4ccc339.77b078"
]
]
},
{
- "id": "5f3dc9f6.e27f38",
+ "id": "d8f67746.e97618",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1852.53125,
- "y": 508.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1798.5,
+ "y": 516,
+ "z": "d1c71750.37b338",
"wires": [
[
- "9606bc15.8d1a2"
+ "5f722601.0dd94"
]
]
},
{
- "id": "e42f30ff.07bec",
+ "id": "1af5cef.1a18eb1",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1851.53125,
- "y": 577.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1797.5,
+ "y": 585,
+ "z": "d1c71750.37b338",
"wires": [
[
- "79d385f0.7efcac"
+ "f5aa06de.054208"
]
]
},
{
- "id": "88f3112.2d2fdf",
+ "id": "837e8793.ef9c9",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1848.53125,
- "y": 645.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1794.5,
+ "y": 653,
+ "z": "d1c71750.37b338",
"wires": [
[
- "58081f21.095c5"
+ "96cf4bf8.bd2d6"
]
]
},
{
- "id": "b0791125.97403",
+ "id": "cc628d9.cda75f",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1847.53125,
- "y": 709.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1793.5,
+ "y": 717,
+ "z": "d1c71750.37b338",
"wires": [
[
- "68b74f12.22fc9"
+ "514c2d04.fd52e4"
]
]
},
{
- "id": "8a66ca.58098938",
+ "id": "b6eb1b8b.204bb",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1820.53125,
- "y": 767.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1766.5,
+ "y": 775,
+ "z": "d1c71750.37b338",
"wires": [
[
- "6cb618b4.84d5e8"
+ "78158e69.19003"
]
]
},
{
- "id": "955fbd96.c1d04",
+ "id": "67413744.703078",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1822.53125,
- "y": 824.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1768.5,
+ "y": 832,
+ "z": "d1c71750.37b338",
"wires": [
[
- "3ee47e4b.3ebf92"
+ "a78b99c4.9438d"
]
]
},
{
- "id": "4db2da85.85e3f4",
+ "id": "762be29b.5e95bc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1858.53125,
- "y": 875.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1804.5,
+ "y": 883,
+ "z": "d1c71750.37b338",
"wires": [
[
- "348c4435.8ca42c"
+ "71f0b03f.45cda"
]
]
},
{
- "id": "b13a698.e747198",
+ "id": "b47203e8.02223",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1863.53125,
- "y": 938.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1809.5,
+ "y": 946,
+ "z": "d1c71750.37b338",
"wires": [
[
- "64d72468.0aecbc"
+ "89aee34.3120ea"
]
]
},
{
- "id": "551bf76.d690308",
+ "id": "f47a7f0.182ed8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1859.53125,
- "y": 987.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1805.5,
+ "y": 995,
+ "z": "d1c71750.37b338",
"wires": [
[
- "f2be5987.ec3938"
+ "767f5368.9e89f4"
]
]
},
{
- "id": "dc1c7d76.2b839",
+ "id": "88ef93af.1ec22",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1843.53125,
- "y": 1036.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1789.5,
+ "y": 1044,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e0e7c091.70bda"
+ "84e8e875.de3c78"
]
]
},
{
- "id": "4da810c6.50b18",
+ "id": "b0c70aaf.aa196",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1840.53125,
- "y": 1089.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1786.5,
+ "y": 1097,
+ "z": "d1c71750.37b338",
"wires": [
[
- "924d0335.b5bfa"
+ "6928b887.0efe58"
]
]
},
{
- "id": "44c491a0.0f4c8",
+ "id": "6f144e4b.8ca8a",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1853.53125,
- "y": 1148.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1799.5,
+ "y": 1156,
+ "z": "d1c71750.37b338",
"wires": [
[
- "880724d2.0ba428"
+ "1d3a4115.7746c7"
]
]
},
{
- "id": "b3981d6b.c0a51",
+ "id": "7db2780.3608008",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1871.53125,
- "y": 1334.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1817.5,
+ "y": 1342,
+ "z": "d1c71750.37b338",
"wires": [
[
- "4b8babb9.30ffb4"
+ "6cea4c1f.ab47ac"
]
]
},
{
- "id": "d1610ea6.e197e",
+ "id": "7f6622dd.022f64",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1878.53125,
- "y": 1384.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1824.5,
+ "y": 1392,
+ "z": "d1c71750.37b338",
"wires": [
[
- "6ee6ff69.e803d"
+ "e150d4b3.e7c148"
]
]
},
{
- "id": "e0fac181.ab5ff",
+ "id": "b96483f6.45c738",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1840.53125,
- "y": 1488.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1786.5,
+ "y": 1496,
+ "z": "d1c71750.37b338",
"wires": [
[
- "a979c4a1.40a538"
+ "637cf71c.1ca77"
]
]
},
{
- "id": "e6e45965.586a08",
+ "id": "5c246487.156d2c",
"type": "set",
"name": "set topology",
"xml": "<set>\n<parameter name='prop.l3vpn.topology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2036.53125,
- "y": 148.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 1982.5,
+ "y": 156,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "48d17e6e.f36ff",
+ "id": "aef4e4d3.e357c",
"type": "set",
"name": "set technology",
"xml": "<set>\n<parameter name='prop.l3vpn.technology' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2026.53125,
- "y": 202.99996948242188,
- "z": "e07ef8ab.015e18",
+ "x": 1972.5,
+ "y": 210,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "b956de5c.88109",
+ "id": "913fcc28.6f8338",
"type": "set",
"name": "set site1_name",
"xml": "<set>\n<parameter name='prop.l3vpn.site1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2030.53125,
- "y": 259.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1976.5,
+ "y": 267,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "6c41f36c.55709c",
+ "id": "785ee992.13114",
"type": "set",
"name": "set site2_name",
"xml": "<set>\n<parameter name='prop.l3vpn.site2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2033.53125,
- "y": 318.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1979.5,
+ "y": 326,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "681b49b2.42ea78",
+ "id": "e33dfd5b.4d737",
"type": "set",
"name": "set sna1_name",
"xml": "<set>\n<parameter name='prop.l3vpn.sna1_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2041.53125,
- "y": 380.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1987.5,
+ "y": 388,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "f14e641f.9e6788",
+ "id": "a4ccc339.77b078",
"type": "set",
"name": "set sna2_name",
"xml": "<set>\n<parameter name='prop.l3vpn.sna2_name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2033.53125,
- "y": 440.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1979.5,
+ "y": 448,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "9606bc15.8d1a2",
+ "id": "5f722601.0dd94",
"type": "set",
"name": "set pe1_id",
"xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2030.53125,
- "y": 500.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1976.5,
+ "y": 508,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "79d385f0.7efcac",
+ "id": "f5aa06de.054208",
"type": "set",
"name": "set pe2_id",
"xml": "<set>\n<parameter name='prop.l3vpn.pe2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2026.53125,
- "y": 571.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1972.5,
+ "y": 579,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "58081f21.095c5",
+ "id": "96cf4bf8.bd2d6",
"type": "set",
"name": "set ac1_id",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2019.53125,
- "y": 637.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1965.5,
+ "y": 645,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "68b74f12.22fc9",
+ "id": "514c2d04.fd52e4",
"type": "set",
"name": "set ac2_id",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2022.53125,
- "y": 704.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1968.5,
+ "y": 712,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "6cb618b4.84d5e8",
+ "id": "78158e69.19003",
"type": "set",
"name": "set ac1_ip",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 1998.53125,
- "y": 770.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1944.5,
+ "y": 778,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "3ee47e4b.3ebf92",
+ "id": "a78b99c4.9438d",
"type": "set",
"name": "set ac2_ip",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2002.53125,
- "y": 824.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1948.5,
+ "y": 832,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "348c4435.8ca42c",
+ "id": "71f0b03f.45cda",
"type": "set",
"name": "set ac1_peer_ip",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2050.53125,
- "y": 879.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1996.5,
+ "y": 887,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "64d72468.0aecbc",
+ "id": "89aee34.3120ea",
"type": "set",
"name": "set ac2_peer_ip",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_peer_ip' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2046.53125,
- "y": 934.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1992.5,
+ "y": 942,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "f2be5987.ec3938",
+ "id": "767f5368.9e89f4",
"type": "set",
"name": "set ac1_svlan",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2040.53125,
- "y": 989.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1986.5,
+ "y": 997,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "e0e7c091.70bda",
+ "id": "84e8e875.de3c78",
"type": "set",
"name": "set ac2_svlan",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_svlan' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2037.53125,
- "y": 1042.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1983.5,
+ "y": 1050,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "924d0335.b5bfa",
+ "id": "6928b887.0efe58",
"type": "set",
"name": "set ac1_protocol",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2035.53125,
- "y": 1099.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1981.5,
+ "y": 1107,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "880724d2.0ba428",
+ "id": "1d3a4115.7746c7",
"type": "set",
"name": "set ac2_protocol",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2044.53125,
- "y": 1151.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1990.5,
+ "y": 1159,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "4b8babb9.30ffb4",
+ "id": "6cea4c1f.ab47ac",
"type": "set",
"name": "set ac1_protocol_bgp_as",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer1-ip' value='`$prop.l3vpn.ac1_ip`' />\n",
"comments": "",
- "x": 2138.53125,
- "y": 1355.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2084.5,
+ "y": 1363,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "6ee6ff69.e803d",
+ "id": "e150d4b3.e7c148",
"type": "set",
"name": "set ac2_protocol_bgp_as",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_protocol_bgp_as' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n<parameter name='prop.l3vpn.peer2-ip' value='`$prop.l3vpn.ac2_ip`' />\n",
"comments": "",
- "x": 2150.53125,
- "y": 1404.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2096.5,
+ "y": 1412,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "a979c4a1.40a538",
+ "id": "637cf71c.1ca77",
"type": "set",
"name": "set af_type",
"xml": "<set>\n<parameter name='prop.l3vpn.af_type' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2034.53125,
- "y": 1498.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1980.5,
+ "y": 1506,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "179dd935.bb3747",
+ "id": "e986dd0a.7fdf58",
"type": "record",
"name": "record",
"xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"L3VPN-Config\"/>\n<parameter name=\"field4\" value=\"`l3vpn.name`\"/>\n<parameter name=\"field5\" value=\"`$prop.l3vpn.name`\"/>\n<parameter name=\"field6\" value=\"`l3vpn.topology`\"/>\n<parameter name=\"field7\" value=\"`$prop.l3vpn.topology`\"/>\n<parameter name=\"field8\" value=\"`l3vpn.site1_name`\"/>\n<parameter name=\"field9\" value=\"`$prop.l3vpn.site1_name`\"/>\n<parameter name=\"field10\" value=\"`l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field11\" value=\"`$prop.l3vpn.vpn-policy1-id`\"/>\n<parameter name=\"field12\" value=\"`l3vpn.entry1-id`\"/>\n<parameter name=\"field13\" value=\"`$prop.l3vpn.entry1-id`\"/>\n<parameter name=\"field14\" value=\"`l3vpn.sna1_name`\"/>\n<parameter name=\"field15\" value=\"`$prop.l3vpn.sna1_name`\"/>\n<parameter name=\"field16\" value=\"`l3vpn.pe1_id`\"/>\n<parameter name=\"field17\" value=\"`$prop.l3vpn.pe1_id`\"/>\n<parameter name=\"field18\" value=\"`l3vpn.ac1_id`\"/>\n<parameter name=\"field19\" value=\"`$prop.l3vpn.ac1_id`\"/>\n<parameter name=\"field20\" value=\"`l3vpn.sna1_svlan`\"/>\n<parameter name=\"field21\" value=\"`$prop.l3vpn.sna1_svlan`\"/>\n<parameter name=\"field22\" value=\"`l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field23\" value=\"`$prop.l3vpn.ac1-peer-ip`\"/>\n<parameter name=\"field24\" value=\"`l3vpn.ac1-ip`\"/>\n<parameter name=\"field25\" value=\"`$prop.l3vpn.ac1-ip`\"/>\n<parameter name=\"field26\" value=\"`l3vpn.ac1_protocol`\"/>\n<parameter name=\"field27\" value=\"`$prop.l3vpn.ac1_protocol`\"/>\n<parameter name=\"field28\" value=\"`l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field29\" value=\"`$prop.l3vpn.sna1-route-ip-prefix`\"/>\n<parameter name=\"field30\" value=\"`l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field31\" value=\"`$prop.l3vpn.sna1-route-next-hop`\"/>\n<parameter name=\"field32\" value=\"`l3vpn.peer1-ip`\"/>\n<parameter name=\"field33\" value=\"`$prop.l3vpn.peer1-ip`\"/>\n<parameter name=\"field34\" value=\"`l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field35\" value=\"`$prop.l3vpn.ac1_protocol_bgp_as`\"/>\n<parameter name=\"field36\" value=\"`l3vpn.vrf1-id`\"/>\n<parameter name=\"field37\" value=\"`$prop.l3vpn.vrf1-id`\"/>\n<parameter name=\"field38\" value=\"`l3vpn.site2_name`\"/>\n<parameter name=\"field39\" value=\"`$prop.l3vpn.site2_name`\"/>\n<parameter name=\"field40\" value=\"`l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field41\" value=\"`$prop.l3vpn.vpn-policy2-id`\"/>\n<parameter name=\"field42\" value=\"`l3vpn.entry2-id`\"/>\n<parameter name=\"field43\" value=\"`$prop.l3vpn.entry2-id`\"/>\n<parameter name=\"field44\" value=\"`l3vpn.sna2_name`\"/>\n<parameter name=\"field45\" value=\"`$prop.l3vpn.sna2_name`\"/>\n<parameter name=\"field46\" value=\"`l3vpn.pe2_id`\"/>\n<parameter name=\"field47\" value=\"`$prop.l3vpn.pe2_id`\"/>\n<parameter name=\"field48\" value=\"`l3vpn.ac2_id`\"/>\n<parameter name=\"field49\" value=\"`$prop.l3vpn.ac2_id`\"/>\n<parameter name=\"field50\" value=\"`l3vpn.sna2_svlan`\"/>\n<parameter name=\"field51\" value=\"`$prop.l3vpn.sna2_svlan`\"/>\n<parameter name=\"field52\" value=\"`l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field53\" value=\"`$prop.l3vpn.ac2-peer-ip`\"/>\n<parameter name=\"field54\" value=\"`l3vpn.ac2-ip`\"/>\n<parameter name=\"field55\" value=\"`$prop.l3vpn.ac2-ip`\"/>\n<parameter name=\"field56\" value=\"`l3vpn.ac2_protocol`\"/>\n<parameter name=\"field57\" value=\"`$prop.l3vpn.ac2_protocol`\"/>\n<parameter name=\"field58\" value=\"`l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field59\" value=\"`$prop.l3vpn.sna2-route-ip-prefix`\"/>\n<parameter name=\"field60\" value=\"`l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field61\" value=\"`$prop.l3vpn.sna2-route-next-hop`\"/>\n<parameter name=\"field62\" value=\"`l3vpn.peer2-ip`\"/>\n<parameter name=\"field63\" value=\"`$prop.l3vpn.peer2-ip`\"/>\n<parameter name=\"field64\" value=\"`l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field65\" value=\"`$prop.l3vpn.ac2_protocol_bgp_as`\"/>\n<parameter name=\"field66\" value=\"`l3vpn.vrf2-id`\"/>\n<parameter name=\"field67\" value=\"`$prop.l3vpn.vrf2-id`\"/>\n<parameter name=\"field68\" value=\"`l3vpn.af_type`\"/>\n<parameter name=\"field69\" value=\"`$prop.l3vpn.af_type`\"/>",
"comments": "",
"outputs": 1,
- "x": 780.03125,
- "y": 922,
- "z": "e07ef8ab.015e18",
+ "x": 726,
+ "y": 929.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "37b4efd2.368ed",
+ "id": "ba17de0c.0ea5e",
"type": "switchNode",
"name": "switch service-type",
"xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
"comments": "",
"outputs": 1,
- "x": 766.03125,
- "y": 1136,
- "z": "e07ef8ab.015e18",
+ "x": 712,
+ "y": 1143.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "5f9ac484.077c9c",
- "c18acb56.b83a78",
- "cd078531.a90828"
+ "5b3da62a.021bd8",
+ "a74379d2.de6ee8",
+ "74148b1.9b52c74"
]
]
},
{
- "id": "5f9ac484.077c9c",
+ "id": "5b3da62a.021bd8",
"type": "outcomeTrue",
"name": "l3vpn-ipwan",
"xml": "<outcome value='l3vpn-ipwan'>\n",
"comments": "",
"outputs": 1,
- "x": 721.03125,
- "y": 1052.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 667,
+ "y": 1060,
+ "z": "d1c71750.37b338",
"wires": [
[
- "1d6cf5f8.2491ba"
+ "e670cc16.d9893"
]
]
},
{
- "id": "c18acb56.b83a78",
+ "id": "a74379d2.de6ee8",
"type": "outcomeTrue",
"name": "l3vpn-sptn",
"xml": "<outcome value='l3vpn-sptn'>\n",
"comments": "",
"outputs": 1,
- "x": 910.03125,
- "y": 1239.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 856,
+ "y": 1247,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e7cb4067.6cda1"
+ "257293b6.92d5cc"
]
]
},
{
- "id": "cd078531.a90828",
+ "id": "74148b1.9b52c74",
"type": "outcomeTrue",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 906.03125,
- "y": 1283.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 852,
+ "y": 1291,
+ "z": "d1c71750.37b338",
"wires": [
[
- "416a0e63.5f9fd"
+ "884fb0f6.de86a8"
]
]
},
{
- "id": "416a0e63.5f9fd",
+ "id": "884fb0f6.de86a8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Unexpected error retrieving vpn binding\" />\n\n",
"comments": "",
- "x": 1089.03125,
- "y": 1282.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1035,
+ "y": 1290,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "e431fd19.db908",
+ "id": "39b02aa1.204f3e",
"type": "execute",
"name": "execute vpn-policy2-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vpn-policy2-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 874.03125,
- "y": 513.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 820,
+ "y": 521,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e47d8379.95768"
+ "3541c627.27ccaa"
]
]
},
{
- "id": "e47d8379.95768",
+ "id": "3541c627.27ccaa",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1099.03125,
- "y": 516.9999389648438,
- "z": "e07ef8ab.015e18",
+ "x": 1045,
+ "y": 523.9999694824219,
+ "z": "d1c71750.37b338",
"wires": [
[
- "40959179.398c3"
+ "8d7e37e4.d397f8"
]
]
},
{
- "id": "40959179.398c3",
+ "id": "8d7e37e4.d397f8",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
"comments": "",
- "x": 1280.03125,
- "y": 514.9999389648438,
- "z": "e07ef8ab.015e18",
+ "x": 1226,
+ "y": 521.9999694824219,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "60db19ec.521588",
+ "id": "eb55ec0a.7da3a8",
"type": "set",
"name": "set policy entry",
"xml": "<set>\n<parameter name='prop.l3vpn.entry1-id' value='1' />\n<parameter name='prop.l3vpn.entry2-id' value='1' />\n\n",
"comments": "",
- "x": 860.03125,
- "y": 561.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 806,
+ "y": 569,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "d251597.7e75fa8",
+ "id": "521ff026.a9cd98",
"type": "execute",
"name": "execute split ac1-route",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac1-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route1\"/>\n",
"comments": "",
"outputs": 1,
- "x": 2264.03125,
- "y": 1211.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2210,
+ "y": 1219,
+ "z": "d1c71750.37b338",
"wires": [
[
- "ae511c3e.94835",
- "845f5d8b.5aedb"
+ "3c1faef4.86a26a",
+ "9a25c35e.1e45a8"
]
]
},
{
- "id": "3d30a696.2b7b1a",
+ "id": "5e4ee4bb.9cbae4",
"type": "switchNode",
"name": "switch ac2_route",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac2_route'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1665.03125,
- "y": 1259.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1611,
+ "y": 1267,
+ "z": "d1c71750.37b338",
"wires": [
[
- "9a5b5bf2.72a888"
+ "991718ef.73c5f8"
]
]
},
{
- "id": "b523547.75bb8a8",
+ "id": "f615e32b.689a18",
"type": "switchNode",
"name": "switch ac1_route",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ac1_route'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1666.03125,
- "y": 1210.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1612,
+ "y": 1218,
+ "z": "d1c71750.37b338",
"wires": [
[
- "9ff44c29.6405d"
+ "3aadf8aa.0f045"
]
]
},
{
- "id": "9ff44c29.6405d",
+ "id": "3aadf8aa.0f045",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1838.03125,
- "y": 1208.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1784,
+ "y": 1216,
+ "z": "d1c71750.37b338",
"wires": [
[
- "2e411316.00315c"
+ "5557f8d.caac508"
]
]
},
{
- "id": "9a5b5bf2.72a888",
+ "id": "991718ef.73c5f8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1851.03125,
- "y": 1267.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1797,
+ "y": 1275,
+ "z": "d1c71750.37b338",
"wires": [
[
- "32e0dd94.666fd2"
+ "1b368566.979a53"
]
]
},
{
- "id": "5f19aec4.6ad74",
+ "id": "b7b10f53.f8112",
"type": "set",
"name": "set ac1_route",
"xml": "<set>\n<parameter name='prop.l3vpn.ac1_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2235.03125,
- "y": 1159.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2181,
+ "y": 1167,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "9023cfe1.d4f31",
+ "id": "963bac78.3bad6",
"type": "set",
"name": "set ac2_route",
"xml": "<set>\n<parameter name='prop.l3vpn.ac2_route' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2233.03125,
- "y": 1259.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2179,
+ "y": 1267,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "41f4f428.bf7e9c",
+ "id": "e2a6c5f2.23e27",
"type": "execute",
"name": "execute split ac2-route",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.l3vpn.ac2-route`'/>\n<parameter name=\"regex\" value=\" ## \"/>\n<parameter name=\"ctx_memory_result_key\" value=\"route2\"/>\n",
"comments": "",
"outputs": 1,
- "x": 2257.03125,
- "y": 1304.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2203,
+ "y": 1312,
+ "z": "d1c71750.37b338",
"wires": [
[
- "4dbe6198.e585d",
- "a3ddc382.f46b1"
+ "152bd8c5.a555ff",
+ "11ed22fb.50a315"
]
]
},
{
- "id": "2e411316.00315c",
+ "id": "5557f8d.caac508",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1989.03125,
- "y": 1208.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1935,
+ "y": 1216,
+ "z": "d1c71750.37b338",
"wires": [
[
- "5f19aec4.6ad74",
- "d251597.7e75fa8"
+ "b7b10f53.f8112",
+ "521ff026.a9cd98"
]
]
},
{
- "id": "32e0dd94.666fd2",
+ "id": "1b368566.979a53",
"type": "block",
"name": "block atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1990.03125,
- "y": 1267.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1936,
+ "y": 1275,
+ "z": "d1c71750.37b338",
"wires": [
[
- "9023cfe1.d4f31",
- "41f4f428.bf7e9c"
+ "963bac78.3bad6",
+ "e2a6c5f2.23e27"
]
]
},
{
- "id": "6a3a805.948d08",
+ "id": "bee6a021.504aa8",
"type": "execute",
"name": "execute vrf1-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf1-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 859.03125,
- "y": 615,
- "z": "e07ef8ab.015e18",
+ "x": 805,
+ "y": 622.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "f9f8e182.59549"
+ "10ac73af.2eb80c"
]
]
},
{
- "id": "77fa32c0.09c32c",
+ "id": "f7d82967.39b968",
"type": "execute",
"name": "execute vrf2-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.vrf2-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 856.3646240234375,
- "y": 672.333251953125,
- "z": "e07ef8ab.015e18",
+ "x": 802.3333740234375,
+ "y": 679.3332824707031,
+ "z": "d1c71750.37b338",
"wires": [
[
- "b3b56f86.3d1b4"
+ "49f55adf.c6c134"
]
]
},
{
- "id": "b3b56f86.3d1b4",
+ "id": "49f55adf.c6c134",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1106.3646240234375,
- "y": 678.333251953125,
- "z": "e07ef8ab.015e18",
+ "x": 1052.3333740234375,
+ "y": 685.3332824707031,
+ "z": "d1c71750.37b338",
"wires": [
[
- "346cd637.94b0aa"
+ "5fc81484.4dffac"
]
]
},
{
- "id": "f9f8e182.59549",
+ "id": "10ac73af.2eb80c",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1106.03125,
- "y": 619.9999389648438,
- "z": "e07ef8ab.015e18",
+ "x": 1052,
+ "y": 626.9999694824219,
+ "z": "d1c71750.37b338",
"wires": [
[
- "417e4c2f.a2f9c4"
+ "36fdab86.85bda4"
]
]
},
{
- "id": "417e4c2f.a2f9c4",
+ "id": "36fdab86.85bda4",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
"comments": "",
- "x": 1287.03125,
- "y": 617.9999389648438,
- "z": "e07ef8ab.015e18",
+ "x": 1233,
+ "y": 624.9999694824219,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "346cd637.94b0aa",
+ "id": "5fc81484.4dffac",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation vpn policy ID\" />\n",
"comments": "",
- "x": 1287.3646240234375,
- "y": 676.333251953125,
- "z": "e07ef8ab.015e18",
+ "x": 1233.3333740234375,
+ "y": 683.3332824707031,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "1d6cf5f8.2491ba",
+ "id": "e670cc16.d9893",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 888.03125,
- "y": 1052.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 834,
+ "y": 1060,
+ "z": "d1c71750.37b338",
"wires": [
[
- "1fd5d87a.f37a68",
- "f5fc661b.cec638",
- "43e96ef8.0066a",
- "be278e7d.aed"
+ "ec4c3437.b9425",
+ "c47fb352.4e0cc",
+ "59489a1b.74de3c",
+ "e652cb3f.9ae0d"
]
]
},
{
- "id": "f5fc661b.cec638",
+ "id": "c47fb352.4e0cc",
"type": "execute",
"name": "execute RestApiCallNode IPWAN Site Config",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smsitetemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"site-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 1165.03125,
- "y": 1174,
- "z": "e07ef8ab.015e18",
+ "x": 1111,
+ "y": 1181.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "52fc73ef.e7aa0c",
- "b81affca.012b9"
+ "d40cc8a7.624908",
+ "550c17e5.cfd818"
]
]
},
{
- "id": "43e96ef8.0066a",
+ "id": "59489a1b.74de3c",
"type": "execute",
"name": "execute RestApiCallNode IPWAN VRF Config",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvrftemplate.json'`\"/>\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url +'/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes'`\"/>\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"vrf-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
"comments": "",
"outputs": 1,
- "x": 1145.03125,
- "y": 1114,
- "z": "e07ef8ab.015e18",
+ "x": 1091,
+ "y": 1121.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "52fc73ef.e7aa0c",
- "b81affca.012b9"
+ "d40cc8a7.624908",
+ "550c17e5.cfd818"
]
]
},
{
- "id": "ae511c3e.94835",
+ "id": "3c1faef4.86a26a",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2482.03125,
- "y": 1203.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2428,
+ "y": 1211,
+ "z": "d1c71750.37b338",
"wires": [
[
- "ea661cf9.3185a"
+ "d2c4705e.e17128"
]
]
},
{
- "id": "ea661cf9.3185a",
+ "id": "d2c4705e.e17128",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
"comments": "",
- "x": 2663.03125,
- "y": 1201.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2609,
+ "y": 1209,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "4dbe6198.e585d",
+ "id": "152bd8c5.a555ff",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 2480.03125,
- "y": 1305.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2426,
+ "y": 1313,
+ "z": "d1c71750.37b338",
"wires": [
[
- "2064e87c.06ee48"
+ "5215918e.cf6238"
]
]
},
{
- "id": "2064e87c.06ee48",
+ "id": "5215918e.cf6238",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
"comments": "",
- "x": 2661.03125,
- "y": 1303.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2607,
+ "y": 1311,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "845f5d8b.5aedb",
+ "id": "9a25c35e.1e45a8",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2481.03125,
- "y": 1137.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2427,
+ "y": 1145,
+ "z": "d1c71750.37b338",
"wires": [
[
- "fe317b98.435f38"
+ "2af54113.06bac6"
]
]
},
{
- "id": "a3ddc382.f46b1",
+ "id": "11ed22fb.50a315",
"type": "failure",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 2477.03125,
- "y": 1257.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2423,
+ "y": 1265,
+ "z": "d1c71750.37b338",
"wires": [
[
- "c67b184d.c90998"
+ "9994d830.e649d"
]
]
},
{
- "id": "fe317b98.435f38",
+ "id": "2af54113.06bac6",
"type": "set",
"name": "set route1 ip-prefix next-hop",
"xml": "<set>\n<parameter name='prop.l3vpn.sna1-route.ip-prefix' value='`$route1[0]`' />\n<parameter name='prop.l3vpn.sna1-route.next-hop' value='`$route1[1]`' />\n",
"comments": "",
- "x": 2688.03125,
- "y": 1131.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2634,
+ "y": 1139,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "c67b184d.c90998",
+ "id": "9994d830.e649d",
"type": "set",
"name": "set route2 ip-prefix next-hop",
"xml": "<set>\n<parameter name='prop.l3vpn.sna2-route.ip-prefix' value='`$route2[0]`' />\n<parameter name='prop.l3vpn.sna2-route.next-hop' value='`$route2[1]`' />",
"comments": "",
- "x": 2688.03125,
- "y": 1250.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 2634,
+ "y": 1258,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "cbfd620a.85d71",
+ "id": "e292252a.39cff8",
"type": "execute",
"name": "execute generate-underlay-network-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.l3vpn.network-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 915.03125,
- "y": 766,
- "z": "e07ef8ab.015e18",
+ "x": 861,
+ "y": 773.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "37c9fe5c.d39282",
+ "id": "31c5a0ea.7876c",
"type": "switchNode",
"name": "switch service-data.networks_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 873.03125,
- "y": 847,
- "z": "e07ef8ab.015e18",
+ "x": 819,
+ "y": 854.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "e9c16900.4e5438",
- "e8407f7c.3cfd8"
+ "e20b349f.c8503",
+ "816d3d6d.6345a8"
]
]
},
{
- "id": "e9c16900.4e5438",
+ "id": "e20b349f.c8503",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1146.8408203125,
- "y": 815.952392578125,
- "z": "e07ef8ab.015e18",
+ "x": 1092.8095703125,
+ "y": 822.9524230957031,
+ "z": "d1c71750.37b338",
"wires": [
[
- "8caf1520.ea5d28"
+ "4ecd5064.971558"
]
]
},
{
- "id": "e8407f7c.3cfd8",
+ "id": "816d3d6d.6345a8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1141.697998046875,
- "y": 861.6666870117188,
- "z": "e07ef8ab.015e18",
+ "x": 1087.666748046875,
+ "y": 868.6667175292969,
+ "z": "d1c71750.37b338",
"wires": [
[
- "3d0ae0cb.0b75"
+ "947799f0.0e982"
]
]
},
{
- "id": "8caf1520.ea5d28",
+ "id": "4ecd5064.971558",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='0' />\n",
"comments": "",
- "x": 1299.8408203125,
- "y": 815.5238037109375,
- "z": "e07ef8ab.015e18",
+ "x": 1245.8095703125,
+ "y": 822.5238342285156,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "3d0ae0cb.0b75",
+ "id": "947799f0.0e982",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
"comments": "",
- "x": 1301.2694091796875,
- "y": 860.5238647460938,
- "z": "e07ef8ab.015e18",
+ "x": 1247.2381591796875,
+ "y": 867.5238952636719,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "bb4e39dc.aefd28",
+ "id": "f41c462f.8589a",
"type": "set",
"name": "set network in service-data",
"xml": "<set>\n<parameter name=\"service-data.networks.network[$nidx].network-id\" value='`$prop.l3vpn.network-id`' />\n<parameter name='service-data.networks.network[$nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.service-information.' value='`$network-topology-operation-input.service-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-information.' value='`$network-topology-operation-input.network-information.`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-request-input.' value='`$network-topology-operation-input.network-request-input.`' />\n<parameter name=\"service-data.networks.network_length\" value='`$nidx+1`' />\n\n",
"comments": "",
- "x": 787.03125,
- "y": 1335,
- "z": "e07ef8ab.015e18",
+ "x": 733,
+ "y": 1342.0000305175781,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "90e757cc.0959f8",
+ "id": "58848908.ffbbb",
"type": "set",
"name": "set networkId and network-object-path",
"xml": "<set>\n<parameter name='networkId' value='`$prop.l3vpn.network-id`' />\n<parameter name=\"network-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.l3vpn.network-id + '/network-data/'` \" />",
"comments": "",
- "x": 816.03125,
- "y": 1380,
- "z": "e07ef8ab.015e18",
+ "x": 762,
+ "y": 1387.0000305175781,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "8c153068.d865f",
+ "id": "7b14c9f6.80d72",
"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": 763.03125,
- "y": 1569,
- "z": "e07ef8ab.015e18",
+ "x": 709,
+ "y": 1576.0000305175781,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "b9935276.cc7ee",
+ "id": "a66c7c7d.376898",
"type": "set",
"name": "set network-level-oper-status",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />",
"comments": "",
- "x": 789.03125,
- "y": 1427,
- "z": "e07ef8ab.015e18",
+ "x": 735,
+ "y": 1434.0000305175781,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "e891bd7f.8fb2d",
+ "id": "30879b4d.be3994",
"type": "get-resource",
"name": "get-resource pnf",
"xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t depth = '0'\"\n pfx='tmp.aai.pnf' local-only='false' >\n\n",
"comments": "",
"outputs": 1,
- "x": 864.03125,
- "y": 253,
- "z": "e07ef8ab.015e18",
+ "x": 810,
+ "y": 260.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[
- "65bf056c.a7d85c",
- "fae17ce6.d5a8d",
- "fdfd8ef.d5d287"
+ "48cba823.32bfc",
+ "fe778394.3d9298",
+ "a675b2b2.a64298"
]
]
},
{
- "id": "65bf056c.a7d85c",
+ "id": "48cba823.32bfc",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1186.03125,
- "y": 143,
- "z": "e07ef8ab.015e18",
+ "x": 1132,
+ "y": 150.00003051757812,
+ "z": "d1c71750.37b338",
"wires": [
[
- "f138cb6b.a435c8"
+ "8bb789cd.2a1608"
]
]
},
{
- "id": "fae17ce6.d5a8d",
+ "id": "fe778394.3d9298",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1189.522216796875,
- "y": 190.57403564453125,
- "z": "e07ef8ab.015e18",
+ "x": 1135.490966796875,
+ "y": 197.57406616210938,
+ "z": "d1c71750.37b338",
"wires": [
[
- "922f5f08.50eaa"
+ "8f58e126.403b1"
]
]
},
{
- "id": "fdfd8ef.d5d287",
+ "id": "a675b2b2.a64298",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1184.855224609375,
- "y": 231.9073486328125,
- "z": "e07ef8ab.015e18",
+ "x": 1130.823974609375,
+ "y": 238.90737915039062,
+ "z": "d1c71750.37b338",
"wires": [
[
- "c6cd8782.fae7f8"
+ "8d89cc4d.eb7678"
]
]
},
{
- "id": "922f5f08.50eaa",
+ "id": "8f58e126.403b1",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
"comments": "",
- "x": 1366.0936279296875,
- "y": 178.85977172851562,
- "z": "e07ef8ab.015e18",
+ "x": 1312.0623779296875,
+ "y": 185.85980224609375,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "c6cd8782.fae7f8",
+ "id": "8d89cc4d.eb7678",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
"comments": "",
- "x": 1372.6277809143066,
- "y": 227.34654140472412,
- "z": "e07ef8ab.015e18",
+ "x": 1318.5965309143066,
+ "y": 234.34657192230225,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "f138cb6b.a435c8",
+ "id": "8bb789cd.2a1608",
"type": "set",
"name": "set tmp.thirdparty-sdnc-id",
"xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
"comments": "",
- "x": 1390.03125,
- "y": 130,
- "z": "e07ef8ab.015e18",
+ "x": 1336,
+ "y": 137.00003051757812,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "56419be7.895d24",
+ "id": "d54c20dc.cf6128",
"type": "save",
"name": "save underlay configuration in AAI",
"xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n key='configuration.configuration-id = $prop.l3vpn.network-id' >\n<parameter name='configuration-id' value='`$prop.l3vpn.network-id`' />\n<parameter name='configuration-type' value='underlay' />\n<parameter name='configuration-sub-type' value='l3vpn' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$prop.l3vpn.network-id`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.l3vpn.network-id + '/network-data/'` \" />\n",
"comments": "",
"outputs": 1,
- "x": 808.03125,
- "y": 1477,
- "z": "e07ef8ab.015e18",
+ "x": 754,
+ "y": 1484.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "a13270b7.6c1f5",
+ "id": "b11968d4.007e68",
"type": "save",
"name": "save service relationship in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.l3vpn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.l3vpn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-key\" value=\"configuration.configuration-type\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[1].relationship-value\" value=\"underlay\" />",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.l3vpn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.l3vpn.network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 800.03125,
- "y": 1523,
- "z": "e07ef8ab.015e18",
+ "x": 746,
+ "y": 1530.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "a0a289d3.8a3128",
+ "id": "d3d6530.ff1843",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1312.53125,
- "y": 404.9999694824219,
- "z": "e07ef8ab.015e18",
- "wires": [
- [
- "8ed22fd9.4d3dc",
- "efdd2674.739ce8",
- "f576c53a.7be778",
- "f5da2a66.76d6a8",
- "9322169f.7e6468",
- "41e22f2d.675b9",
- "fc7aed60.65dde",
- "3fbbe309.27a1fc",
- "a2bdcc47.ae6fd",
- "5ff7d202.bbe52c",
- "70478129.46c8",
- "5b2c84b5.c4133c",
- "5f56629a.41d4bc",
- "88ead0cd.822bb",
- "166443d5.94dbbc",
- "2e267b3e.323f94",
- "291e6ccb.4ad7e4",
- "c859e422.4eadc8",
- "335bcb16.8452b4",
- "b8ac331e.cf80f",
- "eddb16e2.7d3ca8",
- "445b45a7.1c9e2c",
- "ff841f48.1f039",
- "b523547.75bb8a8",
- "3d30a696.2b7b1a"
- ]
- ]
- },
- {
- "id": "be278e7d.aed",
+ "x": 1258.5,
+ "y": 412,
+ "z": "d1c71750.37b338",
+ "wires": [
+ [
+ "79980939.27992",
+ "6566447b.cd16fc",
+ "db1ad825.26052",
+ "612a1bef.8a1a9c",
+ "32815667.56769a",
+ "d99350c4.40314",
+ "e54a4b77.575f08",
+ "a16ad1af.30669",
+ "a9d432.f245a3d",
+ "89f7d244.7bed58",
+ "9e107c02.44f758",
+ "37c58153.b2998e",
+ "9ab7bd24.8d06c8",
+ "c98044e2.7a0fd",
+ "9c377089.4d9f3",
+ "6227130a.b283dc",
+ "87656c47.a73838",
+ "9d6a7f28.4304b",
+ "b0373753.70f0a",
+ "a53453dd.69ab28",
+ "9abdda02.3e776",
+ "e12d824c.4650c8",
+ "46a813fb.9bd0f4",
+ "f615e32b.689a18",
+ "5e4ee4bb.9cbae4"
+ ]
+ ]
+ },
+ {
+ "id": "e652cb3f.9ae0d",
"type": "execute",
"name": "execute RestApiCallNode Get token",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
"comments": "",
"outputs": 1,
- "x": 1033.03125,
- "y": 919.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 979,
+ "y": 927,
+ "z": "d1c71750.37b338",
"wires": [
[
- "33fe71db.48126e",
- "3c08e3ae.fb245c"
+ "5108fa21.828c5c",
+ "4ae0e1c.42791a"
]
]
},
{
- "id": "33fe71db.48126e",
+ "id": "5108fa21.828c5c",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1268.03125,
- "y": 897.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1214,
+ "y": 905,
+ "z": "d1c71750.37b338",
"wires": [
[
- "b2de4cc8.de5ec"
+ "8a3a1639.1431d"
]
]
},
{
- "id": "3c08e3ae.fb245c",
+ "id": "4ae0e1c.42791a",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1260.28125,
- "y": 951.6428527832031,
- "z": "e07ef8ab.015e18",
+ "x": 1206.25,
+ "y": 958.6428833007812,
+ "z": "d1c71750.37b338",
"wires": [
[
- "49c53683.778b88"
+ "a0998cd9.40253"
]
]
},
{
- "id": "49c53683.778b88",
+ "id": "a0998cd9.40253",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing get token rest api\" />\n",
"comments": "",
- "x": 1413.03125,
- "y": 951.3929138183594,
- "z": "e07ef8ab.015e18",
+ "x": 1359,
+ "y": 958.3929443359375,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "b2de4cc8.de5ec",
+ "id": "8a3a1639.1431d",
"type": "set",
"name": "set token-id",
"xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
"comments": "",
- "x": 1422.03125,
- "y": 898.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1368,
+ "y": 906,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "52fc73ef.e7aa0c",
+ "id": "d40cc8a7.624908",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1448.03125,
- "y": 1070.9999694824219,
- "z": "e07ef8ab.015e18",
+ "x": 1394,
+ "y": 1078,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
},
{
- "id": "b81affca.012b9",
+ "id": "550c17e5.cfd818",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1455.28125,
- "y": 1165.6427917480469,
- "z": "e07ef8ab.015e18",
+ "x": 1401.25,
+ "y": 1172.642822265625,
+ "z": "d1c71750.37b338",
"wires": [
[
- "5c541133.bfa8d"
+ "d57e2b04.e0fea"
]
]
},
{
- "id": "5c541133.bfa8d",
+ "id": "d57e2b04.e0fea",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error executing 3rd party controller rest api\" />\n",
"comments": "",
- "x": 1427.03125,
- "y": 1350.3929138183594,
- "z": "e07ef8ab.015e18",
+ "x": 1373,
+ "y": 1357.3929443359375,
+ "z": "d1c71750.37b338",
"wires": []
},
{
- "id": "fb767200.4ff718",
+ "id": "725ceec3.c5b2",
"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": 757,
- "y": 991,
- "z": "e07ef8ab.015e18",
+ "x": 702.96875,
+ "y": 998.0000305175781,
+ "z": "d1c71750.37b338",
"wires": [
[]
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
index cfdbab5a..a5427e32 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.json
@@ -1 +1,1537 @@
-[{"id":"e5a03d9a.1edde","type":"dgstart","name":"DGSTART","outputs":1,"x":168,"y":90,"z":"4627aafc.0cf754","wires":[["1a45e32c.7eec9d"]]},{"id":"1a45e32c.7eec9d","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":264.2380790710449,"y":150.95239067077637,"z":"4627aafc.0cf754","wires":[["8c562652.9938c"]]},{"id":"8c562652.9938c","type":"method","name":"tunnelxconn-topology-operation-assign","xml":"<method rpc='tunnelxconn-topology-operation-assign' mode='sync'>\n","comments":"","outputs":1,"x":315.15485763549805,"y":186.19044589996338,"z":"4627aafc.0cf754","wires":[["127b33d3.348d44"]]},{"id":"127b33d3.348d44","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":218.47619247436523,"y":329.5237879753113,"z":"4627aafc.0cf754","wires":[["ed41c58b.0de058","40c517df.179a68","31364232.805fa6","9e41c4b2.1cbae8","f542b0.6e96f55"]]},{"id":"af6119f3.dfb79","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":1061.6666564941406,"y":2256.5477046966553,"z":"4627aafc.0cf754","wires":[]},{"id":"358d6fd4.61c","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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":1098.7540550231934,"y":2135.432439804077,"z":"4627aafc.0cf754","wires":[]},{"id":"a3bcd19.c7f583","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":1170.468376159668,"y":1552.6228160858154,"z":"4627aafc.0cf754","wires":[]},{"id":"40c517df.179a68","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":664.738037109375,"y":197.33331298828125,"z":"4627aafc.0cf754","wires":[]},{"id":"ed41c58b.0de058","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":712.997314453125,"y":153.59259033203125,"z":"4627aafc.0cf754","wires":[]},{"id":"bb3b1063.64e5e","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":851.8148803710938,"y":369.26727294921875,"z":"4627aafc.0cf754","wires":[["18d55063.8f2ed8"]]},{"id":"b4db148.3666b68","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.tx.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":1191.8626251220703,"y":1777.1008231639862,"z":"4627aafc.0cf754","wires":[["849359cb.597c6","492cd67b.f3ce88","180f6e96.404e19"]]},{"id":"849359cb.597c6","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1460.5040016174316,"y":1828.4322349056602,"z":"4627aafc.0cf754","wires":[["ba0327fc.aba8b8"]]},{"id":"492cd67b.f3ce88","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1451.504051208496,"y":1796.9322606548667,"z":"4627aafc.0cf754","wires":[["ba0327fc.aba8b8"]]},{"id":"180f6e96.404e19","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":1455.2540893554688,"y":1767.289365530014,"z":"4627aafc.0cf754","wires":[["d14af406.4287f"]]},{"id":"ba0327fc.aba8b8","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":1621.2540893554688,"y":1797.6822844967246,"z":"4627aafc.0cf754","wires":[]},{"id":"5be54f87.d14c2","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1201.5294189453125,"y":470.05291748046875,"z":"4627aafc.0cf754","wires":[]},{"id":"a2ba5660.2c2fb8","type":"comment","name":"Save consumed-allotted-resources to mdsal","info":"","comments":"","x":1228.2435302734375,"y":1292.7196044921875,"z":"4627aafc.0cf754","wires":[]},{"id":"8b6a893a.d008b8","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":574.8148193359375,"y":339.7672119140625,"z":"4627aafc.0cf754","wires":[]},{"id":"18d55063.8f2ed8","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 tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n","comments":"","x":1161.129150390625,"y":364.6243896484375,"z":"4627aafc.0cf754","wires":[]},{"id":"f11c5b51.4f3278","type":"set","name":"set tx-ar-identifiers","xml":"<set>\n<parameter name='tx-ar-identifiers.consuming-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='tx-ar-identifiers.parent-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n","comments":"","x":1211.38623046875,"y":563.6243896484375,"z":"4627aafc.0cf754","wires":[]},{"id":"a0f58fcb.d9b998","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":1238.338623046875,"y":522.338623046875,"z":"4627aafc.0cf754","wires":[]},{"id":"47fd678a.738f08","type":"set","name":"set identifiers in overall structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value=\"`$tx-ar-identifiers.`\" />\n\n\n","comments":"","x":1228.38623046875,"y":871.910400390625,"z":"4627aafc.0cf754","wires":[]},{"id":"3081a28c.9b5c36","type":"set","name":"set ecomp model information from input","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \nvalue=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n","comments":"","x":1256.957763671875,"y":606.9100952148438,"z":"4627aafc.0cf754","wires":[]},{"id":"c627ed39.e1aaf8","type":"switchNode","name":"switch model-invariant-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n","comments":"","outputs":1,"x":1237.8148193359375,"y":646.195809841156,"z":"4627aafc.0cf754","wires":[["37aaff9b.6ef948"]]},{"id":"37aaff9b.6ef948","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1464.9576988220215,"y":647.6243271827698,"z":"4627aafc.0cf754","wires":[["d4ace565.3a0d58"]]},{"id":"d4ace565.3a0d58","type":"set","name":"set model-invariant-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n","comments":"","x":1666.38627243042,"y":647.0528798103333,"z":"4627aafc.0cf754","wires":[]},{"id":"11faa499.f9d22b","type":"switchNode","name":"switch model-uuid is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n","comments":"","outputs":1,"x":1209.2434158325195,"y":680.4815106391907,"z":"4627aafc.0cf754","wires":[["d5fa1186.86df"]]},{"id":"d5fa1186.86df","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1410.6719818115234,"y":681.0529322624207,"z":"4627aafc.0cf754","wires":[["10be4dfe.844d32"]]},{"id":"10be4dfe.844d32","type":"set","name":"set model-uuid","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n","comments":"","x":1603.529140472412,"y":681.0528540611267,"z":"4627aafc.0cf754","wires":[]},{"id":"77e8e0e0.62c46","type":"switchNode","name":"switch model-version is null","xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n","comments":"","outputs":1,"x":1217.8148193359375,"y":722.338623046875,"z":"4627aafc.0cf754","wires":[["2d586a06.2b22fe"]]},{"id":"2d586a06.2b22fe","type":"outcome","name":"outcome null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1467.8148002624512,"y":713.3386225700378,"z":"4627aafc.0cf754","wires":[["8505026a.4f24f8"]]},{"id":"8505026a.4f24f8","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":1660.6719589233398,"y":713.3385443687439,"z":"4627aafc.0cf754","wires":[]},{"id":"520caffa.1e3b98","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n","comments":"","outputs":1,"x":1281.38623046875,"y":815.7672729492188,"z":"4627aafc.0cf754","wires":[["77882b56.1c8fc4","554f7f59.f93b78"]]},{"id":"77882b56.1c8fc4","type":"other","name":"outcome Y","xml":"<outcome value='Y'>\n","comments":"","outputs":1,"x":1567.3862915039062,"y":815.1958618164062,"z":"4627aafc.0cf754","wires":[["6920c7dc.a2a58"]]},{"id":"6920c7dc.a2a58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">\n","atomic":"true","comments":"","outputs":1,"x":1721.1363525390625,"y":817.69580078125,"z":"4627aafc.0cf754","wires":[["d8057468.473a48"]]},{"id":"554f7f59.f93b78","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1586.608642578125,"y":904.1958618164062,"z":"4627aafc.0cf754","wires":[["ac09c984.93c9a8"]]},{"id":"ac09c984.93c9a8","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":1769.608642578125,"y":909.1958618164062,"z":"4627aafc.0cf754","wires":[]},{"id":"d8057468.473a48","type":"switchNode","name":"switch ar-model.ecomp-generated-naming","xml":"<switch test='`$ar-model.naming-policy`'>\n","comments":"","outputs":1,"x":1857.38623046875,"y":866.767333984375,"z":"4627aafc.0cf754","wires":[["ea4f625c.daf458","dd389be2.410d38"]]},{"id":"ea4f625c.daf458","type":"other","name":"outcome oam_network_policy","xml":"<outcome value='oam_network_policy'>\n","comments":"","outputs":1,"x":2232.244140625,"y":870.3453369140625,"z":"4627aafc.0cf754","wires":[["6fa0da80.617c04"]]},{"id":"dd389be2.410d38","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2146.671875,"y":947.1958618164062,"z":"4627aafc.0cf754","wires":[["6fa0da80.617c04"]]},{"id":"d20fc560.51ea78","type":"set","name":"set ar_name","xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n","comments":"","x":2538.100830078125,"y":905.7672729492188,"z":"4627aafc.0cf754","wires":[]},{"id":"e41782e3.e0f368","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":2682.2437858581543,"y":949.6244196891785,"z":"4627aafc.0cf754","wires":[[]]},{"id":"e75f6e33.825248","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":2669.243896484375,"y":989.7672729492188,"z":"4627aafc.0cf754","wires":[[]]},{"id":"6fa0da80.617c04","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":2346.5292015075684,"y":945.3387522697449,"z":"4627aafc.0cf754","wires":[["d20fc560.51ea78","e41782e3.e0f368","e75f6e33.825248","8c24a151.c736c"]]},{"id":"8c24a151.c736c","type":"set","name":"set identifiers.allotted-resource-name","xml":"<set>\n<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n","comments":"","x":2627.1005859375,"y":1040.052978515625,"z":"4627aafc.0cf754","wires":[]},{"id":"e36ad273.011c6","type":"set","name":"set assignments in overall structure","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \nvalue=\"`$tx-ar-assignments.`\" />\n\n\n","comments":"","x":1213.8624267578125,"y":1238.6246337890625,"z":"4627aafc.0cf754","wires":[]},{"id":"ef696041.5b90d8","type":"set","name":"Handle tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>\n\n","comments":"","x":1181.529052734375,"y":1158.052978515625,"z":"4627aafc.0cf754","wires":[]},{"id":"81c7c31a.0b9c08","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":2254.8155822753906,"y":1350.0411586761475,"z":"4627aafc.0cf754","wires":[["a8fdd019.115188"]]},{"id":"b4784ddb.aece58","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":1260.8148193359375,"y":1343.505126953125,"z":"4627aafc.0cf754","wires":[["45dcd74.e909ba8","69f40501.d12704"]]},{"id":"45dcd74.e909ba8","type":"other","name":"outcome Null","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":1661.207763671875,"y":1322.1124267578125,"z":"4627aafc.0cf754","wires":[["a82537c1.99c678"]]},{"id":"69f40501.d12704","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1653.957763671875,"y":1403.1124267578125,"z":"4627aafc.0cf754","wires":[["ec015624.23587"]]},{"id":"a8fdd019.115188","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":2689.4106826782227,"y":1351.85085105896,"z":"4627aafc.0cf754","wires":[["9616a8f.73197d8"]]},{"id":"9616a8f.73197d8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":2896.220375061035,"y":1355.064962387085,"z":"4627aafc.0cf754","wires":[["2403ce35.8da102"]]},{"id":"ec015624.23587","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":1820.8349609375,"y":1397.488525390625,"z":"4627aafc.0cf754","wires":[["81c7c31a.0b9c08","e31fed63.529bb8"]]},{"id":"2403ce35.8da102","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":3064.4817276000977,"y":1359.9222631454468,"z":"4627aafc.0cf754","wires":[["ed794a09.288b9"]]},{"id":"a82537c1.99c678","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":1846.0648193359375,"y":1325.32666015625,"z":"4627aafc.0cf754","wires":[]},{"id":"ed794a09.288b9","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":3310.3391876220703,"y":1354.4937419891357,"z":"4627aafc.0cf754","wires":[]},{"id":"24131551.a54552","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=\"`$tunnelxconn-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":1196.6720123291016,"y":1402.826681137085,"z":"4627aafc.0cf754","wires":[]},{"id":"d14af406.4287f","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1596.910057067871,"y":1763.4815347194672,"z":"4627aafc.0cf754","wires":[[]]},{"id":"468bfff8.9cedd","type":"comment","name":"Add SZ AR to mdsal","info":"","comments":"","x":1123.148193359375,"y":1713.1956787109375,"z":"4627aafc.0cf754","wires":[]},{"id":"790cd2d4.165b2c","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":1137.4814224243164,"y":1476.671986579895,"z":"4627aafc.0cf754","wires":[[]]},{"id":"c56eedac.e7ffe8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":857.57666015625,"y":420.4814453125,"z":"4627aafc.0cf754","wires":[["342ab637.9d2c12"]]},{"id":"4de43800.b85998","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":805.57666015625,"y":916.2908325195312,"z":"4627aafc.0cf754","wires":[["24131551.a54552","790cd2d4.165b2c","a3bcd19.c7f583","b4db148.3666b68","358d6fd4.61c","af6119f3.dfb79","f425ba40.7115f8","5be54f87.d14c2","f11c5b51.4f3278","3081a28c.9b5c36","c627ed39.e1aaf8","11faa499.f9d22b","77e8e0e0.62c46","520caffa.1e3b98","47fd678a.738f08","cebf3b05.8ecc9","75aa99cd.2bc41","9dbd9cc2.7689e","ef696041.5b90d8","e36ad273.011c6","b4784ddb.aece58","cd0dd524.fb0c78","1433ef16.581949","b1ce4e03.bf221","2d580163.5c930e"]]},{"id":"f425ba40.7115f8","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":1176.2434387207031,"y":426.433837890625,"z":"4627aafc.0cf754","wires":[]},{"id":"2d580163.5c930e","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","comments":"","outputs":1,"x":1164.052978515625,"y":1628.5767822265625,"z":"4627aafc.0cf754","wires":[["abe0caa5.373ae8","b2e9c1e.d54a94"]]},{"id":"abe0caa5.373ae8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1413.814842224121,"y":1627.5292553901672,"z":"4627aafc.0cf754","wires":[["43ff6c37.a7022c"]]},{"id":"43ff6c37.a7022c","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":1580.338722229004,"y":1639.1483263969421,"z":"4627aafc.0cf754","wires":[]},{"id":"b2e9c1e.d54a94","type":"failure","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1420.9101295471191,"y":1660.2912230491638,"z":"4627aafc.0cf754","wires":[["43ff6c37.a7022c"]]},{"id":"e31fed63.529bb8","type":"switchNode","name":"switch tmp.found-cidx","xml":"<switch test='`$tmp.found-cidx`'>\n","comments":"","outputs":1,"x":2069.743423461914,"y":1596.2315921783447,"z":"4627aafc.0cf754","wires":[["e9a982b1.ef58e"]]},{"id":"e9a982b1.ef58e","type":"outcomeTrue","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":2259.743377685547,"y":1596.2315292358398,"z":"4627aafc.0cf754","wires":[["157da3f3.93a6e4"]]},{"id":"157da3f3.93a6e4","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2425.743377685547,"y":1596.2315292358398,"z":"4627aafc.0cf754","wires":[["ca0674a1.25423"]]},{"id":"ca0674a1.25423","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":2671.600706100464,"y":1596.8030033111572,"z":"4627aafc.0cf754","wires":[]},{"id":"b3603aa4.6cf16","type":"break","name":"break","xml":"<break/>\n","comments":"","x":3229.243408203125,"y":1399.731689453125,"z":"4627aafc.0cf754","wires":[]},{"id":"3f3ebeb1.b63712","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":1947.9521980285645,"y":1763.1904199123383,"z":"4627aafc.0cf754","wires":[["2c401ba8.1dd6a4","ba3898d2.1f6628","2e69c41e.18f424"]]},{"id":"33f3cbe9.733ea4","type":"comment","name":"Rollback parent","info":"","comments":"","x":1791.9521255493164,"y":1732.8570504188538,"z":"4627aafc.0cf754","wires":[]},{"id":"2c401ba8.1dd6a4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":2319.2602462768555,"y":1823.8553862571716,"z":"4627aafc.0cf754","wires":[["5c77461f.eab298"]]},{"id":"ba3898d2.1f6628","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":2310.26029586792,"y":1792.3554120063782,"z":"4627aafc.0cf754","wires":[["5c77461f.eab298"]]},{"id":"2e69c41e.18f424","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":2314.0103340148926,"y":1762.7125168815255,"z":"4627aafc.0cf754","wires":[["5c77461f.eab298"]]},{"id":"5c77461f.eab298","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2455.666301727295,"y":1758.9046860709786,"z":"4627aafc.0cf754","wires":[[]]},{"id":"33d27b3b.1ed984","type":"comment","name":"Generate naming","info":"","comments":"","x":1212.3862762451172,"y":773.7672252655029,"z":"4627aafc.0cf754","wires":[]},{"id":"31364232.805fa6","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":657,"y":242,"z":"4627aafc.0cf754","wires":[[]]},{"id":"342ab637.9d2c12","type":"get-resource","name":"get-resource parent service instance","xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >\n","comments":"","outputs":1,"x":670,"y":523,"z":"4627aafc.0cf754","wires":[["231a36e0.5b5c92","fa70aaf0.7e7e58"]]},{"id":"fa70aaf0.7e7e58","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":933,"y":517,"z":"4627aafc.0cf754","wires":[["4de43800.b85998"]]},{"id":"231a36e0.5b5c92","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":746,"y":618,"z":"4627aafc.0cf754","wires":[["ef5be56d.68e6b8"]]},{"id":"ef5be56d.68e6b8","type":"returnFailure","name":"return failure - parent service instance not found","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=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n","comments":"","x":673,"y":679,"z":"4627aafc.0cf754","wires":[]},{"id":"59cf2993.ef07d","type":"for","name":"for parent vnf parameters","xml":"<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >\n","comments":"","outputs":1,"x":1723,"y":963,"z":"4627aafc.0cf754","wires":[["9a20a584.dd26e"]]},{"id":"9a20a584.dd26e","type":"switchNode","name":"switch parameter name","xml":"<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>\n","comments":"","outputs":1,"x":1845,"y":1055,"z":"4627aafc.0cf754","wires":[["45008daf.13f0f4","89c3773d.20de38"]]},{"id":"45008daf.13f0f4","type":"other","name":"vgmux_private_ip_0","xml":"<outcome value='vgmux_private_ip_0'>\n","comments":"","outputs":1,"x":2071,"y":1059,"z":"4627aafc.0cf754","wires":[["add12901.13946"]]},{"id":"add12901.13946","type":"set","name":"set tmp.vgmux-bearer-ip","xml":"<set>\n<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n","comments":"","x":2314,"y":1060,"z":"4627aafc.0cf754","wires":[]},{"id":"89c3773d.20de38","type":"other","name":"vgmux_private_ip_2","xml":"<outcome value='vgmux_private_ip_2'>\n","comments":"","outputs":1,"x":2073,"y":1119,"z":"4627aafc.0cf754","wires":[["f5b75cdc.b16da8"]]},{"id":"f5b75cdc.b16da8","type":"set","name":"set tmp.vgmux-lan-ip","xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n","comments":"","x":2316,"y":1120,"z":"4627aafc.0cf754","wires":[]},{"id":"cebf3b05.8ecc9","type":"set","name":"set default assignments","xml":"<set>\n<parameter name='tmp.vni' value='123' />\n<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\n<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />","comments":"","x":1203,"y":917,"z":"4627aafc.0cf754","wires":[]},{"id":"9e41c4b2.1cbae8","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.tx-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":653,"y":285,"z":"4627aafc.0cf754","wires":[[]]},{"id":"9dbd9cc2.7689e","type":"call","name":"call GENERIC-RESOURCE-API:manage-vni-assignment","xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >\n","comments":"","outputs":1,"x":1290,"y":1062,"z":"4627aafc.0cf754","wires":[[]]},{"id":"75aa99cd.2bc41","type":"set","name":"set actions = reserve, pools = VNI, VGW","xml":"<set>\n<parameter name='tmp.manageVni.action' value='reserve' />\n<parameter name='tmp.manageIpaddr.action' value='reserve' />\n<parameter name='tmp.manageVni.pool' value='VNI'/>\n<parameter name='tmp.manageIpaddr.pool' value='VGW'/>","comments":"","x":1226,"y":1008,"z":"4627aafc.0cf754","wires":[]},{"id":"f542b0.6e96f55","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":577,"y":420,"z":"4627aafc.0cf754","wires":[["bb3b1063.64e5e","c56eedac.e7ffe8"]]},{"id":"cd0dd524.fb0c78","type":"switchNode","name":"Does parent service instance have vnf parameters?","xml":"<switch test=\"`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`\">\n","comments":"","outputs":1,"x":1270,"y":958,"z":"4627aafc.0cf754","wires":[["9a6edde3.28567"]]},{"id":"9a6edde3.28567","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1532,"y":960,"z":"4627aafc.0cf754","wires":[["59cf2993.ef07d"]]},{"id":"1433ef16.581949","type":"call","name":"call GENERIC-RESOURCE-API:manage-ipaddr-assignment","xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >\n","comments":"","outputs":1,"x":1286,"y":1109,"z":"4627aafc.0cf754","wires":[[]]},{"id":"b1ce4e03.bf221","type":"set","name":"Handle tx parameters","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_2'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>\n\n","comments":"","x":1178,"y":1198,"z":"4627aafc.0cf754","wires":[]}] \ No newline at end of file
+[
+ {
+ "id":"f7a51f5.fe86ce",
+ "type":"dgstart",
+ "name":"DGSTART",
+ "outputs":1,
+ "x":415,
+ "y":350,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "ba9c043e.e07f58"
+ ]
+ ]
+ },
+ {
+ "id":"ba9c043e.e07f58",
+ "type":"service-logic",
+ "name":"GENERIC-RESOURCE-API ${project.version}",
+ "module":"GENERIC-RESOURCE-API",
+ "version":"${project.version}",
+ "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":511.2380790710449,
+ "y":410.95239067077637,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "249d942d.c245dc"
+ ]
+ ]
+ },
+ {
+ "id":"249d942d.c245dc",
+ "type":"method",
+ "name":"tunnelxconn-topology-operation-assign",
+ "xml":"<method rpc='tunnelxconn-topology-operation-assign' mode='sync'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":562.154857635498,
+ "y":446.1904458999634,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "6d5b29f7.7a4718"
+ ]
+ ]
+ },
+ {
+ "id":"6d5b29f7.7a4718",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "comments":"",
+ "outputs":1,
+ "x":465.47619247436523,
+ "y":589.5237879753113,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "3003211a.e085be",
+ "e75e77ea.b57f18",
+ "f5d1d70b.ddc6f8",
+ "338371c3.03166e",
+ "bec51e2f.be8cc"
+ ]
+ ]
+ },
+ {
+ "id":"d0d44753.44ba98",
+ "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":1308.6666564941406,
+ "y":2516.5477046966553,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"8469024b.7a82b",
+ "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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
+ "comments":"",
+ "x":1345.7540550231934,
+ "y":2395.432439804077,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"2132e3dd.5539fc",
+ "type":"set",
+ "name":"set allotted-resource-oper-status",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
+ "comments":"",
+ "x":1417.468376159668,
+ "y":1812.6228160858154,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"e75e77ea.b57f18",
+ "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":911.738037109375,
+ "y":457.33331298828125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"3003211a.e085be",
+ "type":"set",
+ "name":"set tmp.ar.allotted-resource-id,etc",
+ "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
+ "comments":"",
+ "x":959.997314453125,
+ "y":413.59259033203125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"eb1ff0c9.ef38e",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1098.8148803710938,
+ "y":629.2672729492188,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "c02bbcdf.bc013"
+ ]
+ ]
+ },
+ {
+ "id":"4e2ca4b9.af9d2c",
+ "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.tx.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":1438.8626251220703,
+ "y":2037.1008231639862,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "aff222bc.8e6d2",
+ "d2e716e0.ea3f78",
+ "52261953.a9dda8"
+ ]
+ ]
+ },
+ {
+ "id":"aff222bc.8e6d2",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1707.5040016174316,
+ "y":2088.43223490566,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "39f6948c.62523c"
+ ]
+ ]
+ },
+ {
+ "id":"d2e716e0.ea3f78",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1698.504051208496,
+ "y":2056.9322606548667,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "39f6948c.62523c"
+ ]
+ ]
+ },
+ {
+ "id":"52261953.a9dda8",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1702.2540893554688,
+ "y":2027.289365530014,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "dcd5ec61.1101"
+ ]
+ ]
+ },
+ {
+ "id":"39f6948c.62523c",
+ "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":1868.2540893554688,
+ "y":2057.6822844967246,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"c1360476.7b6098",
+ "type":"set",
+ "name":"set oper-status",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
+ "comments":"",
+ "x":1448.5294189453125,
+ "y":730.0529174804688,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"f35d4335.54c9c",
+ "type":"comment",
+ "name":"Save consumed-allotted-resources to mdsal",
+ "info":"",
+ "comments":"",
+ "x":1475.2435302734375,
+ "y":1552.7196044921875,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"655635e7.0e3eec",
+ "type":"comment",
+ "name":"GET tunnelxconn-allotted-resource from mdsal",
+ "info":"",
+ "comments":"",
+ "x":821.8148193359375,
+ "y":599.7672119140625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"c02bbcdf.bc013",
+ "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 tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`\" />\n",
+ "comments":"",
+ "x":1408.129150390625,
+ "y":624.6243896484375,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"573f6a07.f17fd4",
+ "type":"set",
+ "name":"set tx-ar-identifiers",
+ "xml":"<set>\n<parameter name='tx-ar-identifiers.consuming-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='tx-ar-identifiers.parent-service-instance-id' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-type' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='tx-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
+ "comments":"",
+ "x":1458.38623046875,
+ "y":823.6243896484375,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d7829a8.d904768",
+ "type":"comment",
+ "name":"Set allotted-resource-identifiers",
+ "info":"",
+ "comments":"",
+ "x":1485.338623046875,
+ "y":782.338623046875,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"42c79ea2.81985",
+ "type":"set",
+ "name":"set identifiers in overall structure",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value=\"`$tx-ar-identifiers.`\" />\n\n\n",
+ "comments":"",
+ "x":1475.38623046875,
+ "y":1131.910400390625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d8d243c1.7bb7e",
+ "type":"set",
+ "name":"set ecomp model information from input",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.' \nvalue=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`\" />\n\n\n",
+ "comments":"",
+ "x":1503.957763671875,
+ "y":866.9100952148438,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"388bbf45.722ad",
+ "type":"switchNode",
+ "name":"switch model-invariant-uuid is null",
+ "xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1484.8148193359375,
+ "y":906.195809841156,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "61c62608.d61778"
+ ]
+ ]
+ },
+ {
+ "id":"61c62608.d61778",
+ "type":"outcome",
+ "name":"outcome null",
+ "xml":"<outcome value=''>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1711.9576988220215,
+ "y":907.6243271827698,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "39e6f667.b8ce5a"
+ ]
+ ]
+ },
+ {
+ "id":"39e6f667.b8ce5a",
+ "type":"set",
+ "name":"set model-invariant-uuid",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid' \nvalue=\"`$ar-model.invariant-uuid`\" />\n\n\n",
+ "comments":"",
+ "x":1913.38627243042,
+ "y":907.0528798103333,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"e8848901.4775c8",
+ "type":"switchNode",
+ "name":"switch model-uuid is null",
+ "xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1456.2434158325195,
+ "y":940.4815106391907,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "d9785a66.79e3a8"
+ ]
+ ]
+ },
+ {
+ "id":"d9785a66.79e3a8",
+ "type":"outcome",
+ "name":"outcome null",
+ "xml":"<outcome value=''>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1657.6719818115234,
+ "y":941.0529322624207,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "1427b5c2.d5936a"
+ ]
+ ]
+ },
+ {
+ "id":"1427b5c2.d5936a",
+ "type":"set",
+ "name":"set model-uuid",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid' \nvalue=\"`$ar-model.uuid`\" />\n\n\n",
+ "comments":"",
+ "x":1850.529140472412,
+ "y":941.0528540611267,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"109fba97.f782b5",
+ "type":"switchNode",
+ "name":"switch model-version is null",
+ "xml":"<switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1464.8148193359375,
+ "y":982.338623046875,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "3f70eb82.810ee4"
+ ]
+ ]
+ },
+ {
+ "id":"3f70eb82.810ee4",
+ "type":"outcome",
+ "name":"outcome null",
+ "xml":"<outcome value=''>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1714.8148002624512,
+ "y":973.3386225700378,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "dc565eb7.6c9dc"
+ ]
+ ]
+ },
+ {
+ "id":"dc565eb7.6c9dc",
+ "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":1907.6719589233398,
+ "y":973.3385443687439,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"1d9a0b0d.a6f8f5",
+ "type":"switchNode",
+ "name":"switch ar-model.ecomp-generated-naming",
+ "xml":"<switch test='`$ar-model.ecomp-generated-naming`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1528.38623046875,
+ "y":1075.7672729492188,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "5928be3a.62e24",
+ "297d3bf7.200674"
+ ]
+ ]
+ },
+ {
+ "id":"5928be3a.62e24",
+ "type":"other",
+ "name":"outcome Y",
+ "xml":"<outcome value='Y'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1814.3862915039062,
+ "y":1075.1958618164062,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "7b105e84.481c9"
+ ]
+ ]
+ },
+ {
+ "id":"7b105e84.481c9",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">\n",
+ "atomic":"true",
+ "comments":"",
+ "outputs":1,
+ "x":1968.1363525390625,
+ "y":1077.69580078125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "92b98902.431af8"
+ ]
+ ]
+ },
+ {
+ "id":"297d3bf7.200674",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1833.608642578125,
+ "y":1164.1958618164062,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "3e840127.e2aa3e"
+ ]
+ ]
+ },
+ {
+ "id":"3e840127.e2aa3e",
+ "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":2016.608642578125,
+ "y":1169.1958618164062,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"92b98902.431af8",
+ "type":"switchNode",
+ "name":"switch ar-model.ecomp-generated-naming",
+ "xml":"<switch test='`$ar-model.naming-policy`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2104.38623046875,
+ "y":1126.767333984375,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "26eb7249.47e7fe",
+ "f1043fa9.14b2e"
+ ]
+ ]
+ },
+ {
+ "id":"26eb7249.47e7fe",
+ "type":"other",
+ "name":"outcome oam_network_policy",
+ "xml":"<outcome value='oam_network_policy'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2479.244140625,
+ "y":1130.3453369140625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "e7502764.f34288"
+ ]
+ ]
+ },
+ {
+ "id":"f1043fa9.14b2e",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2393.671875,
+ "y":1207.1958618164062,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "e7502764.f34288"
+ ]
+ ]
+ },
+ {
+ "id":"1d6e2e9f.9f6281",
+ "type":"set",
+ "name":"set ar_name",
+ "xml":"<set>\n<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />\n",
+ "comments":"",
+ "x":2785.100830078125,
+ "y":1165.7672729492188,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d37d22cd.5e612",
+ "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":2929.2437858581543,
+ "y":1209.6244196891785,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"ef7b09c8.6b36b8",
+ "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":2916.243896484375,
+ "y":1249.7672729492188,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"e7502764.f34288",
+ "type":"block",
+ "name":"block: atomic",
+ "xml":"<block atomic='true'>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":2593.5292015075684,
+ "y":1205.3387522697449,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "1d6e2e9f.9f6281",
+ "d37d22cd.5e612",
+ "ef7b09c8.6b36b8",
+ "49ad4058.d0089"
+ ]
+ ]
+ },
+ {
+ "id":"49ad4058.d0089",
+ "type":"set",
+ "name":"set identifiers.allotted-resource-name",
+ "xml":"<set>\n<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />\n",
+ "comments":"",
+ "x":2874.1005859375,
+ "y":1300.052978515625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d092a98.3446758",
+ "type":"set",
+ "name":"set assignments in overall structure",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.' \nvalue=\"`$tx-ar-assignments.`\" />\n\n\n",
+ "comments":"",
+ "x":1460.8624267578125,
+ "y":1498.6246337890625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"add28223.49736",
+ "type":"set",
+ "name":"Handle tx-ar-assignments",
+ "xml":"<set>\n<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>\n\n",
+ "comments":"",
+ "x":1428.529052734375,
+ "y":1418.052978515625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"6d7c9c61.51b0b4",
+ "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":2501.8155822753906,
+ "y":1610.0411586761475,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "70f7bb5e.ea0274"
+ ]
+ ]
+ },
+ {
+ "id":"c057b9c3.dc3768",
+ "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":1507.8148193359375,
+ "y":1603.505126953125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "62b02de0.0af454",
+ "26557b09.94a7f4"
+ ]
+ ]
+ },
+ {
+ "id":"62b02de0.0af454",
+ "type":"other",
+ "name":"outcome Null",
+ "xml":"<outcome value=''>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1908.207763671875,
+ "y":1582.1124267578125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "b0181993.439998"
+ ]
+ ]
+ },
+ {
+ "id":"26557b09.94a7f4",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1900.957763671875,
+ "y":1663.1124267578125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "670fdc23.c2e944"
+ ]
+ ]
+ },
+ {
+ "id":"70f7bb5e.ea0274",
+ "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":2936.4106826782227,
+ "y":1611.85085105896,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "a8f61abf.fcd308"
+ ]
+ ]
+ },
+ {
+ "id":"a8f61abf.fcd308",
+ "type":"outcomeTrue",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":3143.220375061035,
+ "y":1615.064962387085,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "df6d8539.73d218"
+ ]
+ ]
+ },
+ {
+ "id":"670fdc23.c2e944",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":2067.8349609375,
+ "y":1657.488525390625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "6d7c9c61.51b0b4",
+ "a831b9c8.902e48"
+ ]
+ ]
+ },
+ {
+ "id":"df6d8539.73d218",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":3311.4817276000977,
+ "y":1619.9222631454468,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "cf90980d.2f50b8"
+ ]
+ ]
+ },
+ {
+ "id":"b0181993.439998",
+ "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":2093.0648193359375,
+ "y":1585.32666015625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"cf90980d.2f50b8",
+ "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":3557.3391876220703,
+ "y":1614.4937419891357,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"9e1a3f00.67db8",
+ "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=\"`$tunnelxconn-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":1443.6720123291016,
+ "y":1662.826681137085,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"dcd5ec61.1101",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1843.910057067871,
+ "y":2023.4815347194672,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"1b2081c9.a5da5e",
+ "type":"comment",
+ "name":"Add SZ AR to mdsal",
+ "info":"",
+ "comments":"",
+ "x":1370.148193359375,
+ "y":1973.1956787109375,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"7aaed588.63511c",
+ "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":1384.4814224243164,
+ "y":1736.671986579895,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"99804d99.5a352",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1104.57666015625,
+ "y":680.4814453125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "e8c6a2dd.e4b3e"
+ ]
+ ]
+ },
+ {
+ "id":"aae390e8.74c6e",
+ "type":"block",
+ "name":"block: atomic",
+ "xml":"<block atomic=\"true\">\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1052.57666015625,
+ "y":1176.2908325195312,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "9e1a3f00.67db8",
+ "7aaed588.63511c",
+ "2132e3dd.5539fc",
+ "4e2ca4b9.af9d2c",
+ "8469024b.7a82b",
+ "d0d44753.44ba98",
+ "d7a47b9d.32cb28",
+ "c1360476.7b6098",
+ "573f6a07.f17fd4",
+ "d8d243c1.7bb7e",
+ "388bbf45.722ad",
+ "e8848901.4775c8",
+ "109fba97.f782b5",
+ "1d9a0b0d.a6f8f5",
+ "42c79ea2.81985",
+ "59dac422.4bc30c",
+ "d857982b.5cce48",
+ "40af5f1c.9055f",
+ "add28223.49736",
+ "d092a98.3446758",
+ "c057b9c3.dc3768",
+ "30b6665f.e4a89a",
+ "de53cfb9.dddbd",
+ "abea3cf1.3111d",
+ "f623a457.d69fb8"
+ ]
+ ]
+ },
+ {
+ "id":"d7a47b9d.32cb28",
+ "type":"set",
+ "name":"set id",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />",
+ "comments":"",
+ "x":1423.2434387207031,
+ "y":686.433837890625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"f623a457.d69fb8",
+ "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",
+ "comments":"",
+ "outputs":1,
+ "x":1411.052978515625,
+ "y":1888.5767822265625,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "34d1f7b2.8b87a8",
+ "b3d34689.7dc1b8"
+ ]
+ ]
+ },
+ {
+ "id":"34d1f7b2.8b87a8",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1660.814842224121,
+ "y":1887.5292553901672,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "a85cc318.f284a"
+ ]
+ ]
+ },
+ {
+ "id":"a85cc318.f284a",
+ "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":1827.338722229004,
+ "y":1899.1483263969421,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"b3d34689.7dc1b8",
+ "type":"failure",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1667.9101295471191,
+ "y":1920.2912230491638,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "a85cc318.f284a"
+ ]
+ ]
+ },
+ {
+ "id":"a831b9c8.902e48",
+ "type":"switchNode",
+ "name":"switch tmp.found-cidx",
+ "xml":"<switch test='`$tmp.found-cidx`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2316.743423461914,
+ "y":1856.2315921783447,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "7ea3dd53.4333f4"
+ ]
+ ]
+ },
+ {
+ "id":"7ea3dd53.4333f4",
+ "type":"outcomeTrue",
+ "name":"false",
+ "xml":"<outcome value='false'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2506.743377685547,
+ "y":1856.2315292358398,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "b69b3a44.e782b8"
+ ]
+ ]
+ },
+ {
+ "id":"b69b3a44.e782b8",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "outputs":1,
+ "x":2672.743377685547,
+ "y":1856.2315292358398,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "b4e6550a.303748"
+ ]
+ ]
+ },
+ {
+ "id":"b4e6550a.303748",
+ "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":2918.600706100464,
+ "y":1856.8030033111572,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"995e10ab.ef2f6",
+ "type":"break",
+ "name":"break",
+ "xml":"<break/>\n",
+ "comments":"",
+ "x":3476.243408203125,
+ "y":1659.731689453125,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"ad2c1042.ffcf4",
+ "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":2194.9521980285645,
+ "y":2023.1904199123383,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "473b0bea.e2adf4",
+ "7b199046.8906d",
+ "416141e2.fa511"
+ ]
+ ]
+ },
+ {
+ "id":"f9d8c7c9.5d1db8",
+ "type":"comment",
+ "name":"Rollback parent",
+ "info":"",
+ "comments":"",
+ "x":2038.9521255493164,
+ "y":1992.8570504188538,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"473b0bea.e2adf4",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2566.2602462768555,
+ "y":2083.8553862571716,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "4115590f.ef7568"
+ ]
+ ]
+ },
+ {
+ "id":"7b199046.8906d",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2557.26029586792,
+ "y":2052.355412006378,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "4115590f.ef7568"
+ ]
+ ]
+ },
+ {
+ "id":"416141e2.fa511",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2561.0103340148926,
+ "y":2022.7125168815255,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "4115590f.ef7568"
+ ]
+ ]
+ },
+ {
+ "id":"4115590f.ef7568",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":2702.666301727295,
+ "y":2018.9046860709786,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"bf37a377.dd8a4",
+ "type":"comment",
+ "name":"Generate naming",
+ "info":"",
+ "comments":"",
+ "x":1459.3862762451172,
+ "y":1033.767225265503,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"f5d1d70b.ddc6f8",
+ "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":904,
+ "y":502,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"e8c6a2dd.e4b3e",
+ "type":"get-resource",
+ "name":"get-resource parent service instance",
+ "xml":"<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":917,
+ "y":783,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "8991d34b.f48af",
+ "dbef2e21.0da74"
+ ]
+ ]
+ },
+ {
+ "id":"dbef2e21.0da74",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1180,
+ "y":777,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "aae390e8.74c6e"
+ ]
+ ]
+ },
+ {
+ "id":"8991d34b.f48af",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":993,
+ "y":878,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "d4ea2429.a9c908"
+ ]
+ ]
+ },
+ {
+ "id":"d4ea2429.a9c908",
+ "type":"returnFailure",
+ "name":"return failure - parent service instance not found",
+ "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=\"`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`\" />\n",
+ "comments":"",
+ "x":920,
+ "y":939,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"be6a5ce7.0ed",
+ "type":"for",
+ "name":"for parent vnf parameters",
+ "xml":"<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":1970,
+ "y":1223,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "95805190.debbe"
+ ]
+ ]
+ },
+ {
+ "id":"95805190.debbe",
+ "type":"switchNode",
+ "name":"switch parameter name",
+ "xml":"<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2092,
+ "y":1315,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "508d4d24.3b9154",
+ "1ac32417.a325dc"
+ ]
+ ]
+ },
+ {
+ "id":"508d4d24.3b9154",
+ "type":"other",
+ "name":"vgmux_private_ip_0",
+ "xml":"<outcome value='vgmux_private_ip_0'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2318,
+ "y":1319,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "861fd9c6.6015f8"
+ ]
+ ]
+ },
+ {
+ "id":"755943b8.1a105c",
+ "type":"set",
+ "name":"set tmp.vgmux-bearer-ip",
+ "xml":"<set>\n<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n",
+ "comments":"",
+ "x":2550.9999771118164,
+ "y":1380.0000400543213,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"1ac32417.a325dc",
+ "type":"other",
+ "name":"vgmux_private_ip_2",
+ "xml":"<outcome value='vgmux_private_ip_2'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2320,
+ "y":1379,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "755943b8.1a105c"
+ ]
+ ]
+ },
+ {
+ "id":"861fd9c6.6015f8",
+ "type":"set",
+ "name":"set tmp.vgmux-lan-ip",
+ "xml":"<set>\n<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>\n\n",
+ "comments":"",
+ "x":2540.9999771118164,
+ "y":1322.0000381469727,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"59dac422.4bc30c",
+ "type":"set",
+ "name":"set default assignments",
+ "xml":"<set>\n<parameter name='tmp.vni' value='123' />\n<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />\n<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />",
+ "comments":"",
+ "x":1450,
+ "y":1177,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"338371c3.03166e",
+ "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.tx-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":900,
+ "y":545,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"40af5f1c.9055f",
+ "type":"call",
+ "name":"call GENERIC-RESOURCE-API:manage-vni-assignment",
+ "xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":1537,
+ "y":1322,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"d857982b.5cce48",
+ "type":"set",
+ "name":"set actions = reserve, pools = VNI, VGW",
+ "xml":"<set>\n<parameter name='tmp.manageVni.action' value='reserve' />\n<parameter name='tmp.manageIpaddr.action' value='reserve' />\n<parameter name='tmp.manageVni.pool' value='VNI'/>\n<parameter name='tmp.manageIpaddr.pool' value='VGW'/>",
+ "comments":"",
+ "x":1473,
+ "y":1268,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"bec51e2f.be8cc",
+ "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":824,
+ "y":680,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "eb1ff0c9.ef38e",
+ "99804d99.5a352"
+ ]
+ ]
+ },
+ {
+ "id":"30b6665f.e4a89a",
+ "type":"switchNode",
+ "name":"Does parent service instance have vnf parameters?",
+ "xml":"<switch test=\"`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`\">\n",
+ "comments":"",
+ "outputs":1,
+ "x":1517,
+ "y":1218,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "a8ab7150.c4542"
+ ]
+ ]
+ },
+ {
+ "id":"a8ab7150.c4542",
+ "type":"outcomeTrue",
+ "name":"true",
+ "xml":"<outcome value='true'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1779,
+ "y":1220,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+ "be6a5ce7.0ed"
+ ]
+ ]
+ },
+ {
+ "id":"de53cfb9.dddbd",
+ "type":"call",
+ "name":"call GENERIC-RESOURCE-API:manage-ipaddr-assignment",
+ "xml":"<call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >\n",
+ "comments":"",
+ "outputs":1,
+ "x":1533,
+ "y":1369,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"abea3cf1.3111d",
+ "type":"set",
+ "name":"Handle tx parameters",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>\n<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>\n\n",
+ "comments":"",
+ "x":1425,
+ "y":1458,
+ "z":"6d778d5b.c45f64",
+ "wires":[
+
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json
index 23fe9b7d..f9cf0bea 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.json
@@ -1,20 +1,20 @@
[
{
- "id":"39656334.a3e8bc",
+ "id":"5d8427a4.b9ce18",
"type":"dgstart",
"name":"DGSTART",
"outputs":1,
- "x":167.5,
- "y":125,
- "z":"4a786afb.312ac4",
+ "x":289.9999694824219,
+ "y":176.66666221618652,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "641071ac.34ce3"
+ "2a707879.08ed58"
]
]
},
{
- "id":"641071ac.34ce3",
+ "id":"2a707879.08ed58",
"type":"service-logic",
"name":"GENERIC-RESOURCE-API ${project.version}",
"module":"GENERIC-RESOURCE-API",
@@ -22,138 +22,147 @@
"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":263.7380790710449,
- "y":185.95239067077637,
- "z":"4a786afb.312ac4",
+ "x":386.2380485534668,
+ "y":237.6190528869629,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "67611285.46e87c"
+ "f18a9dbb.977df"
]
]
},
{
- "id":"67611285.46e87c",
+ "id":"f18a9dbb.977df",
"type":"method",
"name":"tunnelxconn-topology-operation-create",
"xml":"<method rpc='tunnelxconn-topology-operation-create' mode='sync'>\n",
"comments":"",
"outputs":1,
- "x":309.65485763549805,
- "y":221.19044589996338,
- "z":"4a786afb.312ac4",
+ "x":432.1548271179199,
+ "y":272.8571081161499,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "a134c0c3.36b48"
+ "7f262885.6d59b8"
]
]
},
{
- "id":"a134c0c3.36b48",
+ "id":"7f262885.6d59b8",
"type":"block",
"name":"block : atomic",
"xml":"<block atomic=\"true\">",
"atomic":"true",
"comments":"",
"outputs":1,
- "x":217.97619247436523,
- "y":364.5237879753113,
- "z":"4a786afb.312ac4",
+ "x":340.4761619567871,
+ "y":416.1904501914978,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "afc9ff4c.06763",
- "fd58bf7f.5b2af",
- "fc1a7e2b.aacb3",
- "3dfd770d.60f198",
- "9fda81c2.e3d96",
- "9068ce9.11d8a3",
- "181809a4.09e046",
- "93a91e68.a5dae",
- "21a50431.15138c",
- "522f9134.9df63",
- "a51f265e.f89ce8",
- "5c0e33aa.afc40c",
- "e2f23076.04596",
- "742c0c13.6fb084",
- "81851f96.4bd83",
- "e1d29d16.5b99d"
+ "9a047ca3.43842",
+ "89ae09fa.b55dc8",
+ "d311ed47.69e1d",
+ "55ae20df.fc8b9",
+ "1acbd514.a1254b",
+ "8c2cd18b.e8d76",
+ "ddfe771b.c87dd8",
+ "83a795f7.2396f8",
+ "ba77d55a.14d7b8",
+ "60d77360.0d0b1c",
+ "4aacb3a2.ee73cc",
+ "f2d67a4f.b5fbd8",
+ "3ddd0b30.9a33e4",
+ "9e5a94b9.112208",
+ "6c7d53f3.fcddcc",
+ "5ed77e12.ca895",
+ "58a8145.b4b65ec",
+ "5dffc587.4020dc",
+ "be1a85fd.d9b228",
+ "b5d6eac2.9b2138",
+ "b3164bc6.a02478",
+ "8ddeb7ba.6380c8",
+ "d69c7a00.1f6db8",
+ "5964855c.5ef3ac",
+ "aac1998d.738588"
]
]
},
{
- "id":"fd58bf7f.5b2af",
+ "id":"89ae09fa.b55dc8",
"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":471.16680908203125,
- "y":1489.5479049682617,
- "z":"4a786afb.312ac4",
+ "x":587.6669006347656,
+ "y":2225.2146220207214,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"afc9ff4c.06763",
+ "id":"9a047ca3.43842",
"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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
"comments":"",
- "x":499.9207229614258,
- "y":1453.6704511642456,
- "z":"4a786afb.312ac4",
+ "x":616.4208145141602,
+ "y":2189.3371682167053,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"522f9134.9df63",
+ "id":"60d77360.0d0b1c",
"type":"set",
"name":"set allotted-resource-oper-status",
"xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
"comments":"",
- "x":524.2542190551758,
- "y":745.0514001846313,
- "z":"4a786afb.312ac4",
+ "x":646.7541885375977,
+ "y":796.7180624008179,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"3dfd770d.60f198",
+ "id":"55ae20df.fc8b9",
"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":480.23806381225586,
- "y":338.33332538604736,
- "z":"4a786afb.312ac4",
+ "x":602.7380332946777,
+ "y":389.9999876022339,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"fc1a7e2b.aacb3",
+ "id":"d311ed47.69e1d",
"type":"set",
"name":"set tmp.ar.allotted-resource-id,etc",
"xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
"comments":"",
- "x":527.4973258972168,
- "y":304.59259128570557,
- "z":"4a786afb.312ac4",
+ "x":649.9972953796387,
+ "y":356.2592535018921,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"9fda81c2.e3d96",
+ "id":"1acbd514.a1254b",
"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":486.4934196472168,
- "y":374.23152446746826,
- "z":"4a786afb.312ac4",
+ "x":608.9933891296387,
+ "y":425.8981866836548,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -161,32 +170,32 @@
]
},
{
- "id":"181809a4.09e046",
+ "id":"ddfe771b.c87dd8",
"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":549.0187530517578,
- "y":535.4594917297363,
- "z":"4a786afb.312ac4",
+ "x":671.5187225341797,
+ "y":587.1261539459229,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "72f658fd.fd3218",
- "8b2321c4.4a2dd"
+ "ec9853b.e3a8bb",
+ "58aa3152.ce73e"
]
]
},
{
- "id":"9068ce9.11d8a3",
+ "id":"8c2cd18b.e8d76",
"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.tx-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":514.5648536682129,
- "y":434.0172290802002,
- "z":"4a786afb.312ac4",
+ "x":637.0648231506348,
+ "y":485.6838912963867,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -194,307 +203,307 @@
]
},
{
- "id":"72f658fd.fd3218",
+ "id":"ec9853b.e3a8bb",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":806.3148918151855,
- "y":534.2672522068024,
- "z":"4a786afb.312ac4",
+ "x":928.8148612976074,
+ "y":585.9339144229889,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "35db9fa9.7487b"
+ "c2add8c3.e31ee8"
]
]
},
{
- "id":"93a91e68.a5dae",
+ "id":"83a795f7.2396f8",
"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.tx.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":557.0293121337891,
- "y":888.4341316223145,
- "z":"4a786afb.312ac4",
+ "x":679.5292816162109,
+ "y":940.100793838501,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "fe564e37.78d35",
- "68c9b814.ae8428",
- "20a9be75.8d72f2"
+ "d53ba2b2.4949a",
+ "c75a2aee.7c7e38",
+ "cfb46e43.3d1c1"
]
]
},
{
- "id":"fe564e37.78d35",
+ "id":"d53ba2b2.4949a",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":825.3373527526855,
- "y":949.432451248169,
- "z":"4a786afb.312ac4",
+ "x":947.8373222351074,
+ "y":1001.0991134643555,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "afa4d00a.d44e"
+ "3676f0e6.efdff"
]
]
},
{
- "id":"68c9b814.ae8428",
+ "id":"c75a2aee.7c7e38",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":818.3373794555664,
- "y":909.9323581680655,
- "z":"4a786afb.312ac4",
+ "x":940.8373489379883,
+ "y":961.5990203842521,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "afa4d00a.d44e"
+ "3676f0e6.efdff"
]
]
},
{
- "id":"20a9be75.8d72f2",
+ "id":"cfb46e43.3d1c1",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":822.0874176025391,
- "y":880.2894630432129,
- "z":"4a786afb.312ac4",
+ "x":944.5873870849609,
+ "y":931.9561252593994,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "33071dcd.5083e2"
+ "24baad99.05ac02"
]
]
},
{
- "id":"afa4d00a.d44e",
+ "id":"3676f0e6.efdff",
"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":988.0874176025391,
- "y":910.6823820099235,
- "z":"4a786afb.312ac4",
+ "x":1110.587387084961,
+ "y":962.34904422611,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"35db9fa9.7487b",
+ "id":"c2add8c3.e31ee8",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":987.3148460388184,
- "y":534.7672016620636,
- "z":"4a786afb.312ac4",
+ "x":1109.8148155212402,
+ "y":586.4338638782501,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "b2595262.3530d",
- "d20db31.4b44d5"
+ "6281b16a.56ebc",
+ "9fdaaaf9.7e4e18"
]
]
},
{
- "id":"b2595262.3530d",
+ "id":"6281b16a.56ebc",
"type":"switchNode",
"name":"switch tx length",
"xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n",
"comments":"",
"outputs":1,
- "x":1233.1720924377441,
- "y":569.052964925766,
- "z":"4a786afb.312ac4",
+ "x":1355.672061920166,
+ "y":620.7196271419525,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "decde441.1f9868"
+ "3c62713c.75fd9e"
]
]
},
{
- "id":"decde441.1f9868",
+ "id":"3c62713c.75fd9e",
"type":"other",
"name":"outcome 1",
"xml":"<outcome value='1'>\n",
"comments":"",
"outputs":1,
- "x":1424.1720962524414,
- "y":569.0529625415802,
- "z":"4a786afb.312ac4",
+ "x":1546.6720657348633,
+ "y":620.7196247577667,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "343ba2be.ce917e"
+ "43730d98.9d5c24"
]
]
},
{
- "id":"779744db.feb39c",
+ "id":"ad911155.ba691",
"type":"set",
"name":"set tx-ar from get",
"xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n",
"comments":"",
- "x":1824.0292320251465,
- "y":569.6243867874146,
- "z":"4a786afb.312ac4",
+ "x":1946.5292015075684,
+ "y":621.2910490036011,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"343ba2be.ce917e",
+ "id":"43730d98.9d5c24",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic='true'>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1595.0290794372559,
- "y":569.6244316101074,
- "z":"4a786afb.312ac4",
+ "x":1717.5290489196777,
+ "y":621.291093826294,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "779744db.feb39c",
- "a99c0b17.0d6ea8",
- "e744f8ef.172ca8"
+ "ad911155.ba691",
+ "a06440e2.caca5",
+ "3d53634b.24490c"
]
]
},
{
- "id":"a99c0b17.0d6ea8",
+ "id":"a06440e2.caca5",
"type":"set",
"name":"set oper-status",
"xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
"comments":"",
- "x":1822.0294761657715,
- "y":637.0529508590698,
- "z":"4a786afb.312ac4",
+ "x":1944.5294456481934,
+ "y":688.7196130752563,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"ace3a58f.952468",
+ "id":"7e8f0846.a53858",
"type":"comment",
"name":"GET tunnelxconn-allotted-resource from mdsal",
"info":"",
"comments":"",
- "x":574.3148155212402,
- "y":498.7671926021576,
- "z":"4a786afb.312ac4",
+ "x":696.8147850036621,
+ "y":550.4338548183441,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"e744f8ef.172ca8",
+ "id":"3d53634b.24490c",
"type":"switchNode",
"name":"switch order-status",
"xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
"comments":"",
"outputs":1,
- "x":1832.02925491333,
- "y":602.6243848800659,
- "z":"4a786afb.312ac4",
+ "x":1954.529224395752,
+ "y":654.2910470962524,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "6bd5626e.dd743c",
- "f59cb4de.fb1958"
+ "5c815fc3.bd0b5",
+ "d3694d17.ea994"
]
]
},
{
- "id":"6bd5626e.dd743c",
+ "id":"5c815fc3.bd0b5",
"type":"outcome",
"name":"outcome PendingCreate",
"xml":"<outcome value='PendingCreate'>\n",
"comments":"",
"outputs":1,
- "x":2043.6292114257812,
- "y":563.6243848800659,
- "z":"4a786afb.312ac4",
+ "x":2166.129180908203,
+ "y":615.2910470962524,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "9ce4e0bb.186ca"
+ "bda3fa8a.d4fd18"
]
]
},
{
- "id":"f59cb4de.fb1958",
+ "id":"d3694d17.ea994",
"type":"outcome",
"name":"outcome Other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":2069.3435859680176,
- "y":599.052975654602,
- "z":"4a786afb.312ac4",
+ "x":2191.8435554504395,
+ "y":650.7196378707886,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "9ce4e0bb.186ca"
+ "bda3fa8a.d4fd18"
]
]
},
{
- "id":"899fdbf4.ba87a8",
+ "id":"f64004fd.6126d8",
"type":"comment",
"name":"Set allotted-resource-identifiers",
"info":"",
"comments":"",
- "x":529.8386383056641,
- "y":589.3386459350586,
- "z":"4a786afb.312ac4",
+ "x":652.3386077880859,
+ "y":641.0053081512451,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"d20db31.4b44d5",
+ "id":"9fdaaaf9.7e4e18",
"type":"set",
"name":"save backup copy of mdsal-ar for rollback",
"xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n",
"comments":"",
- "x":1312.8864250183105,
- "y":534.7672936916351,
- "z":"4a786afb.312ac4",
+ "x":1435.3863945007324,
+ "y":586.4339559078217,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"66a8da44.6d23a4",
+ "id":"7dd5966e.d350a8",
"type":"comment",
"name":"Create urls for restapi",
"info":"",
"comments":"",
- "x":485.4576606750488,
- "y":403.6243562698364,
- "z":"4a786afb.312ac4",
+ "x":607.9576301574707,
+ "y":455.29101848602295,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"33071dcd.5083e2",
+ "id":"24baad99.05ac02",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":963.7433853149414,
- "y":876.481632232666,
- "z":"4a786afb.312ac4",
+ "x":1086.2433547973633,
+ "y":928.1482944488525,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -502,28 +511,28 @@
]
},
{
- "id":"79d0ecaa.1db8b4",
+ "id":"8d8b45bf.b1aca8",
"type":"comment",
"name":"TO DO: vnf/put parent",
"info":"",
"comments":"",
- "x":497.7433776855469,
- "y":810.4815540313718,
- "z":"4a786afb.312ac4",
+ "x":620.2433471679688,
+ "y":862.1482162475584,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"21a50431.15138c",
+ "id":"ba77d55a.14d7b8",
"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":471.74338150024414,
- "y":706.4815549850464,
- "z":"4a786afb.312ac4",
+ "x":594.243350982666,
+ "y":758.1482172012329,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -531,32 +540,32 @@
]
},
{
- "id":"8b2321c4.4a2dd",
+ "id":"58aa3152.ce73e",
"type":"other",
"name":"other",
"xml":"<outcome value='Other'>\n",
"comments":"",
"outputs":1,
- "x":806.0766868591309,
- "y":570.4814250469208,
- "z":"4a786afb.312ac4",
+ "x":928.5766563415527,
+ "y":622.1480872631073,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "626d5dea.144114"
+ "d1a0b9e4.751918"
]
]
},
{
- "id":"626d5dea.144114",
+ "id":"d1a0b9e4.751918",
"type":"block",
"name":"block: atomic",
"xml":"<block atomic=\"true\">\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":986.0766372680664,
- "y":571.1479756832123,
- "z":"4a786afb.312ac4",
+ "x":1108.5766067504883,
+ "y":622.8146378993988,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -564,29 +573,29 @@
]
},
{
- "id":"a51f265e.f89ce8",
+ "id":"4aacb3a2.ee73cc",
"type":"set",
"name":"set id",
"xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />",
"comments":"",
- "x":454.74342346191406,
- "y":626.1481666564941,
- "z":"4a786afb.312ac4",
+ "x":577.2433929443359,
+ "y":677.8148288726807,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"9ce4e0bb.186ca",
+ "id":"bda3fa8a.d4fd18",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":2258.0997276306152,
- "y":565.0000190734863,
- "z":"4a786afb.312ac4",
+ "x":2380.599697113037,
+ "y":616.6666812896729,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -594,95 +603,95 @@
]
},
{
- "id":"81851f96.4bd83",
+ "id":"6c7d53f3.fcddcc",
"type":"execute",
- "name":"execute RestApiCallNode - setup vG vxlan tunnel port",
+ "name":"execute RestApiCallNode - setup vgMUX-vG 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":588.3330688476562,
- "y":1214.451904296875,
- "z":"4a786afb.312ac4",
+ "x":726.8331298828125,
+ "y":1378.1186933517456,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "51118cd5.ce58d4",
- "98768673.92b068",
- "813a7874.8439f8"
+ "50e484ba.b86eec",
+ "5ed00d06.0d5ea4",
+ "83b3850c.d649c8"
]
]
},
{
- "id":"51118cd5.ce58d4",
+ "id":"50e484ba.b86eec",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":930.6411418914795,
- "y":1252.7834300026298,
- "z":"4a786afb.312ac4",
+ "x":1091.1412506103516,
+ "y":1420.4503320679069,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "896732c2.335fd"
+ "e150607d.ca938"
]
]
},
{
- "id":"98768673.92b068",
+ "id":"5ed00d06.0d5ea4",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":921.641191482544,
- "y":1221.2834557518363,
- "z":"4a786afb.312ac4",
+ "x":1082.141300201416,
+ "y":1388.9503578171134,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "896732c2.335fd"
+ "e150607d.ca938"
]
]
},
{
- "id":"813a7874.8439f8",
+ "id":"83b3850c.d649c8",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":925.3912296295166,
- "y":1191.6405606269836,
- "z":"4a786afb.312ac4",
+ "x":1085.8913383483887,
+ "y":1359.3074626922607,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "85bfd8ec.a6d9d8"
+ "3b236fc1.ae6cc"
]
]
},
{
- "id":"896732c2.335fd",
+ "id":"e150607d.ca938",
"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 updating md-sal for tunnelxconn-allotted-resource\" />\n",
"comments":"",
- "x":1091.3912296295166,
- "y":1222.0334795936942,
- "z":"4a786afb.312ac4",
+ "x":1251.8913383483887,
+ "y":1389.7003816589713,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"85bfd8ec.a6d9d8",
+ "id":"3b236fc1.ae6cc",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1067.047197341919,
- "y":1187.8327298164368,
- "z":"4a786afb.312ac4",
+ "x":1227.547306060791,
+ "y":1355.4996318817139,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -690,28 +699,28 @@
]
},
{
- "id":"e2f23076.04596",
+ "id":"3ddd0b30.9a33e4",
"type":"set",
- "name":"set vgMUX VXLAN Tunnel Port vG Props",
- "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` \" />",
+ "name":"set vgMUX-vG VXLAN Tunnel Port Props",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vG-name` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` \" />",
"comments":"",
- "x":553.444221496582,
- "y":1084.4521808624268,
- "z":"4a786afb.312ac4",
+ "x":671.9443054199219,
+ "y":1222.1191806793213,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"742c0c13.6fb084",
+ "id":"9e5a94b9.112208",
"type":"execute",
- "name":"generate full vgMUX vpp-honeycomb url",
+ "name":"generate full vgMUX-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":547.4442138671875,
- "y":1141.1186981201172,
- "z":"4a786afb.312ac4",
+ "x":675.9443054199219,
+ "y":1288.785394668579,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -719,15 +728,15 @@
]
},
{
- "id":"5c0e33aa.afc40c",
+ "id":"f2d67a4f.b5fbd8",
"type":"execute",
"name":"generate honeycomb-url to vgMUX",
"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=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`\"/>\n",
"comments":"",
"outputs":1,
- "x":534.7775421142578,
- "y":1032.7852993011475,
- "z":"4a786afb.312ac4",
+ "x":655.2776031494141,
+ "y":1160.4521827697754,
+ "z":"1213c43c.2b234c",
"wires":[
[
@@ -735,99 +744,414 @@
]
},
{
- "id":"e1d29d16.5b99d",
+ "id":"5ed77e12.ca895",
"type":"execute",
- "name":"execute RestApiCallNode - setup vG vxlan tunnel xconnect",
+ "name":"execute RestApiCallNode - setup vgMUX-vBRG vxlan tunnel xconnect",
"xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.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":604,
- "y":1332,
- "z":"4a786afb.312ac4",
+ "x":742.5000610351562,
+ "y":1795.6668500900269,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "6bd302d3.f65bbc",
- "eaa38ec5.5a68b",
- "144162f6.ac5d4d"
+ "b5e29f6d.056ee",
+ "86688c55.1f6a6",
+ "a86c1446.f356e8"
]
]
},
{
- "id":"6bd302d3.f65bbc",
+ "id":"b5e29f6d.056ee",
"type":"not-found",
"name":"not-found",
"xml":"<outcome value='not-found'>\n",
"comments":"",
"outputs":1,
- "x":934.3080806732178,
- "y":1370.331535242498,
- "z":"4a786afb.312ac4",
+ "x":1072.808141708374,
+ "y":1833.9983853325248,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "fdbbce24.3b93"
+ "9b462d6d.1ea05"
]
]
},
{
- "id":"eaa38ec5.5a68b",
+ "id":"86688c55.1f6a6",
"type":"failure",
"name":"failure",
"xml":"<outcome value='failure'>\n",
"comments":"",
"outputs":1,
- "x":925.3081302642822,
- "y":1338.8315609917045,
- "z":"4a786afb.312ac4",
+ "x":1063.8081912994385,
+ "y":1802.4984110817313,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "fdbbce24.3b93"
+ "9b462d6d.1ea05"
]
]
},
{
- "id":"144162f6.ac5d4d",
+ "id":"a86c1446.f356e8",
"type":"success",
"name":"success",
"xml":"<outcome value='success'>\n",
"comments":"",
"outputs":1,
- "x":929.0581684112549,
- "y":1309.1886658668518,
- "z":"4a786afb.312ac4",
+ "x":1067.5582294464111,
+ "y":1772.8555159568787,
+ "z":"1213c43c.2b234c",
"wires":[
[
- "b6787459.fbc298"
+ "6632191e.74a508"
]
]
},
{
- "id":"fdbbce24.3b93",
+ "id":"9b462d6d.1ea05",
"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 updating md-sal for tunnelxconn-allotted-resource\" />\n",
"comments":"",
- "x":1095.0581684112549,
- "y":1339.5815848335624,
- "z":"4a786afb.312ac4",
+ "x":1233.5582294464111,
+ "y":1803.2484349235892,
+ "z":"1213c43c.2b234c",
"wires":[
]
},
{
- "id":"b6787459.fbc298",
+ "id":"6632191e.74a508",
"type":"block",
"name":"block",
"xml":"<block>\n",
"atomic":"false",
"comments":"",
"outputs":1,
- "x":1070.7141361236572,
- "y":1305.380835056305,
- "z":"4a786afb.312ac4",
+ "x":1209.2141971588135,
+ "y":1769.0476851463318,
+ "z":"1213c43c.2b234c",
"wires":[
[
]
]
+ },
+ {
+ "id":"58a8145.b4b65ec",
+ "type":"set",
+ "name":"set vgMUX to vG and vgMUX to vBRG VXLAN Tunnel Name",
+ "xml":"<set>\n<parameter name='tmp.tunnel-vgMUX-vG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vgMUX-vBRG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` \" />\n",
+ "comments":"",
+ "x":734.0000762939453,
+ "y":1066.0000352859497,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"5dffc587.4020dc",
+ "type":"set",
+ "name":"set vgMUX-vBRG VXLAN Tunnel Port Props",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vBRG-name` \" />\n<parameter name='tmp.tunnel-dest-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` \" />\n<parameter name='tmp.tunnel-src-ip' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip` \" />\n<parameter name='tmp.tunnel-vni' value=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` \" />",
+ "comments":"",
+ "x":674.0000610351562,
+ "y":1476.0000438690186,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"b5d6eac2.9b2138",
+ "type":"execute",
+ "name":"execute RestApiCallNode - setup vgMUX-vBRG 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":726.0000305175781,
+ "y":1636.0000467300415,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "8dcf7f73.7a233",
+ "e17a27f6.d0d318",
+ "5d9263e8.e7d86c"
+ ]
+ ]
+ },
+ {
+ "id":"8dcf7f73.7a233",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1092.308120727539,
+ "y":1618.3316387161613,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "e1ae12b9.d71f6"
+ ]
+ ]
+ },
+ {
+ "id":"e17a27f6.d0d318",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1083.3081703186035,
+ "y":1586.8316644653678,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "e1ae12b9.d71f6"
+ ]
+ ]
+ },
+ {
+ "id":"5d9263e8.e7d86c",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1087.0582084655762,
+ "y":1557.1887693405151,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "a5fdf540.7d0928"
+ ]
+ ]
+ },
+ {
+ "id":"e1ae12b9.d71f6",
+ "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":1253.0582084655762,
+ "y":1587.5816883072257,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"a5fdf540.7d0928",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1228.7141761779785,
+ "y":1553.3809385299683,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"be1a85fd.d9b228",
+ "type":"execute",
+ "name":"generate full vgMUX-vBRG 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":678,
+ "y":1528,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"8ddeb7ba.6380c8",
+ "type":"set",
+ "name":"set vgMUX-vBG xconnect url",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vG-name` \" />",
+ "comments":"",
+ "x":612.0000190734863,
+ "y":1864.0000562667847,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d69c7a00.1f6db8",
+ "type":"execute",
+ "name":"generate full vgMUX-vG xconnect 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":639.9999694824219,
+ "y":1926.0000591278076,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"5964855c.5ef3ac",
+ "type":"set",
+ "name":"set xconnect Tunnel target",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vBRG-name` \" />\n",
+ "comments":"",
+ "x":608.0000152587891,
+ "y":1994.0000610351562,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"b3164bc6.a02478",
+ "type":"set",
+ "name":"set xconnect Tunnel target",
+ "xml":"<set>\n<parameter name='tmp.tunnel-name' value=\"`$tmp.tunnel-vgMUX-vG-name` \" />\n",
+ "comments":"",
+ "x":600.0000686645508,
+ "y":1700.0000467300415,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"aac1998d.738588",
+ "type":"execute",
+ "name":"execute RestApiCallNode - setup vgMUX-vG vxlan tunnel xconnect",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.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":736.0000305175781,
+ "y":2082.000062942505,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "fffe79dd.0a7a98",
+ "715907d9.f67948",
+ "185c9679.0223ea"
+ ]
+ ]
+ },
+ {
+ "id":"fffe79dd.0a7a98",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1066.308111190796,
+ "y":2120.331598185003,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "e4ec6e86.1b29a"
+ ]
+ ]
+ },
+ {
+ "id":"715907d9.f67948",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1057.3081607818604,
+ "y":2088.8316239342093,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "e4ec6e86.1b29a"
+ ]
+ ]
+ },
+ {
+ "id":"185c9679.0223ea",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1061.058198928833,
+ "y":2059.1887288093567,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+ "5daaf322.24f75c"
+ ]
+ ]
+ },
+ {
+ "id":"e4ec6e86.1b29a",
+ "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":1225.0582695007324,
+ "y":2089.58176612854,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"5daaf322.24f75c",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1202.7141666412354,
+ "y":2055.38089799881,
+ "z":"1213c43c.2b234c",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"595457bf.28e8c8",
+ "type":"comment",
+ "name":"TO DO: get brg-wan-ip from dmaap",
+ "info":"",
+ "comments":"",
+ "x":655.0000228881836,
+ "y":1010.0000448226929,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"765cd931.933bf8",
+ "type":"comment",
+ "name":"TO DO: get onap-oam ip - workaround over write vgmux-bearer with onap-oam ip",
+ "info":"",
+ "comments":"",
+ "x":796.0000305175781,
+ "y":1116.000036239624,
+ "z":"1213c43c.2b234c",
+ "wires":[
+
+ ]
}
] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json
index 7b867f8b..ddb5e8c9 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.json
@@ -1 +1,1101 @@
-[{"id":"73e15983.54aaa","type":"dgstart","name":"DGSTART","outputs":1,"x":134,"y":114,"z":"83d5bebc.b2e04","wires":[["d289c8b5.38246"]]},{"id":"d289c8b5.38246","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":230.23807907104492,"y":174.95239067077637,"z":"83d5bebc.b2e04","wires":[["1e31bf7c.bf4681"]]},{"id":"1e31bf7c.bf4681","type":"method","name":"tunnelxconn-topology-operation-delete","xml":"<method rpc='tunnelxconn-topology-operation-delete' mode='sync'>\n","comments":"","outputs":1,"x":276.15485763549805,"y":210.19044589996338,"z":"83d5bebc.b2e04","wires":[["88507a82.3be6b"]]},{"id":"88507a82.3be6b","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":184.47619247436523,"y":353.5237879753113,"z":"83d5bebc.b2e04","wires":[["708c9cdf.38800c","38980918.60101e","940119d2.97d148","e2436206.64fe28","aed70f88.b64e","4926e886.d118d8","d8423ad3.959b9","1cda58ea.ace997","a1df0643.52ee18","c5f2e7f7.67fa4","481ae8b1.0c6d8","abfc59fc.fb60e"]]},{"id":"38980918.60101e","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":451.0001106262207,"y":1023.2145080566406,"z":"83d5bebc.b2e04","wires":[]},{"id":"708c9cdf.38800c","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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n","comments":"","x":479.75402450561523,"y":987.3370542526245,"z":"83d5bebc.b2e04","wires":[]},{"id":"a1df0643.52ee18","type":"set","name":"set allotted-resource-oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n","comments":"","x":490.7542190551758,"y":734.0514001846313,"z":"83d5bebc.b2e04","wires":[]},{"id":"e2436206.64fe28","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":446.73806381225586,"y":327.33332538604736,"z":"83d5bebc.b2e04","wires":[]},{"id":"940119d2.97d148","type":"set","name":"set tmp.ar.allotted-resource-id,etc","xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n","comments":"","x":493.9973258972168,"y":293.59259128570557,"z":"83d5bebc.b2e04","wires":[]},{"id":"aed70f88.b64e","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":452.9934196472168,"y":363.23152446746826,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"d8423ad3.959b9","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":515.5187530517578,"y":524.4594917297363,"z":"83d5bebc.b2e04","wires":[["f4db9cab.d2556","d2ef8432.b57"]]},{"id":"4926e886.d118d8","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.tx-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":481.0648536682129,"y":423.0172290802002,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"f4db9cab.d2556","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":772.8148918151855,"y":523.2672522068024,"z":"83d5bebc.b2e04","wires":[["3354ddf4.08c79a"]]},{"id":"ece1582d.455d9","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":793.837329864502,"y":930.432332418859,"z":"83d5bebc.b2e04","wires":[["cf83304d.d0ebb8"]]},{"id":"83c14202.0049f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":784.8373794555664,"y":898.9323581680655,"z":"83d5bebc.b2e04","wires":[["cf83304d.d0ebb8"]]},{"id":"9bc349d7.413588","type":"success","name":"success","xml":"<outcome value='success'>\n","comments":"","outputs":1,"x":788.5874176025391,"y":869.2894630432129,"z":"83d5bebc.b2e04","wires":[["6b98a797.ae324"]]},{"id":"cf83304d.d0ebb8","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":954.5874176025391,"y":899.6823820099235,"z":"83d5bebc.b2e04","wires":[]},{"id":"3354ddf4.08c79a","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":953.8148460388184,"y":523.7672016620636,"z":"83d5bebc.b2e04","wires":[["2b27c4d4.997524","ab03d1d0.e9037"]]},{"id":"2b27c4d4.997524","type":"switchNode","name":"switch tx length","xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n","comments":"","outputs":1,"x":1199.6720924377441,"y":558.052964925766,"z":"83d5bebc.b2e04","wires":[["930a4219.057d78"]]},{"id":"930a4219.057d78","type":"other","name":"outcome 1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":1390.6720962524414,"y":558.0529625415802,"z":"83d5bebc.b2e04","wires":[["4cf6e1d2.effed"]]},{"id":"f1ca49e7.6e5fc","type":"set","name":"set tx-ar from get","xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n","comments":"","x":1790.5292320251465,"y":558.6243867874146,"z":"83d5bebc.b2e04","wires":[]},{"id":"4cf6e1d2.effed","type":"block","name":"block: atomic","xml":"<block atomic='true'>\n","atomic":"false","comments":"","outputs":1,"x":1561.5290794372559,"y":558.6244316101074,"z":"83d5bebc.b2e04","wires":[["f1ca49e7.6e5fc","485e3856.60d4a8","222bb1e9.0427b6"]]},{"id":"485e3856.60d4a8","type":"set","name":"set oper-status","xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n","comments":"","x":1788.5294761657715,"y":626.0529508590698,"z":"83d5bebc.b2e04","wires":[]},{"id":"1b34868.09b18fa","type":"comment","name":"GET tunnelxconn-allotted-resource from mdsal","info":"","comments":"","x":540.8148155212402,"y":487.7671926021576,"z":"83d5bebc.b2e04","wires":[]},{"id":"222bb1e9.0427b6","type":"switchNode","name":"switch order-status","xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n","comments":"","outputs":1,"x":1798.52925491333,"y":591.6243848800659,"z":"83d5bebc.b2e04","wires":[["d4024b9b.b96b68","5352c45c.7c8d2c"]]},{"id":"d4024b9b.b96b68","type":"outcome","name":"outcome Created","xml":"<outcome value='Created'>\n","comments":"","outputs":1,"x":2010.1292114257812,"y":552.6243848800659,"z":"83d5bebc.b2e04","wires":[["43e0fc0.7e21584"]]},{"id":"5352c45c.7c8d2c","type":"outcome","name":"outcome Other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":2035.8435859680176,"y":588.052975654602,"z":"83d5bebc.b2e04","wires":[["43e0fc0.7e21584"]]},{"id":"51ffa743.27a62","type":"comment","name":"Set allotted-resource-identifiers","info":"","comments":"","x":496.33863830566406,"y":578.3386459350586,"z":"83d5bebc.b2e04","wires":[]},{"id":"ab03d1d0.e9037","type":"set","name":"save backup copy of mdsal-ar for rollback","xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n","comments":"","x":1279.3864250183105,"y":523.7672936916351,"z":"83d5bebc.b2e04","wires":[]},{"id":"903a3cb1.1c223","type":"comment","name":"Create urls for restapi","info":"","comments":"","x":451.9576606750488,"y":392.6243562698364,"z":"83d5bebc.b2e04","wires":[]},{"id":"6b98a797.ae324","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":930.2433853149414,"y":865.481632232666,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"32ab8eae.09664a","type":"comment","name":"TO DO: vnf/put parent","info":"","comments":"","x":464.2433776855469,"y":799.4815540313718,"z":"83d5bebc.b2e04","wires":[]},{"id":"1cda58ea.ace997","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":438.24338150024414,"y":695.4815549850464,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"d2ef8432.b57","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":772.5766868591309,"y":559.4814250469208,"z":"83d5bebc.b2e04","wires":[["2c450f2e.03316"]]},{"id":"2c450f2e.03316","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":952.5766372680664,"y":560.1479756832123,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"c5f2e7f7.67fa4","type":"set","name":"set id","xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />","comments":"","x":421.24342346191406,"y":615.1481666564941,"z":"83d5bebc.b2e04","wires":[]},{"id":"43e0fc0.7e21584","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":2224.5997276306152,"y":554.0000190734863,"z":"83d5bebc.b2e04","wires":[[]]},{"id":"481ae8b1.0c6d8","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.tx.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":521.0000152587891,"y":880.0000247955322,"z":"83d5bebc.b2e04","wires":[["9bc349d7.413588","83c14202.0049f8","ece1582d.455d9"]]},{"id":"abfc59fc.fb60e","type":"set","name":"clear tx-ar-assignments","xml":"<set>\n<parameter name='tx-ar-assignments.' value=\"\" />\n\n\n\n","comments":"","x":465,"y":766,"z":"83d5bebc.b2e04","wires":[]}]
+[
+ {
+ "id":"ea73139e.aa0d8",
+ "type":"dgstart",
+ "name":"DGSTART",
+ "outputs":1,
+ "x":169.99998474121094,
+ "y":139.99998474121094,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "a9eba997.befca8"
+ ]
+ ]
+ },
+ {
+ "id":"a9eba997.befca8",
+ "type":"service-logic",
+ "name":"GENERIC-RESOURCE-API ${project.version}",
+ "module":"GENERIC-RESOURCE-API",
+ "version":"${project.version}",
+ "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":266.23806381225586,
+ "y":200.9523754119873,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "b47043f8.57df9"
+ ]
+ ]
+ },
+ {
+ "id":"b47043f8.57df9",
+ "type":"method",
+ "name":"tunnelxconn-topology-operation-delete",
+ "xml":"<method rpc='tunnelxconn-topology-operation-delete' mode='sync'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":312.154842376709,
+ "y":236.19043064117432,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "40b778a9.840de8"
+ ]
+ ]
+ },
+ {
+ "id":"40b778a9.840de8",
+ "type":"block",
+ "name":"block : atomic",
+ "xml":"<block atomic=\"true\">",
+ "atomic":"true",
+ "comments":"",
+ "outputs":1,
+ "x":220.47617721557617,
+ "y":379.5237727165222,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "600ff80a.8e8918",
+ "a0e819d7.762748",
+ "8c7ac12e.10e65",
+ "2818a1dd.dc391e",
+ "40e08035.d84a1",
+ "47849254.832adc",
+ "4fad0ac6.b44224",
+ "5f3b0feb.4717",
+ "157cd0d2.981cff",
+ "34221afc.d56f56",
+ "5bd0792d.9a7738",
+ "88f9c974.152668",
+ "aced1738.f21668",
+ "9bfc16d5.7453a8",
+ "7935a8ba.39dbf8",
+ "106179bd.fb0526",
+ "3cf8239f.21b10c",
+ "6a325db2.8fa5c4",
+ "e4d50255.70c72",
+ "e6105de7.7a399",
+ "d18a9318.5f525"
+ ]
+ ]
+ },
+ {
+ "id":"a0e819d7.762748",
+ "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":474.0001449584961,
+ "y":1813.5478219985962,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"600ff80a.8e8918",
+ "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 + $tunnelxconn-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
+ "comments":"",
+ "x":502.7540588378906,
+ "y":1777.67036819458,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"157cd0d2.981cff",
+ "type":"set",
+ "name":"set allotted-resource-oper-status",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
+ "comments":"",
+ "x":526.7542037963867,
+ "y":760.0513849258423,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"2818a1dd.dc391e",
+ "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":482.7380485534668,
+ "y":353.3333101272583,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"8c7ac12e.10e65",
+ "type":"set",
+ "name":"set tmp.ar.allotted-resource-id,etc",
+ "xml":"<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />\n\n\n",
+ "comments":"",
+ "x":529.9973106384277,
+ "y":319.5925760269165,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"40e08035.d84a1",
+ "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":488.99340438842773,
+ "y":389.2315092086792,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"4fad0ac6.b44224",
+ "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":551.5187377929688,
+ "y":550.4594764709473,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "c606076d.0a5aa8",
+ "73ac4eb1.d24c9"
+ ]
+ ]
+ },
+ {
+ "id":"47849254.832adc",
+ "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.tx-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":517.0648384094238,
+ "y":449.01721382141113,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"c606076d.0a5aa8",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":808.8148765563965,
+ "y":549.2672369480133,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "c40b39d8.bef118"
+ ]
+ ]
+ },
+ {
+ "id":"85caba1e.01c008",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":829.8373146057129,
+ "y":956.4323171600699,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "a57c0f9c.f0931"
+ ]
+ ]
+ },
+ {
+ "id":"f372539f.904d8",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":820.8373641967773,
+ "y":924.9323429092765,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "a57c0f9c.f0931"
+ ]
+ ]
+ },
+ {
+ "id":"5e15025b.c0d5dc",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":824.58740234375,
+ "y":895.2894477844238,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "1b40917a.94ce1f"
+ ]
+ ]
+ },
+ {
+ "id":"a57c0f9c.f0931",
+ "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":990.58740234375,
+ "y":925.6823667511344,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"c40b39d8.bef118",
+ "type":"block",
+ "name":"block: atomic",
+ "xml":"<block atomic=\"true\">\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":989.8148307800293,
+ "y":549.7671864032745,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "932cdb22.8bb3d8",
+ "c0595193.968e7"
+ ]
+ ]
+ },
+ {
+ "id":"932cdb22.8bb3d8",
+ "type":"switchNode",
+ "name":"switch tx length",
+ "xml":"<switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1235.672077178955,
+ "y":584.0529496669769,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "71ef54d.59862ac"
+ ]
+ ]
+ },
+ {
+ "id":"71ef54d.59862ac",
+ "type":"other",
+ "name":"outcome 1",
+ "xml":"<outcome value='1'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1426.6720809936523,
+ "y":584.0529472827911,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "9f15e051.0c87e"
+ ]
+ ]
+ },
+ {
+ "id":"ae393778.e6a318",
+ "type":"set",
+ "name":"set tx-ar from get",
+ "xml":"<set>\n<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />\n",
+ "comments":"",
+ "x":1826.5292167663574,
+ "y":584.6243715286255,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"9f15e051.0c87e",
+ "type":"block",
+ "name":"block: atomic",
+ "xml":"<block atomic='true'>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1597.5290641784668,
+ "y":584.6244163513184,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "ae393778.e6a318",
+ "1a495e95.266f41",
+ "b3aa54ab.591ac8"
+ ]
+ ]
+ },
+ {
+ "id":"1a495e95.266f41",
+ "type":"set",
+ "name":"set oper-status",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />\n\n",
+ "comments":"",
+ "x":1824.5294609069824,
+ "y":652.0529356002808,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"a8b0bc95.97326",
+ "type":"comment",
+ "name":"GET tunnelxconn-allotted-resource from mdsal",
+ "info":"",
+ "comments":"",
+ "x":576.8148002624512,
+ "y":513.7671773433685,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"b3aa54ab.591ac8",
+ "type":"switchNode",
+ "name":"switch order-status",
+ "xml":"<switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1834.529239654541,
+ "y":617.6243696212769,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "2210dcb8.30fd74",
+ "ac6b248b.9ba698"
+ ]
+ ]
+ },
+ {
+ "id":"2210dcb8.30fd74",
+ "type":"outcome",
+ "name":"outcome Created",
+ "xml":"<outcome value='Created'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2046.1291961669922,
+ "y":578.6243696212769,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "2245c8d2.97a6a8"
+ ]
+ ]
+ },
+ {
+ "id":"ac6b248b.9ba698",
+ "type":"outcome",
+ "name":"outcome Other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":2071.8435707092285,
+ "y":614.052960395813,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "2245c8d2.97a6a8"
+ ]
+ ]
+ },
+ {
+ "id":"b5a69050.e528d",
+ "type":"comment",
+ "name":"Set allotted-resource-identifiers",
+ "info":"",
+ "comments":"",
+ "x":532.338623046875,
+ "y":604.3386306762695,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"c0595193.968e7",
+ "type":"set",
+ "name":"save backup copy of mdsal-ar for rollback",
+ "xml":"<set>\n<parameter name='bk-tx-ar' value='$mdsal-ar.' />\n",
+ "comments":"",
+ "x":1315.3864097595215,
+ "y":549.7672784328461,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"95c7c8f7.2ba9f8",
+ "type":"comment",
+ "name":"Create urls for restapi",
+ "info":"",
+ "comments":"",
+ "x":487.95764541625977,
+ "y":418.62434101104736,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"1b40917a.94ce1f",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":966.2433700561523,
+ "y":891.481616973877,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"11fbb95a.26adc7",
+ "type":"comment",
+ "name":"TO DO: vnf/put parent",
+ "info":"",
+ "comments":"",
+ "x":500.2433624267578,
+ "y":825.4815387725828,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"5f3b0feb.4717",
+ "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":474.2433662414551,
+ "y":721.4815397262573,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"73ac4eb1.d24c9",
+ "type":"other",
+ "name":"other",
+ "xml":"<outcome value='Other'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":808.5766716003418,
+ "y":585.4814097881317,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "251543e7.8a7e7c"
+ ]
+ ]
+ },
+ {
+ "id":"251543e7.8a7e7c",
+ "type":"block",
+ "name":"block: atomic",
+ "xml":"<block atomic=\"true\">\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":988.5766220092773,
+ "y":586.1479604244232,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"34221afc.d56f56",
+ "type":"set",
+ "name":"set id",
+ "xml":"<set>\n<parameter name='tx-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='tx-ar.allotted-resource-status.action' value=\"`$tunnelxconn-topology-operation-input.request-information.request-action` \" />\n<parameter name='tx-ar.allotted-resource-status.rpc-name' value=\"tunnelxconn-topology-operation\" />\n<parameter name='tx-ar.allotted-resource-status.rpc-action' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$tunnelxconn-topology-operation-input.request-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$tunnelxconn-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$tunnelxconn-topology-operation-input.service-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$tunnelxconn-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value=\"`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` \" />",
+ "comments":"",
+ "x":457.243408203125,
+ "y":641.1481513977051,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"2245c8d2.97a6a8",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":2260.599712371826,
+ "y":580.0000038146973,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"5bd0792d.9a7738",
+ "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.tx.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":557,
+ "y":906.0000095367432,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "5e15025b.c0d5dc",
+ "f372539f.904d8",
+ "85caba1e.01c008"
+ ]
+ ]
+ },
+ {
+ "id":"88f9c974.152668",
+ "type":"set",
+ "name":"clear tx-ar-assignments",
+ "xml":"<set>\n<parameter name='tx-ar-assignments.' value=\"\" />\n\n\n\n",
+ "comments":"",
+ "x":500.99998474121094,
+ "y":791.9999847412109,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d18a9318.5f525",
+ "type":"execute",
+ "name":"execute RestApiCallNode - delete vgMUX to vG 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":635.6668434143066,
+ "y":1719.9998292922974,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "4303ed2.181d014",
+ "88cc7753.8d23c8",
+ "7e6dedf7.4245a4"
+ ]
+ ]
+ },
+ {
+ "id":"4303ed2.181d014",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1204.641429901123,
+ "y":1759.9982160553336,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "9296d8d2.051ff8"
+ ]
+ ]
+ },
+ {
+ "id":"88cc7753.8d23c8",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1195.6414794921875,
+ "y":1728.4982418045402,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "9296d8d2.051ff8"
+ ]
+ ]
+ },
+ {
+ "id":"7e6dedf7.4245a4",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1199.3915176391602,
+ "y":1698.8553466796875,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "d92543a7.9c0ee"
+ ]
+ ]
+ },
+ {
+ "id":"9296d8d2.051ff8",
+ "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":1365.3915176391602,
+ "y":1729.248265646398,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"d92543a7.9c0ee",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1341.0474853515625,
+ "y":1695.0475158691406,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"7935a8ba.39dbf8",
+ "type":"execute",
+ "name":"generate full vgMUX-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-vgMUX-vG-name`\"/>\n",
+ "comments":"",
+ "outputs":1,
+ "x":563.1111030578613,
+ "y":1228.3335027694702,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"aced1738.f21668",
+ "type":"execute",
+ "name":"generate honeycomb-url to vgMUX",
+ "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=\"`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`\"/>\n",
+ "comments":"",
+ "outputs":1,
+ "x":536.7778472900391,
+ "y":1052.3334283828735,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"106179bd.fb0526",
+ "type":"execute",
+ "name":"execute RestApiCallNode - delete vG-vgMUX xconnect",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\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='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":599.6669960021973,
+ "y":1307.5482215881348,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "9817b85e.c00968",
+ "5426f591.bca7bc",
+ "7997cf81.75ec9"
+ ]
+ ]
+ },
+ {
+ "id":"9817b85e.c00968",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1208.3083686828613,
+ "y":1287.546325109899,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "4f542247.1b24dc"
+ ]
+ ]
+ },
+ {
+ "id":"5426f591.bca7bc",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1199.3084182739258,
+ "y":1256.0463508591056,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "4f542247.1b24dc"
+ ]
+ ]
+ },
+ {
+ "id":"7997cf81.75ec9",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1203.0584564208984,
+ "y":1226.403455734253,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "dddf27f3.7e4fd8"
+ ]
+ ]
+ },
+ {
+ "id":"4f542247.1b24dc",
+ "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":1369.0584564208984,
+ "y":1256.7963747009635,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"dddf27f3.7e4fd8",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1344.7144241333008,
+ "y":1222.595624923706,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"e4d50255.70c72",
+ "type":"execute",
+ "name":"execute RestApiCallNode - delete vgMUX to vBRG 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":640.6666793823242,
+ "y":1556.6667127609253,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "8d08617d.8adad",
+ "62e37b80.0165a4",
+ "d4f24bfb.487518"
+ ]
+ ]
+ },
+ {
+ "id":"8d08617d.8adad",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1207.9746589660645,
+ "y":1606.664863012731,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "fd96ad61.cd8bb"
+ ]
+ ]
+ },
+ {
+ "id":"62e37b80.0165a4",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1198.974708557129,
+ "y":1575.1648887619376,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "fd96ad61.cd8bb"
+ ]
+ ]
+ },
+ {
+ "id":"d4f24bfb.487518",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1202.7247467041016,
+ "y":1545.521993637085,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "fcd34256.847db"
+ ]
+ ]
+ },
+ {
+ "id":"fd96ad61.cd8bb",
+ "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":1368.7247467041016,
+ "y":1575.9149126037955,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"fcd34256.847db",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1344.380714416504,
+ "y":1541.714162826538,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"9bfc16d5.7453a8",
+ "type":"set",
+ "name":"set vgMUX to vG and vgMUX to vBRG VXLAN Tunnel Name",
+ "xml":"<set>\n<parameter name='tmp.tunnel-vgMUX-vG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` \" />\n<parameter name='tmp.tunnel-vgMUX-vBRG-name' value=\"`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` \" />\n",
+ "comments":"",
+ "x":617.3333129882812,
+ "y":1168.333236694336,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"6a325db2.8fa5c4",
+ "type":"execute",
+ "name":"execute RestApiCallNode - delete vBRG-vgMUX xconnect",
+ "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\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='DELETE' />\n <parameter name=\"responsePrefix\" value=\"honeycomb-vnf\" />\n\n",
+ "comments":"",
+ "outputs":1,
+ "x":610.6666641235352,
+ "y":1459.9998760223389,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "15eae1c3.0d7d3e",
+ "6321faa9.57d8c4",
+ "a8ff52e4.8de23"
+ ]
+ ]
+ },
+ {
+ "id":"a8ff52e4.8de23",
+ "type":"not-found",
+ "name":"not-found",
+ "xml":"<outcome value='not-found'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1202.3333778381348,
+ "y":1453.3332767486572,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "4de064c3.4a5bec"
+ ]
+ ]
+ },
+ {
+ "id":"6321faa9.57d8c4",
+ "type":"failure",
+ "name":"failure",
+ "xml":"<outcome value='failure'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1193.3334274291992,
+ "y":1421.8333024978638,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "4de064c3.4a5bec"
+ ]
+ ]
+ },
+ {
+ "id":"15eae1c3.0d7d3e",
+ "type":"success",
+ "name":"success",
+ "xml":"<outcome value='success'>\n",
+ "comments":"",
+ "outputs":1,
+ "x":1195.4169578552246,
+ "y":1383.857172012329,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+ "9ac5b12d.70f0f"
+ ]
+ ]
+ },
+ {
+ "id":"4de064c3.4a5bec",
+ "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":1363.0834655761719,
+ "y":1422.5833263397217,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"9ac5b12d.70f0f",
+ "type":"block",
+ "name":"block",
+ "xml":"<block>\n",
+ "atomic":"false",
+ "comments":"",
+ "outputs":1,
+ "x":1338.7394332885742,
+ "y":1388.3825765624642,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"3cf8239f.21b10c",
+ "type":"execute",
+ "name":"generate full vgMUX-vBRG 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-vgMUX-vBRG-name`\"/>\n",
+ "comments":"",
+ "outputs":1,
+ "x":574,
+ "y":1378.3332443237305,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"e6105de7.7a399",
+ "type":"execute",
+ "name":"generate full vgMUX-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-vgMUX-vG-name`\"/>\n",
+ "comments":"",
+ "outputs":1,
+ "x":565.6666488647461,
+ "y":1644.9999618530273,
+ "z":"a8ee551c.260b18",
+ "wires":[
+ [
+
+ ]
+ ]
+ },
+ {
+ "id":"8f2371ec.110dd",
+ "type":"comment",
+ "name":"TO DO: get brg-wan-ip from dmaap",
+ "info":"",
+ "comments":"",
+ "x":530.0000610351562,
+ "y":1110.0000324249268,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ },
+ {
+ "id":"81a5da98.f08d38",
+ "type":"comment",
+ "name":"TO DO: get onap-oam ip - workaround over write vgmux-bearerr with onap-oam ip",
+ "info":"",
+ "comments":"",
+ "x":668.0000152587891,
+ "y":1002.0001277923584,
+ "z":"a8ee551c.260b18",
+ "wires":[
+
+ ]
+ }
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml
index f14e72b8..724faf38 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_manage-ipaddr-assignment.xml
@@ -1,13 +1,24 @@
-<!--Reserve/release VNI--><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}'><method rpc='manage-ipaddr-assignment' mode='sync'>
-<block atomic='true'><set>
-<parameter name='tmp.sql.plugin' value='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' />
-</set><switch test='`$tmp.manageIpaddr.action`'>
-<outcome value='reserve'>
-<block atomic='true'><get-resource plugin='`$tmp.sql.plugin`' resource='VNI' key="SELECT min(ipv4_addr) ip from IPV4_ADDRESS_POOL where universe = $tmp.manageIpaddr.pool and status='AVAILABLE'" pfx="tmp.manageIpaddr" >
-<outcome value='success'>
-<save plugin='`$tmp.sql.plugin`' resource='IPADDR' key="UPDATE IPV4_ADDRESS_POOL set status='RESERVED' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip" force='false'>
-
-</save></outcome></get-resource></block></outcome><outcome value='release'>
-<save plugin='`$tmp.sql.plugin`' resource='IPADDR' key="UPDATE IPV4_ADDRESS_POOL set status='AVAILABLE' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip" force='false'>
-
-</save></outcome></switch></block></method></service-logic> \ No newline at end of file
+<!--Reserve/release IP-->
+<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}'>
+ <method rpc='manage-ipaddr-assignment' mode='sync'>
+ <block atomic='true'>
+ <set>
+ <parameter name='tmp.sql.plugin' value='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' />
+ </set>
+ <switch test='`$tmp.manageIpaddr.action`'>
+ <outcome value='reserve'>
+ <block atomic='true'>
+ <get-resource plugin='`$tmp.sql.plugin`' resource='IPADDR' key="SELECT min(ipv4_addr) ip from IPV4_ADDRESS_POOL where universe = $tmp.manageIpaddr.pool and status='AVAILABLE'" pfx="tmp.manageIpaddr" >
+ <outcome value='success'>
+ <save plugin='`$tmp.sql.plugin`' resource='IPADDR' key="UPDATE IPV4_ADDRESS_POOL set status='RESERVED' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip" force='false'></save>
+ </outcome>
+ </get-resource>
+ </block>
+ </outcome>
+ <outcome value='release'>
+ <save plugin='`$tmp.sql.plugin`' resource='IPADDR' key="UPDATE IPV4_ADDRESS_POOL set status='AVAILABLE' where universe='VGW' and ipv4_addr = $tmp.manageIpaddr.ip" force='false'></save>
+ </outcome>
+ </switch>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
index 7b6df3e3..d7ee6d01 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml
@@ -12,7 +12,7 @@
</set>
</outcome>
</switch>
- <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'service-type'`">
+ <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`">
<outcome value="true">
<set>
<parameter name="prop.l3vpn.service-type" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
@@ -477,7 +477,7 @@
</outcome>
<outcome value="l3vpn-sptn">
<execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
- <parameter name="templateFileName" value="$prop.sdncRestApi.templateDir +'/l3smsitetemplate.json'" />
+ <parameter name="templateFileName" value="$prop.restapi.templateDir +'/sptn-l3vpn-template.json'" />
<parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url" />
<parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
<parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
@@ -526,8 +526,6 @@
<parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.l3vpn.network-id`" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.l3vpn.network-id`" />
- <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-key" value="configuration.configuration-type" />
- <parameter name="relationship-list.relationship[0].relationship-data[1].relationship-value" value="underlay" />
</save>
<return status="success">
<parameter name="ack-final-indicator" value="Y" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
index c4b49c35..3eae828d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml
@@ -1,271 +1,332 @@
-<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}'><method rpc='tunnelxconn-topology-operation-assign' mode='sync'>
-<block atomic="true"><set>
-<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-
-
-</set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
-
-</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
- <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
- <parameter name='contextPrefix' value='prop' />
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>
- <parameter name="outputPath" value="tmp.ar-url"/>
- <parameter name="target" value="{allotted-resource-id}"/>
- <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
- <parameter name='restapiUser' value='`$prop.controller.user`' />
- <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
- <parameter name='format' value='json' />
- <parameter name='httpMethod' value='GET' />
- <parameter name="responsePrefix" value="mdsal-ar" />
-
-<outcome value='success'>
-<return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message"
- value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
-</return></outcome><outcome value='Other'>
-<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >
-<outcome value='success'>
-<block atomic="true">
-<set>
-<parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-<parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
-<parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
-<parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><set>
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-
-</set><set>
-<parameter name='tx-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />
-<parameter name='tx-ar-identifiers.parent-service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
-<parameter name='tx-ar-identifiers.allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-<parameter name='tx-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-
-</set><set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.'
-value="`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`" />
-
-
-</set><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
-<outcome value=''>
-<set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid'
-value="`$ar-model.invariant-uuid`" />
-
-
-</set></outcome></switch><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
-<outcome value=''>
-<set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid'
-value="`$ar-model.uuid`" />
-
-
-</set></outcome></switch><switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>
-<outcome value=''>
-<set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version'
-value="`$ar-model.version`" />
-
-
-</set></outcome></switch><switch test='`$ar-model.ecomp-generated-naming`'>
-<outcome value='Y'>
-<block atomic="true">
-<switch test='`$ar-model.naming-policy`'>
-<outcome value='oam_network_policy'>
-<block atomic='true'>
-<set>
-<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
-</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$tmp.ar-name`"/>
- <parameter name="outputPath" value="tmp.ar-name"/>
- <parameter name="target" value="$TenantOAMNetworkRole"/>
- <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
-
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$tmp.ar-name`"/>
- <parameter name="outputPath" value="tmp.ar-name"/>
- <parameter name="target" value="$LandingNetworkRole"/>
- <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
-
-</execute><set>
-<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
-</set></block></outcome><outcome value='Other'>
-<block atomic='true'>
-<set>
-<parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
-</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$tmp.ar-name`"/>
- <parameter name="outputPath" value="tmp.ar-name"/>
- <parameter name="target" value="$TenantOAMNetworkRole"/>
- <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
-
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$tmp.ar-name`"/>
- <parameter name="outputPath" value="tmp.ar-name"/>
- <parameter name="target" value="$LandingNetworkRole"/>
- <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
-
-</execute><set>
-<parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
-</set></block></outcome></switch></block></outcome><outcome value='Other'>
-<return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error in allotted-resource-model data. Ecomp-generated-naming should be true" />
-
-</return></outcome></switch><set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value="`$tx-ar-identifiers.`" />
-
-
-</set><set>
-<parameter name='tmp.vni' value='123' />
-<parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />
-<parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' /></set><switch test="`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`">
-<outcome value='true'>
-<for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >
-<switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>
-<outcome value='vgmux_private_ip_0'>
-<set>
-<parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
-
-</set></outcome><outcome value='vgmux_private_ip_2'>
-<set>
-<parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
-
-</set></outcome></switch></for></outcome></switch><set>
-<parameter name='tmp.manageVni.action' value='reserve' />
-<parameter name='tmp.manageIpaddr.action' value='reserve' />
-<parameter name='tmp.manageVni.pool' value='VNI'/>
-<parameter name='tmp.manageIpaddr.pool' value='VGW'/></set><call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' >
-</call><call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' >
-</call><set>
-<parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>
-<parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>
-<parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>
-<parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>
-
-</set><set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_0'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_2'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>
-
-</set><set>
-<parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.'
-value="`$tx-ar-assignments.`" />
-
-
-</set><switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
-<outcome value=''>
-<set>
-<parameter name='tmp.cidx' value="`0`" />
-<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
-
-
-</set></outcome><outcome value='Other'>
-<block atomic="true"><for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
-<switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
-
-<outcome value='true'>
-<block atomic="true"><set>
-<parameter name='tmp.cidx' value='`$cidx`' />
-<parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
-<parameter name='tmp.found-cidx' value='true' /></set></block></outcome></switch></for><switch test='`$tmp.found-cidx`'>
-<outcome value='false'>
-<block atomic="true"><set>
-<parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
-</set></block></outcome></switch></block></outcome></switch><set>
-<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
-<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
-<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
-
-</set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
- <parameter name="outputPath" value="tmp.current-time" />
-
-</execute><set>
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-</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-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}'>
+ <method rpc='tunnelxconn-topology-operation-assign' mode='sync'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+ <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>
+ <parameter name="outputPath" value="tmp.ar-url"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='success'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message"
+ value="`'Existing tunnelxconn-allotted-resource with order status of ' + $mdsal-ar.tunnelxconn-allotted-resource.allotted-resource-data.allotted-resource-oper-status.order-status + '.'`" />
+ </return>
+ </outcome>
+ <outcome value='Other'>
+ <get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource' resource='VNF-API' key='vnfs/vnf-list/$tmp.ar.parent-service-instance-id/service-data/' pfx='parent-service-instance' >
+ <outcome value='success'>
+ <block atomic="true">
+ <set>
+ <parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ <parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
+ <parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
+ <parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " />
+ </set>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+ </set>
+ <set>
+ <parameter name='tx-ar-identifiers.consuming-service-instance-id' value="`$tunnelxconn-topology-operation-input.service-information.service-instance-id` " />
+ <parameter name='tx-ar-identifiers.parent-service-instance-id' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ <parameter name='tx-ar-identifiers.allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+ <parameter name='tx-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ </set>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.'
+ value="`$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.`" />
+ </set>
+ <switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid'>
+ <outcome value=''>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-invariant-uuid'
+ value="`$ar-model.invariant-uuid`" />
+ </set>
+ </outcome>
+ </switch>
+ <switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid'>
+ <outcome value=''>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-uuid'
+ value="`$ar-model.uuid`" />
+ </set>
+ </outcome>
+ </switch>
+ <switch test='$tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-version'>
+ <outcome value=''>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.onap-model-information.model-version'
+ value="`$ar-model.version`" />
+ </set>
+ </outcome>
+ </switch>
+ <switch test='`$ar-model.ecomp-generated-naming`'>
+ <outcome value='Y'>
+ <block atomic="true">
+ <switch test='`$ar-model.naming-policy`'>
+ <outcome value='oam_network_policy'>
+ <block atomic='true'>
+ <set>
+ <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$tmp.ar-name`"/>
+ <parameter name="outputPath" value="tmp.ar-name"/>
+ <parameter name="target" value="$TenantOAMNetworkRole"/>
+ <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$tmp.ar-name`"/>
+ <parameter name="outputPath" value="tmp.ar-name"/>
+ <parameter name="target" value="$LandingNetworkRole"/>
+ <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
+ </execute>
+ <set>
+ <parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
+ </set>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic='true'>
+ <set>
+ <parameter name='tmp.ar-name' value='$TenantOAMNetworkRole_$LandingNetworkRole_SZ' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$tmp.ar-name`"/>
+ <parameter name="outputPath" value="tmp.ar-name"/>
+ <parameter name="target" value="$TenantOAMNetworkRole"/>
+ <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.untrusted-network-role`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$tmp.ar-name`"/>
+ <parameter name="outputPath" value="tmp.ar-name"/>
+ <parameter name="target" value="$LandingNetworkRole"/>
+ <parameter name="replacement" value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.trusted-network-role`"/>
+ </execute>
+ <set>
+ <parameter name='tx-ar-identifiers.allotted-resource-name' value='`$tmp.ar-name`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error in allotted-resource-model data. Ecomp-generated-naming should be true" />
+ </return>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.allotted-resource-identifiers.' value="`$tx-ar-identifiers.`" />
+ </set>
+ <set>
+ <parameter name='tmp.vni' value='123' />
+ <parameter name='tmp.vgmux-bearer-ip' value='127.0.0.1' />
+ <parameter name='tmp.vgmux-lan-ip' value='127.0.0.1' />
+ </set>
+ <switch test="`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length != ''`">
+ <outcome value='true'>
+ <for index='curidx' start='0' end='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters_length`' >
+ <switch test='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-name`'>
+ <outcome value='vgmux_private_ip_0'>
+ <set>
+ <parameter name='tmp.vgmux-lan-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
+ </set>
+ </outcome>
+ <outcome value='vgmux_private_ip_2'>
+ <set>
+ <parameter name='tmp.vgmux-bearer-ip' value='`$parent-service-instance.service-data.vnf-topology-information.vnf-parameters[$curidx].vnf-parameter-value`'/>
+ </set>
+ </outcome>
+ </switch>
+ </for>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='tmp.manageVni.action' value='reserve' />
+ <parameter name='tmp.manageIpaddr.action' value='reserve' />
+ <parameter name='tmp.manageVni.pool' value='VNI'/>
+ <parameter name='tmp.manageIpaddr.pool' value='VGW'/>
+ </set>
+ <call module='GENERIC-RESOURCE-API' rpc='manage-vni-assignment' mode='sync' ></call>
+ <call module='GENERIC-RESOURCE-API' rpc='manage-ipaddr-assignment' mode='sync' ></call>
+ <set>
+ <parameter name='tx-ar-assignments.vni' value='`$tmp.manageVni.vni`'/>
+ <parameter name='tx-ar-assignments.vgmux-bearer-ip' value='`$tmp.vgmux-bearer-ip`'/>
+ <parameter name='tx-ar-assignments.vgmux-lan-ip' value='`$tmp.vgmux-lan-ip`'/>
+ <parameter name='tx-ar-assignments.vg-ip' value='`$tmp.manageIpaddr.ip`'/>
+ </set>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].name' value='VNI'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[0].value' value='`$tmp.manageVni.vni`'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].name' value='vgmux_private_ip_2'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[1].value' value='`$tmp.vgmux-bearer-ip`'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].name' value='vgmux_private_ip_0'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[2].value' value='`$tmp.vgmux-lan-ip`'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].name' value='vgw_private_ip_0'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters.param[3].value' value='`$tmp.manageIpaddr.ip`'/>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-parameters_length' value='4'/>
+ </set>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.'
+ value="`$tx-ar-assignments.`" />
+ </set>
+ <switch test='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`'>
+ <outcome value=''>
+ <set>
+ <parameter name='tmp.cidx' value="`0`" />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value="1" />
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true">
+ <for index='cidx' start='0' end='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' >
+ <switch test="`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].allotted-resource-id == $tmp.ar.allotted-resource-id`">
+ <outcome value='true'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.cidx' value='`$cidx`' />
+ <parameter name='ctx.consumed-ar.' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource[$cidx].`' />
+ <parameter name='tmp.found-cidx' value='true' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </for>
+ <switch test='`$tmp.found-cidx`'>
+ <outcome value='false'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.cidx' value='`$service-data.consumed-allotted-resources.consumed-allotted-resource_length`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value="`$tmp.ar.self-link` " />
+ <parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+ <parameter name="outputPath" value="tmp.current-time" />
+ </execute>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingCreate' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+ </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"
- 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`" />
- <parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />
- <parameter name="model-version-id" value="`$ar-model.uuid`" />
- <parameter name="operational-status" value="null" />
-<outcome value='failure'>
-<return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="AAI failed" />
-</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="AAI failed" />
-</return></outcome></update><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />
- <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
- <parameter name='restapiUser' value='`$prop.controller.user`' />
- <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
- <parameter name='format' value='json' />
- <parameter name='httpMethod' value='PUT' />
- <parameter name="responsePrefix" value="mdsal-ar" />
-
-<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 updating md-sal for tunnelxconn-allotted-resource" />
-</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 tunnelxconn-allotted-resource" />
-</return></outcome></execute><set>
-<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
-<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $tunnelxconn-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-
-</set><return status='success'>
-<parameter name="ack-final-indicator" value="Y" />
-<parameter name="error-code" value="200" />
-<parameter name="error-message" value="`$error-message`" />
-</return></block></outcome><outcome value='Other'>
-<return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message"
- value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
-</return></outcome></get-resource></outcome></execute></block></method></service-logic> \ No newline at end of file
+ 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`" />
+ <parameter name="model-invariant-id" value="`$ar-model.invariant-uuid`" />
+ <parameter name="model-version-id" value="`$ar-model.uuid`" />
+ <parameter name="operational-status" value="null" />
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="AAI failed" />
+ </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="AAI failed" />
+ </return>
+ </outcome>
+ </update>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='PUT' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+ <parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $tunnelxconn-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'`"/>
+ </set>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message"
+ value="`'No entry found for parent service instance id ' + $tmp.ar.parent-service-instance-id + '.'`" />
+ </return>
+ </outcome>
+ </get-resource>
+ </outcome>
+ </execute>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
index 3d831485..bc93bea0 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml
@@ -105,6 +105,10 @@
</return>
</outcome>
</execute>
+ <set>
+ <parameter name='tmp.tunnel-vgMUX-vG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
+ <parameter name='tmp.tunnel-vgMUX-vBRG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` " />
+ </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"/>
@@ -112,9 +116,9 @@
<parameter name="replacement" value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`"/>
</execute>
<set>
- <parameter name='tmp.tunnel-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
- <parameter name='tmp.tunnel-dest-ip' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip` " />
- <parameter name='tmp.tunnel-src-ip' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
+ <parameter name='tmp.tunnel-name' value="`$tmp.tunnel-vgMUX-vG-name` " />
+ <parameter name='tmp.tunnel-dest-ip' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
+ <parameter name='tmp.tunnel-src-ip' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip` " />
<parameter name='tmp.tunnel-vni' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` " />
</set>
<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
@@ -138,17 +142,58 @@
<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 updating md-sal for tunnelxconn-allotted-resource" />
</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 updating md-sal for tunnelxconn-allotted-resource" />
</return>
</outcome>
</execute>
+ <set>
+ <parameter name='tmp.tunnel-name' value="`$tmp.tunnel-vgMUX-vBRG-name` " />
+ <parameter name='tmp.tunnel-dest-ip' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` " />
+ <parameter name='tmp.tunnel-src-ip' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-lan-ip` " />
+ <parameter name='tmp.tunnel-vni' value="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vni` " />
+ </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='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.vxlan-tunnel.templatefile`" />
+ <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='PUT' />
+ <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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='tmp.tunnel-name' value="`$tmp.tunnel-vgMUX-vG-name` " />
+ </set>
<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.templatefile`" />
<parameter name='restapiUrl' value="`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `" />
@@ -164,14 +209,52 @@
<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 updating md-sal for tunnelxconn-allotted-resource" />
</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 updating md-sal for tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='tmp.tunnel-name' value="`$tmp.tunnel-vgMUX-vG-name` " />
+ </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>
+ <set>
+ <parameter name='tmp.tunnel-name' value="`$tmp.tunnel-vgMUX-vBRG-name` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.vpp.xconnect.templatefile`" />
+ <parameter name='restapiUrl' value="`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `" />
+ <parameter name='restapiUser' value='`$prop.honeycomb.user`' />
+ <parameter name='restapiPassword' value='`$prop.honeycomb.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='PUT' />
+ <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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
</return>
</outcome>
</execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
index 893e959b..8dbd34e1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml
@@ -1,104 +1,251 @@
-<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}'><method rpc='tunnelxconn-topology-operation-delete' mode='sync'>
-<block atomic="true"><set>
-<parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
-<parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
-
-
-</set><set>
-<parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/tunnelxconn-topology/'` " />
-
-</set><execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
- <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
- <parameter name='contextPrefix' value='prop' />
-</execute><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>
- <parameter name="outputPath" value="tmp.ar-url"/>
- <parameter name="target" value="{allotted-resource-id}"/>
- <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
-</execute><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
- <parameter name='restapiUser' value='`$prop.controller.user`' />
- <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
- <parameter name='format' value='json' />
- <parameter name='httpMethod' value='GET' />
- <parameter name="responsePrefix" value="mdsal-ar" />
-
-<outcome value='success'>
-<block atomic="true">
-<set>
-<parameter name='bk-tx-ar' value='$mdsal-ar.' />
-</set><switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>
-<outcome value='1'>
-<block atomic='true'>
-<set>
-<parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />
-</set><switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
-<outcome value='Created'>
-<block>
-</block></outcome><outcome value='Other'>
-<block>
-</block></outcome></switch><set>
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
-
-</set></block></outcome></switch></block></outcome><outcome value='Other'>
-<block atomic="true">
-</block></outcome></execute><set>
-<parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
-<parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
-<parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
-<parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " /></set><execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
- <parameter name="outputPath" value="tmp.current-time" />
-
-</execute><set>
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
-<parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
-</set><set>
-<parameter name='tx-ar-assignments.' value="" />
-
-
-
-</set><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />
- <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
- <parameter name='restapiUser' value='`$prop.controller.user`' />
- <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
- <parameter name='format' value='json' />
- <parameter name='httpMethod' value='PUT' />
- <parameter name="responsePrefix" value="mdsal-ar" />
-
-<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 updating md-sal for tunnelxconn-allotted-resource" />
-</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 tunnelxconn-allotted-resource" />
-</return></outcome></execute><set>
-<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
-<parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
-<parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $tunnelxconn-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
-
-</set><return status='success'>
-<parameter name="ack-final-indicator" value="Y" />
-<parameter name="error-code" value="200" />
-<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
+<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}'>
+ <method rpc='tunnelxconn-topology-operation-delete' mode='sync'>
+ <block atomic="true">
+ <set>
+ <parameter name='tmp.ar.allotted-resource-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+ <parameter name='tmp.ar.parent-service-instance-id' value='`$tunnelxconn-topology-operation-input.allotted-resource-information.parent-service-instance-id`' />
+ </set>
+ <set>
+ <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:tunnelxconn-allotted-resources/tunnelxconn-allotted-resource/' + $tmp.ar.allotted-resource-id + '/allotted-resource-data/tunnelxconn-topology/'` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+ <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+ <parameter name='contextPrefix' value='prop' />
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.tx-allottedresource`"/>
+ <parameter name="outputPath" value="tmp.ar-url"/>
+ <parameter name="target" value="{allotted-resource-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.allotted-resource-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='GET' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <outcome value='success'>
+ <block atomic="true">
+ <set>
+ <parameter name='bk-tx-ar' value='$mdsal-ar.' />
+ </set>
+ <switch test='`$mdsal-ar.tunnelxconn-allotted-resource_length`'>
+ <outcome value='1'>
+ <block atomic='true'>
+ <set>
+ <parameter name='tx-ar.' value='$mdsal-ar.tunnelxconn-allotted-resource[0].' />
+ </set>
+ <switch test='`$tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status`'>
+ <outcome value='Created'>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
+ <block></block>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.request-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tx-ar.allotted-resource-status.rpc-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.svc-request-id`' />
+ </set>
+ </block>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ <outcome value='Other'>
+ <block atomic="true"></block>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='tx-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ <parameter name='tx-ar.allotted-resource-status.action' value="`$tunnelxconn-topology-operation-input.request-information.request-action` " />
+ <parameter name='tx-ar.allotted-resource-status.rpc-name' value="tunnelxconn-topology-operation" />
+ <parameter name='tx-ar.allotted-resource-status.rpc-action' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$tunnelxconn-topology-operation-input.request-information.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$tunnelxconn-topology-operation-input.sdnc-request-header.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$tunnelxconn-topology-operation-input.service-information.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$tunnelxconn-topology-operation-input.allotted-resource-information.` " />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-operation-information.tunnelxconn-request-input.' value="`$tunnelxconn-topology-operation-input.tunnelxconn-request-input.` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+ <parameter name="outputPath" value="tmp.current-time" />
+ </execute>
+ <set>
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='PendingDelete' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$tunnelxconn-topology-operation-input.request-information.request-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$tunnelxconn-topology-operation-input.sdnc-request-header.svc-request-id`' />
+ <parameter name='tx-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+ </set>
+ <set>
+ <parameter name='tx-ar-assignments.' value="" />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.tx.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />
+ <parameter name='restapiUser' value='`$prop.controller.user`' />
+ <parameter name='restapiPassword' value='`$prop.controller.pwd`' />
+ <parameter name='format' value='json' />
+ <parameter name='httpMethod' value='PUT' />
+ <parameter name="responsePrefix" value="mdsal-ar" />
+ <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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <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="`$tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vgmux-bearer-ip`"/>
+ </execute>
+ <set>
+ <parameter name='tmp.tunnel-vgMUX-vG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.vg-ip` " />
+ <parameter name='tmp.tunnel-vgMUX-vBRG-name' value="`'vxlanTun' + $tx-ar.allotted-resource-data.tunnelxconn-topology.tunnelxconn-assignments.brg-wan-ip-address` " />
+ </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-vgMUX-vG-name`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value="`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `" />
+ <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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <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-vgMUX-vBRG-name`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='restapiUrl' value="`$tmp.honeycomb.url + $tmp.vpp-honeycomb-url + '/v3po:l2' `" />
+ <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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <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-vgMUX-vG-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 updating md-sal for tunnelxconn-allotted-resource" />
+ </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 tunnelxconn-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+ <parameter name='tunnelxconn-object-path' value="`$tmp.ar.self-link`"/>
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $tunnelxconn-topology-operation-input.service-information.service-instance-id + '/service-data/service-topology/'`"/>
+ </set>
+ <return status='success'>
+ <parameter name="ack-final-indicator" value="Y" />
+ <parameter name="error-code" value="200" />
+ <parameter name="error-message" value="`$error-message`" />
+ </return>
+ </block>
+ </method>
+</service-logic> \ No newline at end of file