aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json2
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json95
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json924
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json718
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml3
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml9
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml591
-rw-r--r--platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml6
8 files changed, 1220 insertions, 1128 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
index 837612af..b5d707a7 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.json
@@ -499,7 +499,7 @@
"id": "48507d03.0cfd24",
"type": "update",
"name": "save AAI allotted-resource",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"role\" value=\"`$prop.connection-attachment.role`\" />\t\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sdwanVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
"comments": "",
"outputs": 1,
"x": 620.6908798217773,
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
index d123bd70..4224a324 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-get-site-param.json
@@ -422,7 +422,7 @@
"z": "94b1afc3.a0dc",
"wires": [
[
- "2b1dae74.689ae2"
+ "8f9ebae3.f9c1f8"
]
]
},
@@ -443,8 +443,8 @@
"name": "set controlPoint",
"xml": "<set>\n<parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />\n\n",
"comments": "",
- "x": 1352.7787055969238,
- "y": 657.0003480911255,
+ "x": 1713.7786865234375,
+ "y": 684.0004281997681,
"z": "94b1afc3.a0dc",
"wires": []
},
@@ -487,8 +487,8 @@
"atomic": "true",
"comments": "",
"outputs": 1,
- "x": 1126.445026397705,
- "y": 641.0001058578491,
+ "x": 1531.4451026916504,
+ "y": 704.0001840591431,
"z": "94b1afc3.a0dc",
"wires": [
[
@@ -504,8 +504,8 @@
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$prop.site.controlPoint`'/>\n<parameter name=\"regex\" value=\",\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"prop.site.controlpoints\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1377.445182800293,
- "y": 709.000207901001,
+ "x": 1738.4451637268066,
+ "y": 736.0002880096436,
"z": "94b1afc3.a0dc",
"wires": [
[]
@@ -810,5 +810,86 @@
"wires": [
[]
]
+ },
+ {
+ "id": "8f9ebae3.f9c1f8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1105,
+ "y": 650,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "c5f963e7.1c042"
+ ]
+ ]
+ },
+ {
+ "id": "c5f963e7.1c042",
+ "type": "switchNode",
+ "name": "switch value",
+ "xml": "<switch test=\"`$vnf-request-input.vnf-input-parameters.param[$idx].value`\">\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1235.0000038146973,
+ "y": 681.9999990463257,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "50780dd0.f16eb4",
+ "cef68888.786a28"
+ ]
+ ]
+ },
+ {
+ "id": "50780dd0.f16eb4",
+ "type": "other",
+ "name": "outcome Null",
+ "xml": "<outcome value=''>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1392.0000114440918,
+ "y": 653.0000410079956,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "9c84c418.3907d8"
+ ]
+ ]
+ },
+ {
+ "id": "cef68888.786a28",
+ "type": "other",
+ "name": "other",
+ "xml": "<outcome value='Other'>\n",
+ "comments": "",
+ "outputs": 1,
+ "x": 1375.5003395080566,
+ "y": 701.0000009536743,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ [
+ "2b1dae74.689ae2"
+ ]
+ ]
+ },
+ {
+ "id": "9c84c418.3907d8",
+ "type": "block",
+ "name": "block",
+ "xml": "<block>\n",
+ "atomic": "false",
+ "comments": "",
+ "outputs": 1,
+ "x": 1531.000015258789,
+ "y": 652.9999990463257,
+ "z": "94b1afc3.a0dc",
+ "wires": [
+ []
+ ]
}
]
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
index 0992fa6d..185815d2 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.json
@@ -1,20 +1,20 @@
[
{
- "id": "e71077a5.449178",
+ "id": "b2b2fc12.cf96d",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 94.00001907348633,
- "y": 67.0000991821289,
- "z": "ab45b2a0.2d254",
+ "x": 96.50000190734863,
+ "y": 38.00000286102295,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "e230874f.1ced38"
+ "6e50c528.de9a7c"
]
]
},
{
- "id": "e230874f.1ced38",
+ "id": "6e50c528.de9a7c",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1311 +22,1311 @@
"comments": "",
"xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
"outputs": 1,
- "x": 269.0000228881836,
- "y": 139.0001163482666,
- "z": "ab45b2a0.2d254",
+ "x": 237.50000381469727,
+ "y": 115.0000171661377,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "fda28de9.a9688"
+ "f4bf8d69.ecd28"
]
]
},
{
- "id": "fda28de9.a9688",
+ "id": "f4bf8d69.ecd28",
"type": "method",
"name": "sotn-attachment-topology-operation-create",
"xml": "<method rpc='sotn-attachment-topology-operation-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 257.0001411437988,
- "y": 227.0000991821289,
- "z": "ab45b2a0.2d254",
+ "x": 225.5001220703125,
+ "y": 203,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "8e26551b.7dfe18"
+ "3bd3ace.6bd7c54"
]
]
},
{
- "id": "8e26551b.7dfe18",
+ "id": "3bd3ace.6bd7c54",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 177.00007247924805,
- "y": 976.0003471374512,
- "z": "ab45b2a0.2d254",
+ "x": 145.50005340576172,
+ "y": 952.0002479553223,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "c93c04d7.3e5348",
- "9950e65d.3636a8",
- "1ae547a2.eaba88",
- "65f23dcc.6522b4",
- "3e30e763.22be28",
- "aa28416d.6d08a",
- "15ca2e29.9a7dd2",
- "9b1a0521.5c3978",
- "f24b78b1.fdc468",
- "a64f1b8.759c3e8",
- "ab5d9313.ad157",
- "6c39c83c.d7b048",
- "8b5e7723.d59fc8",
- "6b976d2c.2711d4",
- "c9e7bba5.2bcb28",
- "5aa40ff8.faf21",
- "46cb4068.e43d3",
- "8bddffb6.5284",
- "abedf313.5d507",
- "fac542dd.1d112",
- "b07d75d2.a2b088",
- "26fdc495.60ac0c",
- "a63f9a77.c174a8",
- "e02c5c21.82a2",
- "bde5bdf6.37338"
+ "e49d7cd0.24623",
+ "4a92eb0d.67e9c4",
+ "2dd15073.0da3b",
+ "5e1f3d4f.82c794",
+ "afc1bdf5.4b836",
+ "7d9ca6fb.249298",
+ "f5e2658.10ace98",
+ "3342f593.51121a",
+ "458e8426.a4810c",
+ "506bd024.3cd4a",
+ "ca1aa6f6.be5228",
+ "a07927be.544a08",
+ "2adeb8b.a94ce48",
+ "c51e932f.b0db6",
+ "16ace716.f64f39",
+ "91c11379.3848",
+ "c018ef66.ea6f",
+ "d7ef6ed3.36d06",
+ "9a473067.67045",
+ "91b59706.e4cdc8",
+ "cfbbadf0.d1c3a",
+ "e88d2834.1fdcf8",
+ "8fb59fb4.b6b0c",
+ "c224a6bb.b7b288",
+ "c765719e.98d15"
]
]
},
{
- "id": "c90f1d50.24dc",
+ "id": "bc77dabb.b8dfe8",
"type": "comment",
"name": "Set allotted resource id if not sent by SO",
"info": "",
"comments": "",
- "x": 661.0767707824707,
- "y": 136.4340181350708,
- "z": "ab45b2a0.2d254",
+ "x": 629.5767517089844,
+ "y": 112.4339189529419,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "c93c04d7.3e5348",
+ "id": "e49d7cd0.24623",
"type": "switchNode",
"name": "switch allotted-resource-id",
"xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>\n",
"comments": "",
"outputs": 1,
- "x": 607.0000495910645,
- "y": 192.00009155273438,
- "z": "ab45b2a0.2d254",
+ "x": 575.5000305175781,
+ "y": 167.99999237060547,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "213269bc.4275f6",
- "6419db5e.a2c0c4"
+ "ede8227d.3da0a",
+ "871d8b04.92b798"
]
]
},
{
- "id": "213269bc.4275f6",
+ "id": "ede8227d.3da0a",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 805.0001373291016,
- "y": 162.00008010864258,
- "z": "ab45b2a0.2d254",
+ "x": 773.5001182556152,
+ "y": 137.99998092651367,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "eccd2036.554d7"
+ "8efccbca.23f2f8"
]
]
},
{
- "id": "6419db5e.a2c0c4",
+ "id": "871d8b04.92b798",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 804.0000457763672,
- "y": 199.00009059906006,
- "z": "ab45b2a0.2d254",
+ "x": 772.5000267028809,
+ "y": 174.99999141693115,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "4ab8dc05.8f0984"
+ "4fdaace7.615964"
]
]
},
{
- "id": "4ab8dc05.8f0984",
+ "id": "4fdaace7.615964",
"type": "set",
"name": "set tmp.ar.allotted-resource-id",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />\n",
"comments": "",
- "x": 1002.0000343322754,
- "y": 196.0001096725464,
- "z": "ab45b2a0.2d254",
+ "x": 970.5000152587891,
+ "y": 172.00001049041748,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "9950e65d.3636a8",
+ "id": "4a92eb0d.67e9c4",
"type": "set",
"name": "set tmp.ar.self-link",
"xml": "<set>\n<parameter name='tmp.ar.self-link' value=\"`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'\n + $tmp.ar.allotted-resource-id\n + '/allotted-resource-data/connection-attachment-topology/'` \" />\n\n",
"comments": "",
- "x": 574.9999732971191,
- "y": 413.0001983642578,
- "z": "ab45b2a0.2d254",
+ "x": 543.4999542236328,
+ "y": 389.0000991821289,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "1ae547a2.eaba88",
+ "id": "2dd15073.0da3b",
"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": 575.261890411377,
- "y": 494.66687965393066,
- "z": "ab45b2a0.2d254",
+ "x": 543.7618713378906,
+ "y": 470.66678047180176,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "65f23dcc.6522b4",
+ "id": "5e1f3d4f.82c794",
"type": "execute",
"name": "generate allotted-resource tmp.ar-url",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.connection-attachment-allottedresource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 628.2619514465332,
- "y": 581.6667976379395,
- "z": "ab45b2a0.2d254",
+ "x": 596.7619323730469,
+ "y": 557.6666984558105,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "eccd2036.554d7",
+ "id": "8efccbca.23f2f8",
"type": "execute",
"name": "execute tmp.ar.allotted-resource-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"tmp.ar.allotted-resource-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1020.000114440918,
- "y": 163.00008583068848,
- "z": "ab45b2a0.2d254",
+ "x": 988.5000953674316,
+ "y": 138.99998664855957,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "90c2cdec.e7c9c"
+ "d4c15c7f.c9c6b"
]
]
},
{
- "id": "90c2cdec.e7c9c",
+ "id": "d4c15c7f.c9c6b",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1238.000156402588,
- "y": 163.00004959106445,
- "z": "ab45b2a0.2d254",
+ "x": 1206.5001373291016,
+ "y": 138.99995040893555,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "a192b9fd.7610f8"
+ "4780ce03.07d49"
]
]
},
{
- "id": "a192b9fd.7610f8",
+ "id": "4780ce03.07d49",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while generation allotted resource ID\" />\n",
"comments": "",
- "x": 1404.0001106262207,
- "y": 163.0000638961792,
- "z": "ab45b2a0.2d254",
+ "x": 1372.5000915527344,
+ "y": 138.9999647140503,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "66a512c5.0faacc",
+ "id": "cd668aab.887ef8",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1134.000249862671,
- "y": 653.7779703140259,
- "z": "ab45b2a0.2d254",
+ "x": 1102.5002307891846,
+ "y": 629.777871131897,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "19566392.15832c"
+ "43f948c5.8e3c48"
]
]
},
{
- "id": "2a3354d7.ee765c",
+ "id": "fff5fcf9.b91b7",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error: Existing connection attachment allotted resource\" />\n \n",
"comments": "",
- "x": 1867.5186290740967,
- "y": 654.8440418243408,
- "z": "ab45b2a0.2d254",
+ "x": 1836.0186100006104,
+ "y": 630.8439426422119,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "70da4f2f.1d3ca",
+ "id": "ae16b108.dde0f",
"type": "comment",
"name": "Check for non existence of allotted resource",
"info": "",
"comments": "",
- "x": 990.000171661377,
- "y": 587.778037071228,
- "z": "ab45b2a0.2d254",
+ "x": 958.5001525878906,
+ "y": 563.7779378890991,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "66ac283c.bd2348",
+ "id": "ada117fc.11b638",
"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": 1510.6667175292969,
- "y": 798.0001494884491,
- "z": "ab45b2a0.2d254",
+ "x": 1479.1666984558105,
+ "y": 774.0000503063202,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "c03dacc1.547db"
+ "e40e8409.36d7f8"
]
]
},
{
- "id": "aa28416d.6d08a",
+ "id": "7d9ca6fb.249298",
"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": 692.6660423278809,
- "y": 774.7141819000244,
- "z": "ab45b2a0.2d254",
+ "x": 661.1660232543945,
+ "y": 750.7140827178955,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "ae723a2a.13be98",
- "1678938e.1bfafc"
+ "6fbc583.8ed6aa8",
+ "2f545e93.6ba8a2"
]
]
},
{
- "id": "ae723a2a.13be98",
+ "id": "6fbc583.8ed6aa8",
"type": "other",
"name": "outcome Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 996.8089408874512,
- "y": 743.5716190338135,
- "z": "ab45b2a0.2d254",
+ "x": 965.3089218139648,
+ "y": 719.5715198516846,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "9ff14f9b.0b3b"
+ "a95f5b55.d6e9b8"
]
]
},
{
- "id": "1678938e.1bfafc",
+ "id": "2f545e93.6ba8a2",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 973.8089904785156,
- "y": 804.5715742111206,
- "z": "ab45b2a0.2d254",
+ "x": 942.3089714050293,
+ "y": 780.5714750289917,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "79d1a933.7fd6a8"
+ "7d9f20d0.5505c"
]
]
},
{
- "id": "79d1a933.7fd6a8",
+ "id": "7d9f20d0.5505c",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1133.9360809326172,
- "y": 802.6975507736206,
- "z": "ab45b2a0.2d254",
+ "x": 1102.4360618591309,
+ "y": 778.6974515914917,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "66ac283c.bd2348",
- "3b659fae.e519",
- "a32862a8.8af3d"
+ "ada117fc.11b638",
+ "67b14806.59d9a8",
+ "458ffc55.d5db04"
]
]
},
{
- "id": "9ff14f9b.0b3b",
+ "id": "a95f5b55.d6e9b8",
"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": 1146.6659240722656,
- "y": 741.2856693267822,
- "z": "ab45b2a0.2d254",
+ "x": 1115.1659049987793,
+ "y": 717.2855701446533,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "15ca2e29.9a7dd2",
+ "id": "f5e2658.10ace98",
"type": "set",
"name": "set consumed allotted resources",
"xml": "<set>\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource[$tmp.cidx].allotted-resource-pointer' value=\"`$tmp.ar.self-link` \" />\n<parameter name='service-data.consumed-allotted-resources.consumed-allotted-resource_length' value='`$tmp.cidx + 1`' />\n\n",
"comments": "",
- "x": 621.5233345031738,
- "y": 878.2857465744019,
- "z": "ab45b2a0.2d254",
+ "x": 590.0233154296875,
+ "y": 854.285647392273,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "3b659fae.e519",
+ "id": "67b14806.59d9a8",
"type": "switchNode",
"name": "switch tmp.found-cidx",
"xml": "<switch test='`$tmp.found-cidx`'>\n",
"comments": "",
"outputs": 1,
- "x": 1323.0511283874512,
- "y": 834.7090735435486,
- "z": "ab45b2a0.2d254",
+ "x": 1291.5511093139648,
+ "y": 810.7089743614197,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "966db31a.47786"
+ "b4f07caa.1eece"
]
]
},
{
- "id": "966db31a.47786",
+ "id": "b4f07caa.1eece",
"type": "outcomeTrue",
"name": "false",
"xml": "<outcome value='false'>\n",
"comments": "",
"outputs": 1,
- "x": 1513.051082611084,
- "y": 834.7090106010437,
- "z": "ab45b2a0.2d254",
+ "x": 1481.5510635375977,
+ "y": 810.7089114189148,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "b95410b0.660fd"
+ "9b5a2a9b.791398"
]
]
},
{
- "id": "b95410b0.660fd",
+ "id": "9b5a2a9b.791398",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1679.051082611084,
- "y": 834.7090106010437,
- "z": "ab45b2a0.2d254",
+ "x": 1647.5510635375977,
+ "y": 810.7089114189148,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "2ab57899.a130b8"
+ "82e04cf1.4917b"
]
]
},
{
- "id": "c03dacc1.547db",
+ "id": "e40e8409.36d7f8",
"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": 1927.7783470153809,
- "y": 795.0001764297485,
- "z": "ab45b2a0.2d254",
+ "x": 1896.2783279418945,
+ "y": 771.0000772476196,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "ba9ad589.8abb58"
+ "f29e0cd9.704ae"
]
]
},
{
- "id": "ba9ad589.8abb58",
+ "id": "f29e0cd9.704ae",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 2109.587921142578,
- "y": 795.4646234512329,
- "z": "ab45b2a0.2d254",
+ "x": 2078.087902069092,
+ "y": 771.464524269104,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "ef75ff36.6e6a8"
+ "60273371.090a2c"
]
]
},
{
- "id": "2ab57899.a130b8",
+ "id": "82e04cf1.4917b",
"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": 1840.9244651794434,
- "y": 834.2207117080688,
- "z": "ab45b2a0.2d254",
+ "x": 1809.424446105957,
+ "y": 810.2206125259399,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "e6f158d3.3c83a8",
+ "id": "9b1a4b9d.344fd8",
"type": "comment",
"name": "Add to consumed service consumed-allotted-resources in mdsal",
"info": "Prepare data and add to service-data",
"comments": "",
- "x": 713.6672554016113,
- "y": 705.0001459121704,
- "z": "ab45b2a0.2d254",
+ "x": 682.167236328125,
+ "y": 681.0000467300415,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "464592d5.7d3adc",
+ "id": "57f62d80.43fe94",
"type": "comment",
"name": "This set resource will be added to MDSAL by provider code",
"info": "Below we add to service-data.consumed-allotted-resource at last index",
"comments": "",
- "x": 701.000171661377,
- "y": 843.7782382965088,
- "z": "ab45b2a0.2d254",
+ "x": 669.5001525878906,
+ "y": 819.7781391143799,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "a63f9a77.c174a8",
+ "id": "8fb59fb4.b6b0c",
"type": "update",
"name": "save AAI allotted-resource",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<!--parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" /-->\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\"\n pfx='pfx' local-only='false' force='false'>\n <parameter name=\"id\" value=\"`$tmp.ar.allotted-resource-id`\" />\n\t<parameter name=\"name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"access-provider-id\" value=\"`$prop.connection-attachment.access-provider-id`\" />\n\t<parameter name=\"access-client-id\" value=\"`$prop.connection-attachment.access-client-id`\" />\n\t<parameter name=\"access-topology-id\" value=\"`$prop.connection-attachment.access-topology-id`\" />\n\t<parameter name=\"access-node-id\" value=\"`$prop.connection-attachment.access-node-id`\" />\n\t<parameter name=\"access-ltp-id\" value=\"`$prop.connection-attachment.access-ltp-id`\" />\t\n\t<parameter name=\"cvlan\" value=\"`$prop.connection-attachment.cVLAN`\" />\n <parameter name=\"vpn-name\" value=\"`$prop.connection-attachment.sotnVpnName`\" />\n\t<parameter name=\"selflink\" value=\"`$tmp.ar.self-link`\" />\n\t<parameter name=\"model-invariant-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`\" />\n\t<parameter name=\"model-version-id\" value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`\" />\n\t<parameter name=\"operational-status\" value=\"Created\" />\n",
"comments": "",
"outputs": 1,
- "x": 577.6909523010254,
- "y": 1914.5320167541504,
- "z": "ab45b2a0.2d254",
+ "x": 556.1909332275391,
+ "y": 1876.5319156646729,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "8865c331.63809",
- "3795c6dc.0749ba"
+ "a1966a3.5032b98",
+ "3409a13c.09f89e"
]
]
},
{
- "id": "8865c331.63809",
+ "id": "a1966a3.5032b98",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 801.4528045654297,
- "y": 1884.4845905303955,
- "z": "ab45b2a0.2d254",
+ "x": 769.9527854919434,
+ "y": 1860.4844913482666,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "4e95350f.9bd78c"
+ "9c3ee63e.5c5548"
]
]
},
{
- "id": "4e95350f.9bd78c",
+ "id": "9c3ee63e.5c5548",
"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": 967.9766845703125,
- "y": 1896.1036615371704,
- "z": "ab45b2a0.2d254",
+ "x": 936.4766654968262,
+ "y": 1872.1035623550415,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "3795c6dc.0749ba",
+ "id": "3409a13c.09f89e",
"type": "failure",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 808.5480918884277,
- "y": 1917.246558189392,
- "z": "ab45b2a0.2d254",
+ "x": 777.0480728149414,
+ "y": 1893.2464590072632,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "4e95350f.9bd78c"
+ "9c3ee63e.5c5548"
]
]
},
{
- "id": "e8bcac4.3e63b5",
+ "id": "72ae40d1.ad37d",
"type": "comment",
"name": "Save Resource to AAI",
"info": "",
"comments": "",
- "x": 583.5005073547363,
- "y": 1836.8339614868164,
- "z": "ab45b2a0.2d254",
+ "x": 552.00048828125,
+ "y": 1812.8338623046875,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "9ada057d.8d0ed8",
+ "id": "a332d2fb.609ff",
"type": "comment",
"name": "Set allotted resource type if not sent by SO",
"info": "",
"comments": "",
- "x": 647.0000190734863,
- "y": 245.0000991821289,
- "z": "ab45b2a0.2d254",
+ "x": 615.5,
+ "y": 221,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "3e30e763.22be28",
+ "id": "afc1bdf5.4b836",
"type": "switchNode",
"name": "switch allotted-resource-type",
"xml": "<switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>\n",
"comments": "",
"outputs": 1,
- "x": 608.9233283996582,
- "y": 285.5661554336548,
- "z": "ab45b2a0.2d254",
+ "x": 577.4233093261719,
+ "y": 261.5660562515259,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "1b1ef42.aa2a50c",
- "5b1a6ad6.d32444"
+ "cf33bc7c.594b3",
+ "977436f5.c716c8"
]
]
},
{
- "id": "1b1ef42.aa2a50c",
+ "id": "cf33bc7c.594b3",
"type": "outcome",
"name": "NULL",
"xml": "<outcome value=''>",
"comments": "",
"outputs": 1,
- "x": 811.9234809875488,
- "y": 270.56615829467773,
- "z": "ab45b2a0.2d254",
+ "x": 780.4234619140625,
+ "y": 246.56605911254883,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "23a0059d.3f004a"
+ "382edb8d.38df44"
]
]
},
{
- "id": "5b1a6ad6.d32444",
+ "id": "977436f5.c716c8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 804.9233093261719,
- "y": 310.5661783218384,
- "z": "ab45b2a0.2d254",
+ "x": 773.4232902526855,
+ "y": 286.5660791397095,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "e101a8fa.94ec78"
+ "2162049e.dcac4c"
]
]
},
{
- "id": "e101a8fa.94ec78",
+ "id": "2162049e.dcac4c",
"type": "set",
"name": "set tmp.ar.allotted-resource-type",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />\n",
"comments": "",
- "x": 1036.9232940673828,
- "y": 310.56618309020996,
- "z": "ab45b2a0.2d254",
+ "x": 1005.4232749938965,
+ "y": 286.56608390808105,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "535c3465.db6a5c",
+ "id": "689a35d2.e3d7ac",
"type": "comment",
"name": "For storage in AAI connection-attachment-topology",
"info": "",
"comments": "",
- "x": 671.9999809265137,
- "y": 380.0000991821289,
- "z": "ab45b2a0.2d254",
+ "x": 640.4999618530273,
+ "y": 356,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "7158b402.34b20c",
+ "id": "adaba0c1.0cdca",
"type": "comment",
"name": "Obtain different URL, template location etc",
"info": "For saving resource information to MDSAL & for AAI",
"comments": "",
- "x": 646.9999656677246,
- "y": 461.8890085220337,
- "z": "ab45b2a0.2d254",
+ "x": 615.4999465942383,
+ "y": 437.8889093399048,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "8b7046e5.63a738",
+ "id": "bdfc2cb5.718fd",
"type": "comment",
"name": "Used for Put AR by id to MDSAL",
"info": "",
"comments": "",
- "x": 613.0000495910645,
- "y": 550.8890256881714,
- "z": "ab45b2a0.2d254",
+ "x": 581.5000305175781,
+ "y": 526.8889265060425,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "41e867cd.171798",
+ "id": "882372f2.e4c61",
"type": "comment",
"name": "Obtain the last index in services",
"info": "ServiceData is added by Provider code",
"comments": "",
- "x": 614.4444923400879,
- "y": 736.888970375061,
- "z": "ab45b2a0.2d254",
+ "x": 582.9444732666016,
+ "y": 712.8888711929321,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "abedf313.5d507",
+ "id": "9a473067.67045",
"type": "set",
"name": "set output to api handler",
"xml": "<set>\n<parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />\n<parameter name='connection-attachment-object-path' value=\"`$tmp.ar.self-link`\"/>\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $connection-attachment-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n \n",
"comments": "",
- "x": 592.2681541442871,
- "y": 1800.3592882156372,
- "z": "ab45b2a0.2d254",
+ "x": 560.7681350708008,
+ "y": 1776.3591890335083,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "fac542dd.1d112",
+ "id": "91b59706.e4cdc8",
"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": 536.6813507080078,
- "y": 2033.975341796875,
- "z": "ab45b2a0.2d254",
+ "x": 510.18128967285156,
+ "y": 2026.9751167297363,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "23a0059d.3f004a",
+ "id": "382edb8d.38df44",
"type": "set",
"name": "set tmp.ar.allotted-resource-type",
"xml": "<set>\n<parameter name='tmp.ar.allotted-resource-type' value=\"SOTNAttachmentInstance\" />\n",
"comments": "",
- "x": 1051.0001678466797,
- "y": 271.00008487701416,
- "z": "ab45b2a0.2d254",
+ "x": 1019.5001487731934,
+ "y": 246.99998569488525,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "77c2c758.5059b8",
+ "id": "7cc17548.dbfedc",
"type": "call",
"name": "call GENERIC-RESOURCE-API:sotn-get-saved-ar-param",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 893.9941749572754,
- "y": 1649.4938287734985,
- "z": "ab45b2a0.2d254",
+ "x": 862.4941558837891,
+ "y": 1625.4937295913696,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "8bddffb6.5284",
+ "id": "d7ef6ed3.36d06",
"type": "execute",
"name": "execute RestApiCallNode - PUT AR by id",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 643.0002861022949,
- "y": 1734.0002174377441,
- "z": "ab45b2a0.2d254",
+ "x": 611.5002670288086,
+ "y": 1710.0001182556152,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "d13a7894.7c9648",
- "a17ed53e.8a7c48",
- "2a45ba4f.903ad6"
+ "5ed47414.f6a9ec",
+ "9d623053.1780e",
+ "f8eb328d.71989"
]
]
},
{
- "id": "d13a7894.7c9648",
+ "id": "5ed47414.f6a9ec",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 892.6416397094727,
- "y": 1772.3315477371216,
- "z": "ab45b2a0.2d254",
+ "x": 861.1416206359863,
+ "y": 1748.3314485549927,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "2a58bb37.857ca4"
+ "ee36b0d3.645c5"
]
]
},
{
- "id": "a17ed53e.8a7c48",
+ "id": "9d623053.1780e",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 883.6416893005371,
- "y": 1740.8315734863281,
- "z": "ab45b2a0.2d254",
+ "x": 852.1416702270508,
+ "y": 1716.8314743041992,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "2a58bb37.857ca4"
+ "ee36b0d3.645c5"
]
]
},
{
- "id": "2a45ba4f.903ad6",
+ "id": "f8eb328d.71989",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 887.3917274475098,
- "y": 1711.1886783614755,
- "z": "ab45b2a0.2d254",
+ "x": 855.8917083740234,
+ "y": 1687.1885791793466,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "4b685690.de2cf8"
+ "3e7a6f90.4daaf"
]
]
},
{
- "id": "2a58bb37.857ca4",
+ "id": "ee36b0d3.645c5",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n",
"comments": "",
- "x": 1053.3917274475098,
- "y": 1741.581597328186,
- "z": "ab45b2a0.2d254",
+ "x": 1021.8917083740234,
+ "y": 1717.5814981460571,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "4b685690.de2cf8",
+ "id": "3e7a6f90.4daaf",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1029.047695159912,
- "y": 1707.3808475509286,
- "z": "ab45b2a0.2d254",
+ "x": 997.5476760864258,
+ "y": 1683.3807483687997,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "ab5d9313.ad157",
+ "id": "ca1aa6f6.be5228",
"type": "execute",
"name": "execute RestApiCallNode - Update parent provided service AR",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`\" />\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='PUT' />\n <parameter name=\"responsePrefix\" value=\"parent\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 712.9999732971191,
- "y": 1160.0002641677856,
- "z": "ab45b2a0.2d254",
+ "x": 681.4999542236328,
+ "y": 1136.0001649856567,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "9094ff9e.53d26",
- "43bc3599.27bffc",
- "fc9fd873.a374e8"
+ "10d6c8ff.30a7e7",
+ "fdb9bed8.ececf",
+ "d7a65ee0.6afc7"
]
]
},
{
- "id": "9094ff9e.53d26",
+ "id": "10d6c8ff.30a7e7",
"type": "not-found",
"name": "not-found",
"xml": "<outcome value='not-found'>\n",
"comments": "",
"outputs": 1,
- "x": 1021.308032989502,
- "y": 1191.9985399246216,
- "z": "ab45b2a0.2d254",
+ "x": 989.8080139160156,
+ "y": 1167.9984407424927,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "421ec30a.485b8c"
+ "c03cc053.bc771"
]
]
},
{
- "id": "43bc3599.27bffc",
+ "id": "fdb9bed8.ececf",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1012.3080825805664,
- "y": 1160.4985656738281,
- "z": "ab45b2a0.2d254",
+ "x": 980.8080635070801,
+ "y": 1136.4984664916992,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "421ec30a.485b8c"
+ "c03cc053.bc771"
]
]
},
{
- "id": "fc9fd873.a374e8",
+ "id": "d7a65ee0.6afc7",
"type": "success",
"name": "success",
"xml": "<outcome value='success'>\n",
"comments": "",
"outputs": 1,
- "x": 1016.0581207275391,
- "y": 1130.8556705489755,
- "z": "ab45b2a0.2d254",
+ "x": 984.5581016540527,
+ "y": 1106.8555713668466,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "c6163b00.f85308"
+ "c4688568.f7e6a8"
]
]
},
{
- "id": "421ec30a.485b8c",
+ "id": "c03cc053.bc771",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error updating md-sal for connection-attachment-allotted-resource\" />\n",
"comments": "",
- "x": 1182.058120727539,
- "y": 1161.248589515686,
- "z": "ab45b2a0.2d254",
+ "x": 1150.5581016540527,
+ "y": 1137.2484903335571,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "c6163b00.f85308",
+ "id": "c4688568.f7e6a8",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1157.7140884399414,
- "y": 1127.0478397384286,
- "z": "ab45b2a0.2d254",
+ "x": 1126.214069366455,
+ "y": 1103.0477405562997,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "f91628dc.a22298",
+ "id": "8a0df30e.6ab87",
"type": "comment",
"name": "Put the parent allotted resource in mdsal",
"info": "",
"comments": "",
- "x": 641.9999198913574,
- "y": 1122.0001707077026,
- "z": "ab45b2a0.2d254",
+ "x": 610.4999008178711,
+ "y": 1098.0000715255737,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "8b5e7723.d59fc8",
+ "id": "2adeb8b.a94ce48",
"type": "set",
"name": "set connection-attachment-ar-identifiers",
"xml": "<set>\n<parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value=\"`$connection-attachment-topology-operation-input.service-information.service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` \" />\n<parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n\n",
"comments": "",
- "x": 638.357105255127,
- "y": 1324.571789741516,
- "z": "ab45b2a0.2d254",
+ "x": 606.8570861816406,
+ "y": 1300.5716905593872,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "6c39c83c.d7b048",
+ "id": "a07927be.544a08",
"type": "set",
"name": "set ar-data",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-id' value=\"`$tmp.ar.allotted-resource-id` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.action' value=\"`$connection-attachment-topology-operation-input.request-information.request-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value=\"connection-attachment-topology-operation\" />\n<parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value=\"`$connection-attachment-topology-operation-input.request-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value=\"`$connection-attachment-topology-operation-input.sdnc-request-header.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value=\"`$connection-attachment-topology-operation-input.service-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.` \" />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value=\"`$connection-attachment-topology-operation-input.connection-attachment-request-input.` \" />",
"comments": "",
- "x": 552.2138862609863,
- "y": 1292.3811464309692,
- "z": "ab45b2a0.2d254",
+ "x": 520.7138671875,
+ "y": 1268.3810472488403,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "6b976d2c.2711d4",
+ "id": "c51e932f.b0db6",
"type": "set",
"name": "set identifiers in overall structure",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.' \nvalue=\"`$connection-attachment-ar-identifiers.`\" />\n\n\n",
"comments": "",
- "x": 617.1669044494629,
- "y": 1358.6669750213623,
- "z": "ab45b2a0.2d254",
+ "x": 585.6668853759766,
+ "y": 1334.6668758392334,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "c9e7bba5.2bcb28",
+ "id": "16ace716.f64f39",
"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": 569.4997444152832,
- "y": 1432.0005025863647,
- "z": "ab45b2a0.2d254",
+ "x": 537.9997253417969,
+ "y": 1408.0004034042358,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "5aa40ff8.faf21",
+ "id": "91c11379.3848",
"type": "set",
"name": "set allotted-resource-oper-status",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />\n<parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />\n",
"comments": "",
- "x": 620.4867820739746,
- "y": 1487.951735496521,
- "z": "ab45b2a0.2d254",
+ "x": 588.9867630004883,
+ "y": 1463.951636314392,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "46cb4068.e43d3",
+ "id": "c018ef66.ea6f",
"type": "set",
"name": "set model-data",
"xml": "<set>\n<parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` \" />",
"comments": "",
- "x": 565.0554008483887,
- "y": 1393.5558605194092,
- "z": "ab45b2a0.2d254",
+ "x": 533.5553817749023,
+ "y": 1369.5557613372803,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "b1148074.b83dc",
+ "id": "34c8d9e7.5935d6",
"type": "comment",
"name": "Prepare data for allotted-resource addition to MDSAL",
"info": "This will add to allotted-resource which is present inside service.",
"comments": "",
- "x": 682.3888893127441,
- "y": 1258.5557069778442,
- "z": "ab45b2a0.2d254",
+ "x": 650.8888702392578,
+ "y": 1234.5556077957153,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "a64f1b8.759c3e8",
+ "id": "506bd024.3cd4a",
"type": "execute",
"name": "generate parent-ar url - replace allotted-resource-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$tmp.parent-ar-url`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{allotted-resource-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.allotted-resource-id`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 677.5000343322754,
- "y": 1086.0001096725464,
- "z": "ab45b2a0.2d254",
+ "x": 646.0000152587891,
+ "y": 1062.0000104904175,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "f24b78b1.fdc468",
+ "id": "458e8426.a4810c",
"type": "execute",
"name": "generate parent-ar url - replace service-instance-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n <parameter name=\"source\" value=\"`$prop.restapi.parent-provided-resource`\"/>\n <parameter name=\"outputPath\" value=\"tmp.parent-ar-url\"/>\n <parameter name=\"target\" value=\"{service-instance-id}\"/>\n <parameter name=\"replacement\" value=\"`$tmp.ar.parent-service-instance-id`\"/>\n",
"comments": "",
"outputs": 1,
- "x": 673.4999580383301,
- "y": 1043.0002460479736,
- "z": "ab45b2a0.2d254",
+ "x": 641.9999389648438,
+ "y": 1019.0001468658447,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "5c890ede.9091d",
+ "id": "cd63ec4b.ff1cb",
"type": "comment",
"name": "Prepare Parent AR URL",
"info": "Preparation to set provided-allotted-resource in parent service instance",
"comments": "",
- "x": 591.500415802002,
- "y": 972.0001993179321,
- "z": "ab45b2a0.2d254",
+ "x": 560.0003967285156,
+ "y": 948.0001001358032,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "9b1a0521.5c3978",
+ "id": "3342f593.51121a",
"type": "set",
"name": "set tmp.ar.parent-service-instance-id",
"xml": "<set>\n<parameter name='tmp.ar.parent-service-instance-id' value=\"`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` \" />\n\n",
"comments": "",
- "x": 630.5002098083496,
- "y": 1005.500138759613,
- "z": "ab45b2a0.2d254",
+ "x": 599.0001907348633,
+ "y": 981.5000395774841,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "1dce57cb.3a2f28",
+ "id": "367a31a2.e26f2e",
"type": "comment",
"name": "Required for filling template values",
"info": "This is done because connection-attachment is generic resource and doesn't have specific parameters",
"comments": "",
- "x": 820.0003776550293,
- "y": 1612.4999017715454,
- "z": "ab45b2a0.2d254",
+ "x": 788.500358581543,
+ "y": 1588.4998025894165,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "ef75ff36.6e6a8",
+ "id": "60273371.090a2c",
"type": "returnFailure",
"name": "return failure",
"xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n <parameter name=\"error-message\" value=\"Error updating md-sal for connection-attachment-allotted-resource as cosumed allotted resource already exists.\" />\n",
"comments": "",
- "x": 2187.756992340088,
- "y": 843.6459283828735,
- "z": "ab45b2a0.2d254",
+ "x": 2156.2569732666016,
+ "y": 819.6458292007446,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "a32862a8.8af3d",
+ "id": "458ffc55.d5db04",
"type": "set",
"name": "set tmp.found-cidx",
"xml": "<set>\n<parameter name='tmp.found-cidx' value=\"`false`\" />\n\n\n",
"comments": "",
- "x": 1313.6461639404297,
- "y": 755.3126714229584,
- "z": "ab45b2a0.2d254",
+ "x": 1282.1461448669434,
+ "y": 731.3125722408295,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "46efcfd6.a7a1a",
+ "id": "9861d990.de9418",
"type": "comment",
"name": "Add to parent services provided-allotted-resources in mdsal",
"info": "",
"comments": "",
- "x": 702.2015266418457,
- "y": 939.9793558120728,
- "z": "ab45b2a0.2d254",
+ "x": 670.7015075683594,
+ "y": 915.9792566299438,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "b6eb1599.cd85e8",
+ "id": "3b543dd4.ce0012",
"type": "comment",
"name": "Add to allotted-resources in mdsal",
"info": "",
"comments": "",
- "x": 622.9687156677246,
- "y": 1225.969036102295,
- "z": "ab45b2a0.2d254",
+ "x": 591.4686965942383,
+ "y": 1201.968936920166,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "19566392.15832c",
+ "id": "43f948c5.8e3c48",
"type": "block",
"name": "block: atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1296.0000705718994,
- "y": 653.2778596878052,
- "z": "ab45b2a0.2d254",
+ "x": 1264.500051498413,
+ "y": 629.2777605056763,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "be105cba.576f"
+ "8dd70ad1.fb4fc8"
]
]
},
{
- "id": "be105cba.576f",
+ "id": "8dd70ad1.fb4fc8",
"type": "switchNode",
"name": "switch cr length",
"xml": "<switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 1483.8574504852295,
- "y": 653.8969950675964,
- "z": "ab45b2a0.2d254",
+ "x": 1452.3574314117432,
+ "y": 629.8968958854675,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "a5af4603.e786b8"
+ "fbc1bfeb.141c9"
]
]
},
{
- "id": "a5af4603.e786b8",
+ "id": "fbc1bfeb.141c9",
"type": "other",
"name": "outcome 1",
"xml": "<outcome value='1'>\n",
"comments": "",
"outputs": 1,
- "x": 1683.1905727386475,
- "y": 653.8970737457275,
- "z": "ab45b2a0.2d254",
+ "x": 1651.6905536651611,
+ "y": 629.8969745635986,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "2a3354d7.ee765c"
+ "fff5fcf9.b91b7"
]
]
},
{
- "id": "b07d75d2.a2b088",
+ "id": "cfbbadf0.d1c3a",
"type": "execute",
"name": "execute RestApiCallNode - get-resource connection-attachment-allotted-resource",
"xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ar-url`' />\n <parameter name='restapiUser' value='`$prop.controller.user`' />\n <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n <parameter name='format' value='json' />\n <parameter name='httpMethod' value='GET' />\n <parameter name=\"responsePrefix\" value=\"mdsal-ar\" />\n\n",
"comments": "",
"outputs": 1,
- "x": 768.000072479248,
- "y": 648.0001354217529,
- "z": "ab45b2a0.2d254",
+ "x": 736.5000534057617,
+ "y": 624.000036239624,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "66a512c5.0faacc",
- "9a3ff920.b9ec88"
+ "cd668aab.887ef8",
+ "bae083e9.e29fb"
]
]
},
{
- "id": "9a3ff920.b9ec88",
+ "id": "bae083e9.e29fb",
"type": "failure",
"name": "failure",
"xml": "<outcome value='failure'>\n",
"comments": "",
"outputs": 1,
- "x": 1136.0001029968262,
- "y": 618.0001335144043,
- "z": "ab45b2a0.2d254",
+ "x": 1104.5000839233398,
+ "y": 594.0000343322754,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "9cab679f.f79248"
+ "3e8fa261.9dd48e"
]
]
},
{
- "id": "9cab679f.f79248",
+ "id": "3e8fa261.9dd48e",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1288.0001029968262,
- "y": 617.0001335144043,
- "z": "ab45b2a0.2d254",
+ "x": 1256.5000839233398,
+ "y": 593.0000343322754,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "26fdc495.60ac0c",
+ "id": "e88d2834.1fdcf8",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 564.5556297302246,
- "y": 1567.6667528152466,
- "z": "ab45b2a0.2d254",
+ "x": 533.0556106567383,
+ "y": 1543.6666536331177,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "3267c7d4.904798",
- "77c2c758.5059b8"
+ "89eae9c8.150108",
+ "7cc17548.dbfedc"
]
]
},
{
- "id": "3267c7d4.904798",
+ "id": "89eae9c8.150108",
"type": "for",
"name": "for each sotn-get-request-input-param",
"xml": "<for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >\n",
"comments": "",
"outputs": 1,
- "x": 834.5556945800781,
- "y": 1567.6668004989624,
- "z": "ab45b2a0.2d254",
+ "x": 803.0556755065918,
+ "y": 1543.6667013168335,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "2605999a.01d556"
+ "a8e3f2e1.dc676"
]
]
},
{
- "id": "2051e6d6.e5a81a",
+ "id": "2789cf1d.918af",
"type": "comment",
"name": "Take the parameter names by removing prefix",
"info": "",
"comments": "",
- "x": 1374.555477142334,
- "y": 1523.6668338775635,
- "z": "ab45b2a0.2d254",
+ "x": 1343.0554580688477,
+ "y": 1499.6667346954346,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "43dec0c4.9aa5a",
+ "id": "b944f1f.576e11",
"type": "execute",
"name": "execute split parameterName",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
"comments": "",
"outputs": 1,
- "x": 1332.590145111084,
- "y": 1558.6459770202637,
- "z": "ab45b2a0.2d254",
+ "x": 1301.0901260375977,
+ "y": 1534.6458778381348,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "e2d39b7e.8a6eb8",
+ "id": "ab8b4370.c5cdb",
"type": "set",
"name": "set parameterName",
"xml": "<set>\n<parameter name=\"`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
"comments": "",
- "x": 1303.0346717834473,
- "y": 1591.6459770202637,
- "z": "ab45b2a0.2d254",
+ "x": 1271.534652709961,
+ "y": 1567.6458778381348,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "36eb754f.ed7b4a",
+ "id": "426abdbb.ca9194",
"type": "comment",
"name": "Remove VNFC prefix",
"info": "",
"comments": "",
- "x": 775.5556221008301,
- "y": 1535.1111145019531,
- "z": "ab45b2a0.2d254",
+ "x": 744.0556030273438,
+ "y": 1511.1110153198242,
+ "z": "f5fcb4a8.869698",
"wires": []
},
{
- "id": "2605999a.01d556",
+ "id": "a8e3f2e1.dc676",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">",
"atomic": "true",
"outputs": 1,
- "x": 1081.5555305480957,
- "y": 1566.1111450195312,
- "z": "ab45b2a0.2d254",
+ "x": 1050.0555114746094,
+ "y": 1542.1110458374023,
+ "z": "f5fcb4a8.869698",
"wires": [
[
- "43dec0c4.9aa5a",
- "e2d39b7e.8a6eb8"
+ "b944f1f.576e11",
+ "ab8b4370.c5cdb"
]
]
},
{
- "id": "e02c5c21.82a2",
+ "id": "c224a6bb.b7b288",
"type": "save",
"name": "save srcLTP relationship in AAI",
- "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
+ "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"allotted-resource:relationship-list\" \n\t\tkey=\"customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND\n\t\t\tservice-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND\n\t\t\tservice-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND\n\t\t\tallotted-resource.id = $tmp.ar.allotted-resource-id\" \n force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
"comments": "",
"outputs": 1,
- "x": 590.0041046142578,
- "y": 1988.0046367645264,
- "z": "ab45b2a0.2d254",
+ "x": 569.5040016174316,
+ "y": 1976.004249572754,
+ "z": "f5fcb4a8.869698",
"wires": [
[]
]
},
{
- "id": "bde5bdf6.37338",
+ "id": "c765719e.98d15",
"type": "set",
"name": "set src-ltpId",
"xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`\" />\n",
"comments": "",
- "x": 534.0001983642578,
- "y": 1952.0004014968872,
- "z": "ab45b2a0.2d254",
+ "x": 509.5000991821289,
+ "y": 1933.0003423690796,
+ "z": "f5fcb4a8.869698",
"wires": []
}
-]
+] \ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
index 212b3cb1..2a7ca5e8 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.json
@@ -1,20 +1,20 @@
[
{
- "id": "75ca7680.1d3a58",
+ "id": "341efa5d.3b64a6",
"type": "dgstart",
"name": "DGSTART",
"outputs": 1,
- "x": 115,
- "y": 94,
- "z": "1c0ed07d.5c9b3",
+ "x": 86,
+ "y": 31,
+ "z": "12958f29.9139d1",
"wires": [
[
- "129f94ba.7fe03b"
+ "6fe36a2a.e8f534"
]
]
},
{
- "id": "129f94ba.7fe03b",
+ "id": "6fe36a2a.e8f534",
"type": "service-logic",
"name": "GENERIC-RESOURCE-API ${project.version}",
"module": "GENERIC-RESOURCE-API",
@@ -22,1032 +22,1032 @@
"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": 333.49999237060547,
- "y": 174.9999928767793,
- "z": "1c0ed07d.5c9b3",
+ "x": 281.49999237060547,
+ "y": 100.99999287677929,
+ "z": "12958f29.9139d1",
"wires": [
[
- "436daa76.7579c4"
+ "2163ea38.5f8506"
]
]
},
{
- "id": "436daa76.7579c4",
+ "id": "2163ea38.5f8506",
"type": "method",
"name": "sotn-network-topology-operation-create",
"xml": "<method rpc='sotn-network-topology-operation-create' mode='sync'>\n",
"comments": "",
"outputs": 1,
- "x": 332.49999237060547,
- "y": 274.9999928767793,
- "z": "1c0ed07d.5c9b3",
+ "x": 280.49999237060547,
+ "y": 200.9999928767793,
+ "z": "12958f29.9139d1",
"wires": [
[
- "d7bbd3b7.969f1"
+ "1daa1b23.85b095"
]
]
},
{
- "id": "d7bbd3b7.969f1",
+ "id": "1daa1b23.85b095",
"type": "block",
"name": "block : atomic",
"xml": "<block atomic=\"true\">\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 472.49999237060547,
- "y": 374.9999928767793,
- "z": "1c0ed07d.5c9b3",
+ "x": 420.49999237060547,
+ "y": 300.9999928767793,
+ "z": "12958f29.9139d1",
"wires": [
[
- "5f387e8f.fd62",
- "eb116abb.3ac2e8",
- "4aa45281.84acec",
- "a532dc93.80ef6",
- "b1588e73.71447",
- "553a6b9e.729ec4",
- "36ffcb33.4e1fd4",
- "77abacf.f4efc54",
- "5a59ba8.9380644",
- "582840e.ea42fc",
- "fc2a5352.16901"
+ "1e60363f.72490a",
+ "83353300.c2eb9",
+ "a088e585.2065b8",
+ "238d29fd.4aeea6",
+ "f0b2c8c2.dc78a8",
+ "59d7449b.dee92c",
+ "26e9888d.5c8d38",
+ "8485dd7a.a3edc",
+ "db1f06f2.603038",
+ "939c727d.3556b",
+ "f50551ee.ae1a3"
]
]
},
{
- "id": "5f387e8f.fd62",
+ "id": "1e60363f.72490a",
"type": "call",
"name": "call GENERIC-RESOURCE-API:validate-sotn-network-input-parameters",
"xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-sotn-network-input-parameters' mode='sync' >\n",
"comments": "",
"outputs": 1,
- "x": 902.5000038146973,
- "y": 192.7777447993867,
- "z": "1c0ed07d.5c9b3",
+ "x": 850.5000038146973,
+ "y": 118.77774479938671,
+ "z": "12958f29.9139d1",
"wires": [
[]
]
},
{
- "id": "eb116abb.3ac2e8",
+ "id": "83353300.c2eb9",
"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=\"sotn-network-topology-operation-create\"/>\n<parameter name=\"field3\" value=\"SOTN-Config\"/>\n",
"comments": "",
"outputs": 1,
- "x": 696.0556488037109,
- "y": 370.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 644.0556488037109,
+ "y": 296.2222046852112,
+ "z": "12958f29.9139d1",
"wires": [
[]
]
},
{
- "id": "4aa45281.84acec",
+ "id": "a088e585.2065b8",
"type": "execute",
"name": "execute generate-sotn-vpn-network-id",
"xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.sotn.network-id\"/>\n",
"comments": "",
"outputs": 1,
- "x": 796.5000038146973,
- "y": 232.7777447993867,
- "z": "1c0ed07d.5c9b3",
+ "x": 744.5000038146973,
+ "y": 158.7777447993867,
+ "z": "12958f29.9139d1",
"wires": [
[]
]
},
{
- "id": "a532dc93.80ef6",
+ "id": "238d29fd.4aeea6",
"type": "switchNode",
"name": "switch service-data.networks_length",
"xml": "<switch test='`$service-data.networks.network_length`'>\n",
"comments": "",
"outputs": 1,
- "x": 789.0556564331055,
- "y": 321.2221913631074,
- "z": "1c0ed07d.5c9b3",
+ "x": 737.0556564331055,
+ "y": 247.2221913631074,
+ "z": "12958f29.9139d1",
"wires": [
[
- "d42a3b2a.ffbae8",
- "2876f1e7.3bf11e"
+ "ed404518.0f77e8",
+ "ad805a2f.932de8"
]
]
},
{
- "id": "d42a3b2a.ffbae8",
+ "id": "ed404518.0f77e8",
"type": "other",
"name": "Null",
"xml": "<outcome value=''>\n",
"comments": "",
"outputs": 1,
- "x": 1016.0556488037109,
- "y": 310.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 964.0556488037109,
+ "y": 236.22220468521118,
+ "z": "12958f29.9139d1",
"wires": [
[
- "fde1029e.0da77"
+ "7b7e8d7f.4eda74"
]
]
},
{
- "id": "2876f1e7.3bf11e",
+ "id": "ad805a2f.932de8",
"type": "other",
"name": "other",
"xml": "<outcome value='Other'>\n",
"comments": "",
"outputs": 1,
- "x": 1016.0556488037109,
- "y": 350.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 964.0556488037109,
+ "y": 276.2222046852112,
+ "z": "12958f29.9139d1",
"wires": [
[
- "895d1c39.9fd62"
+ "c276afed.a21aa"
]
]
},
{
- "id": "fde1029e.0da77",
+ "id": "7b7e8d7f.4eda74",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='0' />\n",
"comments": "",
- "x": 1158.555648803711,
- "y": 310.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 1106.555648803711,
+ "y": 236.22220468521118,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "e9c489d1.6bc028",
+ "id": "4ebe96fe.9f23b8",
"type": "set",
"name": "set nidx",
"xml": "<set>\n<parameter name='nidx' value='`$service-data.networks.network_length`' />\n",
"comments": "",
- "x": 1292.1111679077148,
- "y": 311.77781438827515,
- "z": "1c0ed07d.5c9b3",
+ "x": 1240.1111679077148,
+ "y": 237.77781438827515,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "b1588e73.71447",
+ "id": "f0b2c8c2.dc78a8",
"type": "set",
"name": "set network in service-data",
"xml": "<set>\n<parameter name='service-data.networks.network[$nidx].network-id' value='`$prop.sotn.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": 757.5556488037109,
- "y": 410.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 705.5556488037109,
+ "y": 336.2222046852112,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "553a6b9e.729ec4",
+ "id": "59d7449b.dee92c",
"type": "set",
"name": "set networkId and network-object-path",
"xml": "<set>\n<parameter name='networkId' value='`$prop.sotn.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.sotn.network-id + '/network-data/'` \" />",
"comments": "",
- "x": 793.0556488037109,
- "y": 450.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 741.0556488037109,
+ "y": 376.2222046852112,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "36ffcb33.4e1fd4",
+ "id": "26e9888d.5c8d38",
"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": 716.7224884033203,
- "y": 616.8889315128326,
- "z": "1c0ed07d.5c9b3",
+ "x": 664.7224884033203,
+ "y": 542.8889315128326,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "77abacf.f4efc54",
+ "id": "8485dd7a.a3edc",
"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": 764.5556488037109,
- "y": 490.2222046852112,
- "z": "1c0ed07d.5c9b3",
+ "x": 712.5556488037109,
+ "y": 416.2222046852112,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "5a59ba8.9380644",
+ "id": "db1f06f2.603038",
"type": "save",
"name": "save SOTN connectivity resource in AAI",
- "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<!--parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' /-->\n<!--parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' /-->\n<!--parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' /-->\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` \" />",
+ "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n key='connectivity.connectivity-id = $prop.sotn.network-id' >\n<parameter name='connectivity-id' value='`$prop.sotn.network-id`' />\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\n<parameter name='CBS' value='`$prop.sotn.cbs`' />\n<parameter name='EBS' value='`$prop.sotn.ebs`' />\n<parameter name='color-aware' value='`$prop.sotn.colorAware`' />\n<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />\n<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='access-provider-id' value='`$prop.sotn.access-provider-id`' />\n<parameter name='access-client-id' value='`$prop.sotn.access-client-id`' />\n<parameter name='access-topology-id' value='`$prop.sotn.access-topology-id`' />\n<parameter name='access-node-id' value='`$prop.sotn.access-node-id`' />\n<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />\n<parameter name='cvlan' value='`$prop.sotn.cVLAN`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` \" />",
"comments": "",
"outputs": 1,
- "x": 797.0556488037109,
- "y": 536.8888936042786,
- "z": "1c0ed07d.5c9b3",
+ "x": 745.0556488037109,
+ "y": 462.88889360427856,
+ "z": "12958f29.9139d1",
"wires": [
[]
]
},
{
- "id": "582840e.ea42fc",
+ "id": "939c727d.3556b",
"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=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />",
"comments": "",
"outputs": 1,
- "x": 772.0556602478027,
- "y": 574.666645526886,
- "z": "1c0ed07d.5c9b3",
+ "x": 720.0556602478027,
+ "y": 500.666645526886,
+ "z": "12958f29.9139d1",
"wires": [
[]
]
},
{
- "id": "7821c135.be528",
+ "id": "5a63d0be.0dd08",
"type": "for",
"name": "for each existing network",
"xml": "<for index='idx' start='0' end='`$nidx`' >\n",
"comments": "",
"outputs": 1,
- "x": 1161.5397109985352,
- "y": 454.99995657848194,
- "z": "1c0ed07d.5c9b3",
+ "x": 1109.5397109985352,
+ "y": 380.99995657848194,
+ "z": "12958f29.9139d1",
"wires": [
[
- "c1a7031.d1ed7"
+ "f2a7b4ef.7dee18"
]
]
},
{
- "id": "895d1c39.9fd62",
+ "id": "c276afed.a21aa",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1160.4126930236816,
- "y": 350.1587166786194,
- "z": "1c0ed07d.5c9b3",
+ "x": 1108.4126930236816,
+ "y": 276.1587166786194,
+ "z": "12958f29.9139d1",
"wires": [
[
- "7821c135.be528",
- "e9c489d1.6bc028"
+ "5a63d0be.0dd08",
+ "4ebe96fe.9f23b8"
]
]
},
{
- "id": "c1a7031.d1ed7",
+ "id": "f2a7b4ef.7dee18",
"type": "switchNode",
"name": "switch networkid found",
"xml": "<switch test=\"`$service-data.networks.network[$idx].network-id == $network-topology-operation-input.network-information.network-id`\">\n",
"comments": "",
"outputs": 1,
- "x": 1436.8254318237305,
- "y": 454.5714592640288,
- "z": "1c0ed07d.5c9b3",
+ "x": 1384.8254318237305,
+ "y": 380.5714592640288,
+ "z": "12958f29.9139d1",
"wires": [
[
- "9367b5e2.953668"
+ "69e5d9d8.6152c8"
]
]
},
{
- "id": "9367b5e2.953668",
+ "id": "69e5d9d8.6152c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1337.5556297302246,
- "y": 513.142890424002,
- "z": "1c0ed07d.5c9b3",
+ "x": 1285.5556297302246,
+ "y": 439.14289042400196,
+ "z": "12958f29.9139d1",
"wires": [
[
- "4001ac49.be63c4"
+ "2aa1e5e3.a3646a"
]
]
},
{
- "id": "2f9e76b8.9b7e8a",
+ "id": "7fda1459.886ccc",
"type": "comment",
"name": "make sure this network doesn't exist already",
"info": "",
"comments": "",
- "x": 1385.1904411315918,
- "y": 413.2540139858611,
- "z": "1c0ed07d.5c9b3",
+ "x": 1333.1904411315918,
+ "y": 339.2540139858611,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "4001ac49.be63c4",
+ "id": "2aa1e5e3.a3646a",
"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=\"network-topology-operation-input.network-request-input.network-id already found in service-data\" />\n",
"comments": "",
- "x": 1485.3057327270508,
- "y": 513.0000824928284,
- "z": "1c0ed07d.5c9b3",
+ "x": 1433.3057327270508,
+ "y": 439.00008249282837,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "e30a216c.06ee1",
+ "id": "bf34c45.8795338",
"type": "block",
"name": "block",
"xml": "<block>\n",
"atomic": "false",
"comments": "",
"outputs": 1,
- "x": 1451.9572257995605,
- "y": 282.77780199050903,
- "z": "1c0ed07d.5c9b3",
+ "x": 1399.9572257995605,
+ "y": 208.77780199050903,
+ "z": "12958f29.9139d1",
"wires": [
[
- "64587c87.c4ced4",
- "8393b82d.d5e438",
- "6c36148d.1e8d6c",
- "723317bf.383f98",
- "86d16c8d.31d4e",
- "26134e93.750692",
- "5c4d7e43.e8961",
- "729993a3.c5fcac",
- "14dc371b.e7d799",
- "b6721dfb.b1a0a",
- "a5bddbeb.2c8598",
- "9f8ad772.f86798",
- "6553f7b8.604f48",
- "ccf147e.f3f84b8",
- "ca42d623.87ba58"
+ "12be9566.c7eb7b",
+ "7bec5917.3ffc18",
+ "a1288c23.b615f",
+ "af84978c.aabb08",
+ "8d1b65f0.441d58",
+ "4a9af7ad.2879c8",
+ "ba3dcad9.481608",
+ "5806cf92.6a521",
+ "bd6407fd.e5e7e8",
+ "37b39115.cca1ce",
+ "5e46e6d8.c63f48",
+ "13ee1e74.912c62",
+ "79a54f85.8c9c5",
+ "d44eb5ab.296838",
+ "c0af4869.cb2978"
]
]
},
{
- "id": "64587c87.c4ced4",
+ "id": "12be9566.c7eb7b",
"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": 1710.178970336914,
- "y": 140.11110544204712,
- "z": "1c0ed07d.5c9b3",
+ "x": 1658.178970336914,
+ "y": 66.11110544204712,
+ "z": "12958f29.9139d1",
"wires": [
[
- "c4b37985.1946d8"
+ "ae97dc6a.f8715"
]
]
},
{
- "id": "c4b37985.1946d8",
+ "id": "ae97dc6a.f8715",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1897.178970336914,
- "y": 136.11110544204712,
- "z": "1c0ed07d.5c9b3",
+ "x": 1845.178970336914,
+ "y": 62.11110544204712,
+ "z": "12958f29.9139d1",
"wires": [
[
- "5fad2e08.81224"
+ "bc3e07b4.946d68"
]
]
},
{
- "id": "5fad2e08.81224",
+ "id": "bc3e07b4.946d68",
"type": "set",
"name": "set name",
"xml": "<set>\n<parameter name='prop.sotn.etht-svc-name' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2047.179100036621,
- "y": 134.7111120223999,
- "z": "1c0ed07d.5c9b3",
+ "x": 1995.179100036621,
+ "y": 60.7111120223999,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "8393b82d.d5e438",
+ "id": "7bec5917.3ffc18",
"type": "switchNode",
"name": "switch description",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'description'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1721.0186309814453,
- "y": 180.1111035346985,
- "z": "1c0ed07d.5c9b3",
+ "x": 1669.0186309814453,
+ "y": 106.11110353469849,
+ "z": "12958f29.9139d1",
"wires": [
[
- "e7f48cb.3fc207"
+ "39bacf03.cf3f9"
]
]
},
{
- "id": "e7f48cb.3fc207",
+ "id": "39bacf03.cf3f9",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1891.0186309814453,
- "y": 176.1111035346985,
- "z": "1c0ed07d.5c9b3",
+ "x": 1839.0186309814453,
+ "y": 102.11110353469849,
+ "z": "12958f29.9139d1",
"wires": [
[
- "5c031099.8cebf"
+ "5f54eacf.46e154"
]
]
},
{
- "id": "5c031099.8cebf",
+ "id": "5f54eacf.46e154",
"type": "set",
"name": "set etht-svc-descr",
"xml": "<set>\n<parameter name='prop.sotn.etht-svc-descr' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2078.352071762085,
- "y": 174.57226037979126,
- "z": "1c0ed07d.5c9b3",
+ "x": 2026.352071762085,
+ "y": 100.57226037979126,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "fc2a5352.16901",
+ "id": "f50551ee.ae1a3",
"type": "for",
"name": "for loop i - 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": 790.7343673706055,
- "y": 281.5555348689668,
- "z": "1c0ed07d.5c9b3",
+ "x": 738.7343673706055,
+ "y": 207.5555348689668,
+ "z": "12958f29.9139d1",
"wires": [
[
- "e30a216c.06ee1"
+ "bf34c45.8795338"
]
]
},
{
- "id": "6c36148d.1e8d6c",
+ "id": "a1288c23.b615f",
"type": "switchNode",
"name": "switch tenantId",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'tenantId'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1711.4010124206543,
- "y": 223.44443082809448,
- "z": "1c0ed07d.5c9b3",
+ "x": 1659.4010124206543,
+ "y": 149.44443082809448,
+ "z": "12958f29.9139d1",
"wires": [
[
- "b44c76e.15dfe88"
+ "85b237c8.6a5728"
]
]
},
{
- "id": "b44c76e.15dfe88",
+ "id": "85b237c8.6a5728",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1898.4010124206543,
- "y": 219.44443082809448,
- "z": "1c0ed07d.5c9b3",
+ "x": 1846.4010124206543,
+ "y": 145.44443082809448,
+ "z": "12958f29.9139d1",
"wires": [
[
- "96f73c26.559e8"
+ "1f01ba7.909de46"
]
]
},
{
- "id": "96f73c26.559e8",
+ "id": "1f01ba7.909de46",
"type": "set",
"name": "set tenantId",
"xml": "<set>\n<parameter name='prop.sotn.tenantId' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2066.4010124206543,
- "y": 220.0444369316101,
- "z": "1c0ed07d.5c9b3",
+ "x": 2014.4010124206543,
+ "y": 146.0444369316101,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "723317bf.383f98",
+ "id": "af84978c.aabb08",
"type": "switchNode",
"name": "switch cir",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cir'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1693.2406692504883,
- "y": 313.4444890022278,
- "z": "1c0ed07d.5c9b3",
+ "x": 1641.2406692504883,
+ "y": 239.44448900222778,
+ "z": "12958f29.9139d1",
"wires": [
[
- "1a52097e.d09ff7"
+ "68c32198.953bc"
]
]
},
{
- "id": "1a52097e.d09ff7",
+ "id": "68c32198.953bc",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1901.240737915039,
- "y": 309.4445023536682,
- "z": "1c0ed07d.5c9b3",
+ "x": 1849.240737915039,
+ "y": 235.4445023536682,
+ "z": "12958f29.9139d1",
"wires": [
[
- "f62306dc.1325f8"
+ "fcd5f3e.122b91"
]
]
},
{
- "id": "f62306dc.1325f8",
+ "id": "fcd5f3e.122b91",
"type": "set",
"name": "set cir",
"xml": "<set>\n<parameter name='prop.sotn.cir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2050.574058532715,
- "y": 307.9056496620178,
- "z": "1c0ed07d.5c9b3",
+ "x": 1998.5740585327148,
+ "y": 233.90564966201782,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "86d16c8d.31d4e",
+ "id": "8d1b65f0.441d58",
"type": "switchNode",
"name": "switch vpnType",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'vpnType'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1712.5491409301758,
- "y": 267.2222080230713,
- "z": "1c0ed07d.5c9b3",
+ "x": 1660.5491409301758,
+ "y": 193.2222080230713,
+ "z": "12958f29.9139d1",
"wires": [
[
- "703f29bd.fdd258"
+ "aeee7e59.41fe6"
]
]
},
{
- "id": "703f29bd.fdd258",
+ "id": "aeee7e59.41fe6",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1899.5491409301758,
- "y": 263.2222080230713,
- "z": "1c0ed07d.5c9b3",
+ "x": 1847.5491409301758,
+ "y": 189.2222080230713,
+ "z": "12958f29.9139d1",
"wires": [
[
- "ebf1a004.f1ef9"
+ "efbe141c.2693e8"
]
]
},
{
- "id": "ebf1a004.f1ef9",
+ "id": "efbe141c.2693e8",
"type": "set",
"name": "set vpnType",
"xml": "<set>\n<parameter name='prop.sotn.vpnType' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2068.8827743530273,
- "y": 260.68337297439575,
- "z": "1c0ed07d.5c9b3",
+ "x": 2016.8827743530273,
+ "y": 186.68337297439575,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "26134e93.750692",
+ "id": "4a9af7ad.2879c8",
"type": "switchNode",
"name": "switch access-provider-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-provider-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1734.030776977539,
- "y": 589.6667265892029,
- "z": "1c0ed07d.5c9b3",
+ "x": 1682.030776977539,
+ "y": 515.6667265892029,
+ "z": "12958f29.9139d1",
"wires": [
[
- "4515fd29.b598c4"
+ "8268dacb.9b51a8"
]
]
},
{
- "id": "5c4d7e43.e8961",
+ "id": "ba3dcad9.481608",
"type": "switchNode",
"name": "switch access-client-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-client-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1726.5862579345703,
- "y": 635.0000557899475,
- "z": "1c0ed07d.5c9b3",
+ "x": 1674.5862579345703,
+ "y": 561.0000557899475,
+ "z": "12958f29.9139d1",
"wires": [
[
- "47c3d65c.233b78"
+ "a95546f9.dbc8c8"
]
]
},
{
- "id": "729993a3.c5fcac",
+ "id": "5806cf92.6a521",
"type": "switchNode",
"name": "switch access-topology-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-topology-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1731.0307159423828,
- "y": 673.8889412879944,
- "z": "1c0ed07d.5c9b3",
+ "x": 1679.0307159423828,
+ "y": 599.8889412879944,
+ "z": "12958f29.9139d1",
"wires": [
[
- "c3fc1f87.71129"
+ "2720e3f9.d49aac"
]
]
},
{
- "id": "4515fd29.b598c4",
+ "id": "8268dacb.9b51a8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1918.030776977539,
- "y": 588.666741847992,
- "z": "1c0ed07d.5c9b3",
+ "x": 1866.030776977539,
+ "y": 514.666741847992,
+ "z": "12958f29.9139d1",
"wires": [
[
- "48e66b6b.492674"
+ "4e3a7098.974c8"
]
]
},
{
- "id": "47c3d65c.233b78",
+ "id": "a95546f9.dbc8c8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1913.5862579345703,
- "y": 631.0000557899475,
- "z": "1c0ed07d.5c9b3",
+ "x": 1861.5862579345703,
+ "y": 557.0000557899475,
+ "z": "12958f29.9139d1",
"wires": [
[
- "d6533a63.6dbd38"
+ "640cc28a.98572c"
]
]
},
{
- "id": "c3fc1f87.71129",
+ "id": "2720e3f9.d49aac",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1918.0307159423828,
- "y": 669.8889412879944,
- "z": "1c0ed07d.5c9b3",
+ "x": 1866.0307159423828,
+ "y": 595.8889412879944,
+ "z": "12958f29.9139d1",
"wires": [
[
- "7c60d7e3.12f4c8"
+ "21bffbdb.c6eb94"
]
]
},
{
- "id": "48e66b6b.492674",
+ "id": "4e3a7098.974c8",
"type": "set",
"name": "set access-provider-id",
"xml": "<set>\n<parameter name='prop.sotn.access-provider-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2101.2531356811523,
- "y": 587.7779259681702,
- "z": "1c0ed07d.5c9b3",
+ "x": 2049.2531356811523,
+ "y": 513.7779259681702,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "d6533a63.6dbd38",
+ "id": "640cc28a.98572c",
"type": "set",
"name": "set access-client-id",
"xml": "<set>\n<parameter name='prop.sotn.access-client-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2090.14217376709,
- "y": 629.0105323791504,
- "z": "1c0ed07d.5c9b3",
+ "x": 2038.1421737670898,
+ "y": 555.0105323791504,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "7c60d7e3.12f4c8",
+ "id": "21bffbdb.c6eb94",
"type": "set",
"name": "set access-topology-id",
"xml": "<set>\n<parameter name='prop.sotn.access-topology-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2100.031089782715,
- "y": 667.8993887901306,
- "z": "1c0ed07d.5c9b3",
+ "x": 2048.031089782715,
+ "y": 593.8993887901306,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "14dc371b.e7d799",
+ "id": "bd6407fd.e5e7e8",
"type": "switchNode",
"name": "switch access-node-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-node-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1731.845474243164,
- "y": 720.5555849075317,
- "z": "1c0ed07d.5c9b3",
+ "x": 1679.845474243164,
+ "y": 646.5555849075317,
+ "z": "12958f29.9139d1",
"wires": [
[
- "d1fbb326.d667a"
+ "7f7eda44.4baf24"
]
]
},
{
- "id": "d1fbb326.d667a",
+ "id": "7f7eda44.4baf24",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1918.845474243164,
- "y": 716.5555849075317,
- "z": "1c0ed07d.5c9b3",
+ "x": 1866.845474243164,
+ "y": 642.5555849075317,
+ "z": "12958f29.9139d1",
"wires": [
[
- "aecd373e.842bf8"
+ "932f3665.ab2778"
]
]
},
{
- "id": "b6721dfb.b1a0a",
+ "id": "37b39115.cca1ce",
"type": "switchNode",
"name": "switch access-ltp-id",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'access-ltp-id'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1728.6232452392578,
- "y": 763.0000615119934,
- "z": "1c0ed07d.5c9b3",
+ "x": 1676.6232452392578,
+ "y": 689.0000615119934,
+ "z": "12958f29.9139d1",
"wires": [
[
- "3439641.1ff369c"
+ "da95a048.53cf8"
]
]
},
{
- "id": "3439641.1ff369c",
+ "id": "da95a048.53cf8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1915.6232452392578,
- "y": 759.0000615119934,
- "z": "1c0ed07d.5c9b3",
+ "x": 1863.6232452392578,
+ "y": 685.0000615119934,
+ "z": "12958f29.9139d1",
"wires": [
[
- "668b4d7f.54d754"
+ "4432e921.5fd6d8"
]
]
},
{
- "id": "aecd373e.842bf8",
+ "id": "932f3665.ab2778",
"type": "set",
"name": "set access-node-id",
"xml": "<set>\n<parameter name='prop.sotn.access-node-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2090.84578704834,
- "y": 715.2327189445496,
- "z": "1c0ed07d.5c9b3",
+ "x": 2038.8457870483398,
+ "y": 641.2327189445496,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "668b4d7f.54d754",
+ "id": "4432e921.5fd6d8",
"type": "set",
"name": "set access-ltp-id",
"xml": "<set>\n<parameter name='prop.sotn.access-ltp-id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2081.289939880371,
- "y": 758.0104908943176,
- "z": "1c0ed07d.5c9b3",
+ "x": 2029.289939880371,
+ "y": 684.0104908943176,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "a5bddbeb.2c8598",
+ "id": "5e46e6d8.c63f48",
"type": "switchNode",
"name": "switch eir",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'eir'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1694.531120300293,
- "y": 356.1423554420471,
- "z": "1c0ed07d.5c9b3",
+ "x": 1642.531120300293,
+ "y": 282.1423554420471,
+ "z": "12958f29.9139d1",
"wires": [
[
- "b200bce6.41ba6"
+ "fc17f5c5.ae3be8"
]
]
},
{
- "id": "b200bce6.41ba6",
+ "id": "fc17f5c5.ae3be8",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1896.5310821533203,
- "y": 351.14237546920776,
- "z": "1c0ed07d.5c9b3",
+ "x": 1844.5310821533203,
+ "y": 277.14237546920776,
+ "z": "12958f29.9139d1",
"wires": [
[
- "179fefa2.e4ec6"
+ "5963427e.099eec"
]
]
},
{
- "id": "179fefa2.e4ec6",
+ "id": "5963427e.099eec",
"type": "set",
"name": "set eir",
"xml": "<set>\n<parameter name='prop.sotn.eir' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2052.864585876465,
- "y": 350.6035113334656,
- "z": "1c0ed07d.5c9b3",
+ "x": 2000.8645858764648,
+ "y": 276.6035113334656,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "9f8ad772.f86798",
+ "id": "13ee1e74.912c62",
"type": "switchNode",
"name": "switch cbs",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'cbs'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1694.531120300293,
- "y": 405.1423554420471,
- "z": "1c0ed07d.5c9b3",
+ "x": 1642.531120300293,
+ "y": 331.1423554420471,
+ "z": "12958f29.9139d1",
"wires": [
[
- "9fcff056.2543f"
+ "52037d34.46c984"
]
]
},
{
- "id": "9fcff056.2543f",
+ "id": "52037d34.46c984",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1893.5310821533203,
- "y": 401.14236211776733,
- "z": "1c0ed07d.5c9b3",
+ "x": 1841.5310821533203,
+ "y": 327.14236211776733,
+ "z": "12958f29.9139d1",
"wires": [
[
- "a1886f40.011c"
+ "87d5db86.520f08"
]
]
},
{
- "id": "a1886f40.011c",
+ "id": "87d5db86.520f08",
"type": "set",
"name": "set cbs",
"xml": "<set>\n<parameter name='prop.sotn.cbs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2051.864646911621,
- "y": 399.60352182388306,
- "z": "1c0ed07d.5c9b3",
+ "x": 1999.864646911621,
+ "y": 325.60352182388306,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "6553f7b8.604f48",
+ "id": "79a54f85.8c9c5",
"type": "switchNode",
"name": "switch ebs",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'ebs'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1694.531120300293,
- "y": 450.1423554420471,
- "z": "1c0ed07d.5c9b3",
+ "x": 1642.531120300293,
+ "y": 376.1423554420471,
+ "z": "12958f29.9139d1",
"wires": [
[
- "4251079.c8008f8"
+ "c2f96fa0.ad15c"
]
]
},
{
- "id": "4251079.c8008f8",
+ "id": "c2f96fa0.ad15c",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1893.5310821533203,
- "y": 443.14236307144165,
- "z": "1c0ed07d.5c9b3",
+ "x": 1841.5310821533203,
+ "y": 369.14236307144165,
+ "z": "12958f29.9139d1",
"wires": [
[
- "d1fd139b.e3892"
+ "9e90ea61.5694f8"
]
]
},
{
- "id": "d1fd139b.e3892",
+ "id": "9e90ea61.5694f8",
"type": "set",
"name": "set ebs",
"xml": "<set>\n<parameter name='prop.sotn.ebs' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2054.864646911621,
- "y": 444.60352182388306,
- "z": "1c0ed07d.5c9b3",
+ "x": 2002.864646911621,
+ "y": 370.60352182388306,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "ccf147e.f3f84b8",
+ "id": "d44eb5ab.296838",
"type": "switchNode",
"name": "switch colorAware",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'colorAware'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1716.5312042236328,
- "y": 497.1423726081848,
- "z": "1c0ed07d.5c9b3",
+ "x": 1664.5312042236328,
+ "y": 423.1423726081848,
+ "z": "12958f29.9139d1",
"wires": [
[
- "b84d7f0e.a9757"
+ "b8905300.a37c5"
]
]
},
{
- "id": "b84d7f0e.a9757",
+ "id": "b8905300.a37c5",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1894.53120803833,
- "y": 491.1423649787903,
- "z": "1c0ed07d.5c9b3",
+ "x": 1842.53120803833,
+ "y": 417.1423649787903,
+ "z": "12958f29.9139d1",
"wires": [
[
- "72e50f94.71d84"
+ "a701fe84.51e22"
]
]
},
{
- "id": "72e50f94.71d84",
+ "id": "a701fe84.51e22",
"type": "set",
"name": "set colorAware",
"xml": "<set>\n<parameter name='prop.sotn.colorAware' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2075.864585876465,
- "y": 490.6035237312317,
- "z": "1c0ed07d.5c9b3",
+ "x": 2023.8645858764648,
+ "y": 416.6035237312317,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "ca42d623.87ba58",
+ "id": "c0af4869.cb2978",
"type": "switchNode",
"name": "switch couplingFlag",
"xml": "<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'couplingFlag'`\">\n",
"comments": "",
"outputs": 1,
- "x": 1716.5312118530273,
- "y": 543.142397403717,
- "z": "1c0ed07d.5c9b3",
+ "x": 1664.5312118530273,
+ "y": 469.14239740371704,
+ "z": "12958f29.9139d1",
"wires": [
[
- "40eab97.899c148"
+ "b6ad72cc.3d503"
]
]
},
{
- "id": "40eab97.899c148",
+ "id": "b6ad72cc.3d503",
"type": "outcomeTrue",
"name": "true",
"xml": "<outcome value='true'>\n",
"comments": "",
"outputs": 1,
- "x": 1894.5312042236328,
- "y": 535.1423659324646,
- "z": "1c0ed07d.5c9b3",
+ "x": 1842.5312042236328,
+ "y": 461.1423659324646,
+ "z": "12958f29.9139d1",
"wires": [
[
- "af755d0d.ba992"
+ "189417c4.cf2b18"
]
]
},
{
- "id": "af755d0d.ba992",
+ "id": "189417c4.cf2b18",
"type": "set",
"name": "set couplingFlag",
"xml": "<set>\n<parameter name='prop.sotn.couplingFlag' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
"comments": "",
- "x": 2079.864585876465,
- "y": 535.6035485267639,
- "z": "1c0ed07d.5c9b3",
+ "x": 2027.8645858764648,
+ "y": 461.6035485267639,
+ "z": "12958f29.9139d1",
"wires": []
},
{
- "id": "e55153cb.9f1cd",
+ "id": "75b2fbdb.c98244",
"type": "comment",
"name": "TODO: Recheck AAI schemas",
"info": "",
"comments": "",
- "x": 761.0312728881836,
- "y": 139.14243173599243,
- "z": "1c0ed07d.5c9b3",
+ "x": 709.0312728881836,
+ "y": 65.14243173599243,
+ "z": "12958f29.9139d1",
"wires": []
}
-] \ No newline at end of file
+]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
index 75d05fa2..f86a75ff 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-attachment-topology-operation-create.xml
@@ -247,7 +247,8 @@ value="`$connection-attachment-ar-identifiers.`" />
<parameter name="role" value="`$prop.connection-attachment.role`" />
<parameter name="vpn-name" value="`$prop.connection-attachment.sdwanVpnName`" />
<parameter name="selflink" value="`$tmp.ar.self-link`" />
- <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
+ <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+ <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
<parameter name="operational-status" value="Created" />
<outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
index 5b00ed19..c6147a0d 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sdwan-get-site-param.xml
@@ -108,6 +108,12 @@
</switch>
<switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].name == 'controlPoint'`">
<outcome value='true'>
+ <block>
+ <switch test="`$vnf-request-input.vnf-input-parameters.param[$idx].value`">
+ <outcome value=''>
+ <block></block>
+ </outcome>
+ <outcome value='Other'>
<block atomic="true">
<set>
<parameter name='prop.site.controlPoint' value='`$vnf-request-input.vnf-input-parameters.param[$idx].value`' />
@@ -117,6 +123,9 @@
<parameter name="regex" value=","/>
<parameter name="ctx_memory_result_key" value="prop.site.controlpoints"/>
</execute>
+ </block>
+ </outcome>
+ </switch>
</block>
</outcome>
</switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
index 073b4210..819c02ba 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-attachment-topology-operation-create.xml
@@ -1,295 +1,296 @@
-<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='sotn-attachment-topology-operation-create' mode='sync'>
- <block atomic="true">
- <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
- <outcome value=''>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
- <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
- <outcome value='failure'>
- <return status='failure'>
- <parameter name='error-code' value='' />
- <parameter name='error-message' value="An error occured while generation allotted resource ID" />
- </return>
- </outcome>
- </execute>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
- </set>
- </outcome>
- </switch>
- <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
- <outcome value=''>
- <set>
- <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
- </set>
- </outcome>
- <outcome value='Other'>
- <set>
- <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
- </set>
- </outcome>
- </switch>
- <set>
- <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
- + $tmp.ar.allotted-resource-id
- + '/allotted-resource-data/connection-attachment-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.connection-attachment-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='failure'>
- <block></block>
- </outcome>
- <outcome value='success'>
- <block atomic="true">
- <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
- <outcome value='1'>
- <return status='failure'>
- <parameter name='ack-final' value='Y'/>
- <parameter name="error-code" value="500" />
- <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
- </return>
- </outcome>
- </switch>
- </block>
- </outcome>
- </execute>
- <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">
- <set>
- <parameter name='tmp.found-cidx' value="`false`" />
- </set>
- <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'>
- <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 connection-attachment-allotted-resource as cosumed allotted resource already exists." />
- </return>
- </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="`$connection-attachment-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>
- <set>
- <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
- </set>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
- <parameter name="outputPath" value="tmp.parent-ar-url"/>
- <parameter name="target" value="{service-instance-id}"/>
- <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
- </execute>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
- <parameter name="source" value="`$tmp.parent-ar-url`"/>
- <parameter name="outputPath" value="tmp.parent-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='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
- <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-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="parent" />
- <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 connection-attachment-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 connection-attachment-allotted-resource" />
- </return>
- </outcome>
- </execute>
- <set>
- <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
- <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
- <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
- <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
- </set>
- <set>
- <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
- <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
- <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
- <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
- </set>
- <set>
- <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.'
-value="`$connection-attachment-ar-identifiers.`" />
- </set>
- <set>
- <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
- </set>
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
- <parameter name="outputPath" value="tmp.current-time" />
- </execute>
- <set>
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
- <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
- </set>
- <block atomic="true">
- <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
- <block atomic="true">
- <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
- <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
- <parameter name="regex" value="_"/>
- <parameter name="ctx_memory_result_key" value="param-prefix"/>
- </execute>
- <set>
- <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
- </set>
- </block>
- </for>
- <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
- </block>
- <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
- <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.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 connection-attachment-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 connection-attachment-allotted-resource" />
- </return>
- </outcome>
- </execute>
- <set>
- <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
- <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
- <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
- + $connection-attachment-topology-operation-input.service-information.service-instance-id
- + '/service-data/service-topology/'`"/>
- </set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="allotted-resource"
- key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
- service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
- service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
- allotted-resource.id = $tmp.ar.allotted-resource-id"
- pfx='pfx' local-only='false' force='false'>
- <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
- <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
- <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
- <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
- <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
- <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
- <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
- <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
- <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
- <parameter name="selflink" value="`$tmp.ar.self-link`" />
- <!--parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" /><parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" /-->
- <parameter name="operational-status" value="Created" />
- <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>
- </save>
- <set>
- <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
- </set>
- <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
- resource="allotted-resource"
- key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
- service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
- service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
- allotted-resource.id = $tmp.ar.allotted-resource-id"
- force="true" pfx="tmp.AnAI-data">
- <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
- <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
- <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
- </save>
- <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='sotn-attachment-topology-operation-create' mode='sync'>
+ <block atomic="true">
+ <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`'>
+ <outcome value=''>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+ <parameter name="ctx-destination" value="tmp.ar.allotted-resource-id"/>
+ <outcome value='failure'>
+ <return status='failure'>
+ <parameter name='error-code' value='' />
+ <parameter name='error-message' value="An error occured while generation allotted resource ID" />
+ </return>
+ </outcome>
+ </execute>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='tmp.ar.allotted-resource-id' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-id`' />
+ </set>
+ </outcome>
+ </switch>
+ <switch test='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`'>
+ <outcome value=''>
+ <set>
+ <parameter name='tmp.ar.allotted-resource-type' value="SOTNAttachmentInstance" />
+ </set>
+ </outcome>
+ <outcome value='Other'>
+ <set>
+ <parameter name='tmp.ar.allotted-resource-type' value='`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type`' />
+ </set>
+ </outcome>
+ </switch>
+ <set>
+ <parameter name='tmp.ar.self-link' value="`'restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/'
+ + $tmp.ar.allotted-resource-id
+ + '/allotted-resource-data/connection-attachment-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.connection-attachment-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='failure'>
+ <block></block>
+ </outcome>
+ <outcome value='success'>
+ <block atomic="true">
+ <switch test='`$mdsal-ar.connection-attachment-allotted-resource_length`'>
+ <outcome value='1'>
+ <return status='failure'>
+ <parameter name='ack-final' value='Y'/>
+ <parameter name="error-code" value="500" />
+ <parameter name="error-message" value="Error: Existing connection attachment allotted resource" />
+ </return>
+ </outcome>
+ </switch>
+ </block>
+ </outcome>
+ </execute>
+ <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">
+ <set>
+ <parameter name='tmp.found-cidx' value="`false`" />
+ </set>
+ <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'>
+ <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 connection-attachment-allotted-resource as cosumed allotted resource already exists." />
+ </return>
+ </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="`$connection-attachment-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>
+ <set>
+ <parameter name='tmp.ar.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$prop.restapi.parent-provided-resource`"/>
+ <parameter name="outputPath" value="tmp.parent-ar-url"/>
+ <parameter name="target" value="{service-instance-id}"/>
+ <parameter name="replacement" value="`$tmp.ar.parent-service-instance-id`"/>
+ </execute>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >
+ <parameter name="source" value="`$tmp.parent-ar-url`"/>
+ <parameter name="outputPath" value="tmp.parent-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='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.parentsvc.templatefile`" />
+ <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.parent-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="parent" />
+ <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 connection-attachment-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 connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ <parameter name='connection-attachment-ar.allotted-resource-status.action' value="`$connection-attachment-topology-operation-input.request-information.request-action` " />
+ <parameter name='connection-attachment-ar.allotted-resource-status.rpc-name' value="connection-attachment-topology-operation" />
+ <parameter name='connection-attachment-ar.allotted-resource-status.rpc-action' value="`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.request-information.' value="`$connection-attachment-topology-operation-input.request-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.sdnc-request-header.' value="`$connection-attachment-topology-operation-input.sdnc-request-header.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.service-information.' value="`$connection-attachment-topology-operation-input.service-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.allotted-resource-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.` " />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.' value="`$connection-attachment-topology-operation-input.connection-attachment-request-input.` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar-identifiers.consuming-service-instance-id' value="`$connection-attachment-topology-operation-input.service-information.service-instance-id` " />
+ <parameter name='connection-attachment-ar-identifiers.parent-service-instance-id' value="`$connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id` " />
+ <parameter name='connection-attachment-ar-identifiers.allotted-resource-type' value="`$connection-attachment-topology-operation-input.allotted-resource-information.allotted-resource-type` " />
+ <parameter name='connection-attachment-ar-identifiers.allotted-resource-id' value="`$tmp.ar.allotted-resource-id` " />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.allotted-resource-identifiers.'
+value="`$connection-attachment-ar-identifiers.`" />
+ </set>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.connection-attachment-topology.onap-model-information.' value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.` " />
+ </set>
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='setTime' >
+ <parameter name="outputPath" value="tmp.current-time" />
+ </execute>
+ <set>
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.order-status' value='Created' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-action' value='`$connection-attachment-topology-operation-input.request-information.request-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-rpc-action' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-action`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.last-svc-request-id' value='`$connection-attachment-topology-operation-input.sdnc-request-header.svc-request-id`' />
+ <parameter name='connection-attachment-ar.allotted-resource-data.allotted-resource-oper-status.create-timestamp' value='`$tmp.current-time`' />
+ </set>
+ <block atomic="true">
+ <for index='i' start='0' end='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param_length`' >
+ <block atomic="true">
+ <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+ <parameter name="original_string" value='`$connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`'/>
+ <parameter name="regex" value="_"/>
+ <parameter name="ctx_memory_result_key" value="param-prefix"/>
+ </execute>
+ <set>
+ <parameter name="`connection-attachment-ar.allotted-resource-data.allotted-resource-operation-information.connection-attachment-request-input.param[$i].name`" value='`$param-prefix[$param-prefix_length -1]`'/>
+ </set>
+ </block>
+ </for>
+ <call module='GENERIC-RESOURCE-API' rpc='sotn-get-saved-ar-param' mode='sync' ></call>
+ </block>
+ <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+ <parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.sotn-attachment.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 connection-attachment-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 connection-attachment-allotted-resource" />
+ </return>
+ </outcome>
+ </execute>
+ <set>
+ <parameter name='allotted-resource-id' value='`$tmp.ar.allotted-resource-id`' />
+ <parameter name='connection-attachment-object-path' value="`$tmp.ar.self-link`"/>
+ <parameter name='service-object-path' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'
+ + $connection-attachment-topology-operation-input.service-information.service-instance-id
+ + '/service-data/service-topology/'`"/>
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="allotted-resource"
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id"
+ pfx='pfx' local-only='false' force='false'>
+ <parameter name="id" value="`$tmp.ar.allotted-resource-id`" />
+ <parameter name="name" value="`$prop.connection-attachment.sotnVpnName`" />
+ <parameter name="access-provider-id" value="`$prop.connection-attachment.access-provider-id`" />
+ <parameter name="access-client-id" value="`$prop.connection-attachment.access-client-id`" />
+ <parameter name="access-topology-id" value="`$prop.connection-attachment.access-topology-id`" />
+ <parameter name="access-node-id" value="`$prop.connection-attachment.access-node-id`" />
+ <parameter name="access-ltp-id" value="`$prop.connection-attachment.access-ltp-id`" />
+ <parameter name="cvlan" value="`$prop.connection-attachment.cVLAN`" />
+ <parameter name="vpn-name" value="`$prop.connection-attachment.sotnVpnName`" />
+ <parameter name="selflink" value="`$tmp.ar.self-link`" />
+ <parameter name="model-invariant-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-invariant-uuid`" />
+ <parameter name="model-version-id" value="`$connection-attachment-topology-operation-input.allotted-resource-information.onap-model-information.model-uuid`" />
+ <parameter name="operational-status" value="Created" />
+ <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>
+ </save>
+ <set>
+ <parameter name='src-ltpId' value="`'nodeId-' + $prop.connection-attachment.access-node-id + '-ltpId-' + $prop.connection-attachment.access-ltp-id`" />
+ </set>
+ <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+ resource="allotted-resource:relationship-list"
+ key="customer.global-customer-id = $connection-attachment-topology-operation-input.service-information.global-customer-id AND
+ service-subscription.service-type = $connection-attachment-topology-operation-input.service-information.subscription-service-type AND
+ service-instance.service-instance-id = $connection-attachment-topology-operation-input.allotted-resource-information.parent-service-instance-id AND
+ allotted-resource.id = $tmp.ar.allotted-resource-id"
+ force="true" pfx="tmp.AnAI-data">
+ <parameter name="relationship-list.relationship[0].related-to" value="p-interface" />
+ <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $prop.connection-attachment.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="p-interface.interface-name" />
+ <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$src-ltpId`" />
+ </save>
+ <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
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
index e5e6d079..af67bd68 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_sotn-network-topology-operation-create.xml
@@ -184,9 +184,9 @@
<parameter name='access-ltp-id' value='`$prop.sotn.access-ltp-id`' />
<parameter name='cvlan' value='`$prop.sotn.cVLAN`' />
<parameter name='operational-status' value='Created' />
- <!--parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' /-->
- <!--parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' /-->
- <!--parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' /-->
+ <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+ <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+ <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
<parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/' + $network-topology-operation-input.service-information.service-instance-id + '/service-data/networks/network/' + $prop.sotn.network-id + '/network-data/'` " />
</save>
<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'