Bug fixing in DGs related to network and links storing in AAI.

Issue-ID: SDNC-899

Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
Change-Id: I09df4dd299ebb02386312a58806404cc2ae27b8c
(cherry picked from commit cb78477d4a74b0ab703c1027fffe11b5c17e7335 [formerly 72d0ed54d160546f494781bca5aa0f574d84748d])

Former-commit-id: 49d2e92f91c8d5b65600eaa61b1104f9efca3bd3

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
index 442a44e..9c07e5f 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "3dae3829.6d50d8",
+    "id": "5858bb6c.1c5b2c",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 140,
-    "y": 83,
-    "z": "5fc7c3fb.48a444",
+    "x": 116,
+    "y": 67,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "de2fffb7.c073f8"
+        "350dfcb7.24e654"
       ]
     ]
   },
   {
-    "id": "de2fffb7.c073f8",
+    "id": "350dfcb7.24e654",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,264 +22,890 @@
     "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='DataChange' version='${project.version}'>",
     "outputs": 1,
-    "x": 182,
-    "y": 162.888916015625,
-    "z": "5fc7c3fb.48a444",
+    "x": 173,
+    "y": 146.888916015625,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "8d7f08d3.c67fe8"
+        "92cd3521.3e4e6"
       ]
     ]
   },
   {
-    "id": "8d7f08d3.c67fe8",
+    "id": "92cd3521.3e4e6",
     "type": "method",
     "name": "method update-network-links-to-aai",
     "xml": "<method rpc='update-network-links-to-aai' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 196,
-    "y": 239.22222900390625,
-    "z": "5fc7c3fb.48a444",
+    "x": 187,
+    "y": 223.22222900390625,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "89a3239d.9a961"
+        "b665c6f2.69a4d"
       ]
     ]
   },
   {
-    "id": "89a3239d.9a961",
+    "id": "b665c6f2.69a4d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 207.33343505859375,
-    "y": 316.7779235839844,
-    "z": "5fc7c3fb.48a444",
+    "x": 198.33343505859375,
+    "y": 300.7779235839844,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "f779b713.8cfdc8"
+        "c59c9b79.9f8cc"
       ]
     ]
   },
   {
-    "id": "705ccc82.ecc094",
+    "id": "f41ff5d9.72c91",
     "type": "update",
-    "name": "save logical-link",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n\n\n\n\n\n",
+    "name": "save logical-link with regular id",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $unique-linkId' >\n<parameter name='link-name' value='`$unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 580.1111450195312,
-    "y": 168.11109924316406,
-    "z": "5fc7c3fb.48a444",
+    "x": 1156.111083984375,
+    "y": 546.111083984375,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "f779b713.8cfdc8",
+    "id": "c59c9b79.9f8cc",
     "type": "for",
     "name": "for each link",
     "xml": "<for index='pidx' start='0' end='`$network.link_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 235.88885498046875,
-    "y": 410.33331298828125,
-    "z": "5fc7c3fb.48a444",
+    "x": 226.88885498046875,
+    "y": 394.33331298828125,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "705ccc82.ecc094",
-        "45a55196.a54ca",
-        "d54d8abb.5beac",
-        "5271a41c.d8700c"
+        "6d5acc0f.b7df54",
+        "8fbc8f1e.fe24c8",
+        "954c1d48.971018",
+        "915555f.abb44a8"
       ]
     ]
   },
   {
-    "id": "45a55196.a54ca",
+    "id": "6d5acc0f.b7df54",
     "type": "set",
     "name": "set network link's local variables",
-    "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n\n",
+    "xml": "<set>\n<parameter name='link.' value='`$network.link[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
     "comments": "",
-    "x": 581.111083984375,
-    "y": 109.22221374511719,
-    "z": "5fc7c3fb.48a444",
+    "x": 572.111083984375,
+    "y": 62.22221374511719,
+    "z": "3cbec5d5.54ea02",
     "wires": []
   },
   {
-    "id": "d54d8abb.5beac",
-    "type": "save",
-    "name": "save source and dest TP",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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=\"`'/p-interfaces/p-interface/' + $src-tpId`\" />\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-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 596.7779541015625,
-    "y": 234.44447326660156,
-    "z": "5fc7c3fb.48a444",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5271a41c.d8700c",
+    "id": "7a38f4d0.9f3e6c",
     "type": "for",
     "name": "for each label-restriction",
     "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 533.4444580078125,
-    "y": 375.111083984375,
-    "z": "5fc7c3fb.48a444",
+    "x": 1535.4444580078125,
+    "y": 712.111083984375,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "1b0f5546.e78123",
-        "443c3267.dc2134",
-        "b1de45a9.d99468"
+        "556fc245.d19e3c",
+        "d6c13a1b.e798a",
+        "69e9f586.641064"
       ]
     ]
   },
   {
-    "id": "1b0f5546.e78123",
+    "id": "556fc245.d19e3c",
     "type": "set",
     "name": "set label-restriction's local variables",
     "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
     "comments": "",
-    "x": 805.111328125,
-    "y": 299.00006103515625,
-    "z": "5fc7c3fb.48a444",
+    "x": 1870.111328125,
+    "y": 635.0000610351562,
+    "z": "3cbec5d5.54ea02",
     "wires": []
   },
   {
-    "id": "759b3331.b0b62c",
+    "id": "3398d2c0.69ae06",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 982.4998779296875,
-    "y": 371.7460632324219,
-    "z": "5fc7c3fb.48a444",
+    "x": 2005.4998779296875,
+    "y": 679.74609375,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "1a522f6e.2f6589"
+        "abb716be.3fb59"
       ]
     ]
   },
   {
-    "id": "b709b603.7fa938",
+    "id": "3d46f558.3e53f2",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 990.178466796875,
-    "y": 430.96038818359375,
-    "z": "5fc7c3fb.48a444",
+    "x": 2013.178466796875,
+    "y": 738.9604187011719,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "5fd30b98.524afc"
+        "f0df0cf2.e46b6"
       ]
     ]
   },
   {
-    "id": "1a522f6e.2f6589",
+    "id": "abb716be.3fb59",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1102,
-    "y": 318,
-    "z": "5fc7c3fb.48a444",
+    "x": 2166,
+    "y": 679.0000305175781,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "61d66d0d.d0e254",
+    "id": "9aed5c80.54f11",
     "type": "set",
     "name": "set src-ltpId dst-ltpId",
     "xml": "<set>\n<parameter name='src-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.src-access-ltp-id`\" />\n<parameter name='dst-ltpId' value=\"`'nodeId-' + $oof.vpn.access-node-id + '-ltpId-' + $oof.vpn.dst-access-ltp-id`\" />",
     "comments": "",
-    "x": 2595.5001220703125,
-    "y": 2430.545135498047,
-    "z": "5fc7c3fb.48a444",
+    "x": 2586.5001220703125,
+    "y": 2414.545135498047,
+    "z": "3cbec5d5.54ea02",
     "wires": []
   },
   {
-    "id": "d454df86.50acb",
+    "id": "ce693523.2da318",
     "type": "save",
     "name": "save srcLTP relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 2629.0001220703125,
-    "y": 2470.545135498047,
-    "z": "5fc7c3fb.48a444",
+    "x": 2620.0001220703125,
+    "y": 2454.545135498047,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "f86402c5.f4d968",
+    "id": "72343f4d.bac85",
     "type": "save",
     "name": "save dstLTP relationship in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 2629.0001220703125,
-    "y": 2510.545135498047,
-    "z": "5fc7c3fb.48a444",
+    "x": 2620.0001220703125,
+    "y": 2494.545135498047,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "5fd30b98.524afc",
+    "id": "f0df0cf2.e46b6",
     "type": "update",
     "name": "save label-restriction",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1114,
-    "y": 507,
-    "z": "5fc7c3fb.48a444",
+    "x": 2197,
+    "y": 739.0000305175781,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "443c3267.dc2134",
+    "id": "d6c13a1b.e798a",
     "type": "save",
     "name": "save link relationship to label-restriction in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 770,
-    "y": 533,
-    "z": "5fc7c3fb.48a444",
+    "x": 1892,
+    "y": 793,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       []
     ]
   },
   {
-    "id": "b1de45a9.d99468",
+    "id": "69e9f586.641064",
     "type": "update",
     "name": "save label-restriction",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 795.815185546875,
-    "y": 425.55560302734375,
-    "z": "5fc7c3fb.48a444",
+    "x": 1814.815185546875,
+    "y": 711.5556640625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "3398d2c0.69ae06",
+        "3d46f558.3e53f2"
+      ]
+    ]
+  },
+  {
+    "id": "9c77d572.aa0dd",
+    "type": "switchNode",
+    "name": "switch te-link-attributes",
+    "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1135,
+    "y": 668,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "acb46a14.faf1b8",
+        "fad2e2be.055cd8"
+      ]
+    ]
+  },
+  {
+    "id": "acb46a14.faf1b8",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1324,
+    "y": 639,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "b663d811.06fad8"
+      ]
+    ]
+  },
+  {
+    "id": "b663d811.06fad8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1484,
+    "y": 638,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fad2e2be.055cd8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1328,
+    "y": 712,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "7a38f4d0.9f3e6c"
+      ]
+    ]
+  },
+  {
+    "id": "8fbc8f1e.fe24c8",
+    "type": "switchNode",
+    "name": "switch link.destination",
+    "xml": "<switch test='`$link.destination`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 540,
+    "y": 158,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "44b39c00.9558ec",
+        "d8a931d0.793fd"
+      ]
+    ]
+  },
+  {
+    "id": "44b39c00.9558ec",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 784,
+    "y": 129,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "dd848e51.9b8178"
+      ]
+    ]
+  },
+  {
+    "id": "d8a931d0.793fd",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 736,
+    "y": 190,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "bdffabea.a9f78"
+      ]
+    ]
+  },
+  {
+    "id": "bdffabea.a9f78",
+    "type": "set",
+    "name": "set network link's destination variables",
+    "xml": "<set>\n<parameter name='dst-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`\" />\n<parameter name='unique-dst-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`\" />\n<parameter name='is-open-ended-link' value='false' />\n\n",
+    "comments": "",
+    "x": 965,
+    "y": 190,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "d1d8b826.4d04f",
+    "type": "set",
+    "name": "set is-open-ended-link",
+    "xml": "<set>\n<parameter name='is-open-ended-link' value='true' />\n\n",
+    "comments": "",
+    "x": 1144,
+    "y": 94,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "b17a800b.11d598",
+    "type": "save",
+    "name": "get p-interface from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $unique-src-node-Id\n\t        and p-interface.interface-name = $src-tpId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.p-interface\" >",
+    "comments": "",
+    "outputs": 1,
+    "x": 1146,
+    "y": 150,
+    "z": "3cbec5d5.54ea02",
     "wires": [
       [
-        "759b3331.b0b62c",
-        "b709b603.7fa938"
+        "698d4309.a506a4",
+        "c0b09280.fde57",
+        "b035740b.82c768"
       ]
     ]
+  },
+  {
+    "id": "698d4309.a506a4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1389,
+    "y": 145,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "d4d599ee.a3913"
+      ]
+    ]
+  },
+  {
+    "id": "c0b09280.fde57",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1387,
+    "y": 234,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "d42c9066.3cdb28"
+      ]
+    ]
+  },
+  {
+    "id": "d4d599ee.a3913",
+    "type": "set",
+    "name": "set alternative unique link id",
+    "xml": "<set>\n<parameter name='alt-unique-linkId' value=\"`$tmp.aai.p-interface.inter-domain-plug-id`\" />\n\n",
+    "comments": "",
+    "x": 1597,
+    "y": 147,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "d42c9066.3cdb28",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1556,
+    "y": 235,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "f65cb67d.b3d368",
+    "type": "save",
+    "name": "get logical-link from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"logical-link\"\n\t    key=\"logical-link.link-name = $alt-unique-linkId\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.logical-link\" >",
+    "comments": "",
+    "outputs": 1,
+    "x": 943,
+    "y": 355,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "48397109.a69d68",
+        "efa56bf.4c6db98"
+      ]
+    ]
+  },
+  {
+    "id": "b035740b.82c768",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1398.490966796875,
+    "y": 187.57403564453125,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "6959706d.7f87e8"
+      ]
+    ]
+  },
+  {
+    "id": "6959706d.7f87e8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 1552.0623779296875,
+    "y": 190.85977172851562,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "954c1d48.971018",
+    "type": "switchNode",
+    "name": "switch is-open-ended-link",
+    "xml": "<switch test='`$is-open-ended-link`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 522,
+    "y": 394,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "4e6e74a5.e8af4c",
+        "53a87226.590744"
+      ]
+    ]
+  },
+  {
+    "id": "4e6e74a5.e8af4c",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 739,
+    "y": 416,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "2e08f3a1.53987c"
+      ]
+    ]
+  },
+  {
+    "id": "53a87226.590744",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 742,
+    "y": 356,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "f65cb67d.b3d368"
+      ]
+    ]
+  },
+  {
+    "id": "48397109.a69d68",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1140,
+    "y": 325,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "6b973.4170168dc"
+      ]
+    ]
+  },
+  {
+    "id": "efa56bf.4c6db98",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1143.490966796875,
+    "y": 365.57403564453125,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "ef51ee2a.cafb5"
+      ]
+    ]
+  },
+  {
+    "id": "842144b1.a1cb2",
+    "type": "update",
+    "name": "save logical-link with alternative link id",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link' \n      key='logical-link.link-name = $alt-unique-linkId' >\n<parameter name='link-name' value='`$alt-unique-linkId`' />\n<parameter name='link-id' value='`$link.link-id`' />\n<parameter name='link-type' value='`$link.te.te-link-attributes.access-type`' />\n\n\n\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1590,
+    "y": 368,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2e08f3a1.53987c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 917,
+    "y": 424,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "f41ff5d9.72c91",
+        "9c77d572.aa0dd",
+        "34901df.74cf7e2"
+      ]
+    ]
+  },
+  {
+    "id": "6b973.4170168dc",
+    "type": "save",
+    "name": "update dest TP by putting src TP of the current link",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' 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/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />-->\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-tpId`\" />-->\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$src-tpId`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1429,
+    "y": 321,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "34901df.74cf7e2",
+    "type": "save",
+    "name": "save source and dest TP",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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-tpId`\" />\n\n<parameter name=\"relationship-list.relationship[1].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[1].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$dst-tpId`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1142,
+    "y": 601,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "dd848e51.9b8178",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 927,
+    "y": 126,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "d1d8b826.4d04f",
+        "b17a800b.11d598"
+      ]
+    ]
+  },
+  {
+    "id": "ef51ee2a.cafb5",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1314,
+    "y": 366,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "842144b1.a1cb2",
+        "9ab70c9.3d83df",
+        "dd8767a.3acd918"
+      ]
+    ]
+  },
+  {
+    "id": "9ab70c9.3d83df",
+    "type": "save",
+    "name": "save source only",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $unique-linkId' 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/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`\" />\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-tpId`\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1527,
+    "y": 416,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ec4710d1.a4614",
+    "type": "for",
+    "name": "for each label-restriction",
+    "xml": "<for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1933,
+    "y": 499,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "5f4e6661.8be42",
+        "bf1c8950.f6775",
+        "869edf38.84c148"
+      ]
+    ]
+  },
+  {
+    "id": "5f4e6661.8be42",
+    "type": "set",
+    "name": "set label-restriction's local variables",
+    "xml": "<set>\n<parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />\n<parameter name='unique-lrId' value=\"`$alt-unique-linkId + '-lrId-' + $label-restriction.index`\" />\n",
+    "comments": "",
+    "x": 2267.6668701171875,
+    "y": 421.88897705078125,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
+  },
+  {
+    "id": "7135b68.c08c3c8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2403.055419921875,
+    "y": 466.635009765625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "2043dae3.034356"
+      ]
+    ]
+  },
+  {
+    "id": "69007117.c84f9",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2410.7340087890625,
+    "y": 525.8493347167969,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "30f94010.a2f0b"
+      ]
+    ]
+  },
+  {
+    "id": "2043dae3.034356",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2563.5555419921875,
+    "y": 465.8889465332031,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "30f94010.a2f0b",
+    "type": "update",
+    "name": "save label-restriction",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2594.5555419921875,
+    "y": 525.8889465332031,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bf1c8950.f6775",
+    "type": "save",
+    "name": "save link relationship to label-restriction in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $alt-unique-linkId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$tidx].related-to\" value=\"label-restriction\" />\n<parameter name=\"relationship-list.relationship[$tidx].related-link\" value=\"`'/network/label-restrictions/label-restriction/' + $unique-lrId`\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-key\" value=\"label-restriction.id\" />\n<parameter name=\"relationship-list.relationship[$tidx].relationship-data[0].relationship-value\" value=\"`$unique-lrId`\" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2289.5555419921875,
+    "y": 579.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "869edf38.84c148",
+    "type": "update",
+    "name": "save label-restriction",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction' \n      key='logical-link.link-name = $alt-unique-linkId\n      AND label-restriction.id = $unique-lrId' >      \n<parameter name='id' value='`$unique-lrId`' />\n<parameter name='label-start' value='`$label-restriction.label-start`' />\n<parameter name='label-end' value='`$label-restriction.label-end`' />\n<parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />\n<parameter name='label-step' value='`$label-restriction.label-step`' />\n<parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2212.3707275390625,
+    "y": 498.444580078125,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "7135b68.c08c3c8",
+        "69007117.c84f9"
+      ]
+    ]
+  },
+  {
+    "id": "dd8767a.3acd918",
+    "type": "switchNode",
+    "name": "switch te-link-attributes",
+    "xml": "<switch test='`$link.te.te-link-attributes.label-restriction`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1532.5555419921875,
+    "y": 454.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "2ac06a2f.120e4e",
+        "45e6587f.a583a"
+      ]
+    ]
+  },
+  {
+    "id": "2ac06a2f.120e4e",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1721.5555419921875,
+    "y": 425.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "5884f4a0.224604"
+      ]
+    ]
+  },
+  {
+    "id": "5884f4a0.224604",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1881.5555419921875,
+    "y": 424.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "45e6587f.a583a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1725.5555419921875,
+    "y": 498.888916015625,
+    "z": "3cbec5d5.54ea02",
+    "wires": [
+      [
+        "ec4710d1.a4614"
+      ]
+    ]
+  },
+  {
+    "id": "915555f.abb44a8",
+    "type": "set",
+    "name": "set more local variables",
+    "xml": "<set>\n<parameter name='unique-linkId' value=\"`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n<parameter name='unique-src-node-Id' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`\" />\n",
+    "comments": "",
+    "x": 557,
+    "y": 102,
+    "z": "3cbec5d5.54ea02",
+    "wires": []
   }
 ]
\ No newline at end of file

diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
index 7f98062..382a4c9 100644 (file)
--- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "e71bc70e.124d38",
+    "id": "ef88be3f.517f78",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 142,
-    "y": 49,
-    "z": "a2160ede.50a7f8",
+    "x": 105,
+    "y": 67,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "f849e1fd.7b8e28"
+        "74a7a837.229be"
       ]
     ]
   },
   {
-    "id": "f849e1fd.7b8e28",
+    "id": "74a7a837.229be",
     "type": "service-logic",
     "name": "DataChange ${project.version}",
     "module": "DataChange",
@@ -22,457 +22,633 @@
     "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='DataChange' version='${project.version}'>",
     "outputs": 1,
-    "x": 231.00003051757812,
-    "y": 139.88891220092773,
-    "z": "a2160ede.50a7f8",
+    "x": 194.00003051757812,
+    "y": 157.88891220092773,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "7adf111d.766db8"
+        "284dae72.737532"
       ]
     ]
   },
   {
-    "id": "7adf111d.766db8",
+    "id": "284dae72.737532",
     "type": "method",
-    "name": "method update-network-to-aai",
+    "name": "update-network-to-aai",
     "xml": "<method rpc='update-network-to-aai' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 267.1112518310547,
-    "y": 210.22223663330078,
-    "z": "a2160ede.50a7f8",
+    "x": 230.1112518310547,
+    "y": 228.22223663330078,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "802b5752.247908"
+        "da05320e.186d48"
       ]
     ]
   },
   {
-    "id": "802b5752.247908",
+    "id": "da05320e.186d48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
+    "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 492.33343505859375,
-    "y": 209.77792358398438,
-    "z": "a2160ede.50a7f8",
+    "x": 455.33343505859375,
+    "y": 227.77792358398438,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "32d96ea8.386a82",
-        "7667af77.0df1e8",
-        "6f623dd3.9a7c44",
-        "ffd24e55.e4afa"
+        "8c187a81.9e4d28",
+        "75113293.98ea0c",
+        "9937b93d.ff5938",
+        "55dde830.cc61b8"
       ]
     ]
   },
   {
-    "id": "7667af77.0df1e8",
-    "type": "update",
+    "id": "75113293.98ea0c",
+    "type": "save",
     "name": "save network-resource",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'  \n     key='network-resource.network-id = $tmp.network-id' >\n<parameter name='network-id' value='`$tmp.network-id`' />\n<parameter name='client-id' value='`$network.client-id`' />\n<parameter name='te-topo-id' value='`$network.te-topology-id`' />\n<parameter name='provider-id' value='`$network.provider-id`' />\n\n<parameter name='network-type' value='`$network.network-types`' />\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 722.333251953125,
-    "y": 115.00001525878906,
-    "z": "a2160ede.50a7f8",
+    "x": 685.333251953125,
+    "y": 133.00001525878906,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "ab67cffd.8b31",
-    "type": "update",
+    "id": "74f65e67.75c658",
+    "type": "save",
     "name": "save pnf",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf' \n      key='pnf.pnf-name = $unique-nodeId' >\n<parameter name='pnf-name' value='`$unique-nodeId`' />\n<parameter name='pnf-id' value='`$node.node-id`' />\n<parameter name='operational-status' value='`$node.te.oper-status`' />\n<parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\n<parameter name='in-maint' value='true' />\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 934.1111450195312,
-    "y": 205.111083984375,
-    "z": "a2160ede.50a7f8",
+    "x": 897.1111450195312,
+    "y": 223.111083984375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "6f623dd3.9a7c44",
+    "id": "9937b93d.ff5938",
     "type": "for",
     "name": "for each node",
     "xml": "<for index='pidx' start='0' end='`$network.node_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 705.8888549804688,
-    "y": 185.33331298828125,
-    "z": "a2160ede.50a7f8",
+    "x": 668.8888549804688,
+    "y": 203.33331298828125,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "ab67cffd.8b31",
-        "c4083363.2a3b2",
-        "ba78539e.d2e248",
-        "c02a5c85.3b448",
-        "499b8cbc.ebafac",
-        "7a876b8.f89b114",
-        "46013f8c.54849"
+        "74f65e67.75c658",
+        "60e29b35.16fbd4",
+        "b27f201.393186",
+        "e83884ed.3fb2d8",
+        "7257c53.4f087bc",
+        "395bef40.08498",
+        "1392eb55.76adbd",
+        "e55192de.2cc998"
       ]
     ]
   },
   {
-    "id": "c4083363.2a3b2",
+    "id": "60e29b35.16fbd4",
     "type": "set",
-    "name": "set network",
-    "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n<parameter name='src-tpId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`\" />\n",
+    "name": "set node",
+    "xml": "<set>\n<parameter name='node.' value='`$network.node[$pidx].`' />\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n\n",
     "comments": "",
-    "x": 950.111083984375,
-    "y": 133.2222137451172,
-    "z": "a2160ede.50a7f8",
+    "x": 902.111083984375,
+    "y": 119.22221374511719,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "c02a5c85.3b448",
+    "id": "e83884ed.3fb2d8",
     "type": "save",
     "name": "save pnf relationship to network-resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"network-resource.network-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.network-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1030.7779541015625,
-    "y": 380.44447803497314,
-    "z": "a2160ede.50a7f8",
+    "x": 993.7779541015625,
+    "y": 398.44447803497314,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "499b8cbc.ebafac",
+    "id": "9c15e41a.6cfbc8",
     "type": "for",
     "name": "for each termination point",
     "xml": "<for index='tidx' start='0' end='`$node.termination-point_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 963.4444580078125,
-    "y": 496.111083984375,
-    "z": "a2160ede.50a7f8",
+    "x": 1279.4444580078125,
+    "y": 574.111083984375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "c5951e15.43701",
-        "c670da77.075458",
-        "3831ed03.d1f9da",
-        "f6959b19.b0bc18"
+        "3c657cae.66477c",
+        "2e1dc2b9.f23686",
+        "8c144095.b1eaf8"
       ]
     ]
   },
   {
-    "id": "c5951e15.43701",
+    "id": "3c657cae.66477c",
     "type": "set",
     "name": "set termination point",
     "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tidx].`' />\n",
     "comments": "",
-    "x": 1230.111328125,
-    "y": 457.0000457763672,
-    "z": "a2160ede.50a7f8",
+    "x": 1550.111328125,
+    "y": 536.0000457763672,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "3831ed03.d1f9da",
-    "type": "update",
+    "id": "8c144095.b1eaf8",
+    "type": "save",
     "name": "save p-interface",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1213.8151397705078,
-    "y": 630.5555934906006,
-    "z": "a2160ede.50a7f8",
+    "x": 1533.815185546875,
+    "y": 628.5556030273438,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "9d09dea6.d30ca8",
-        "abd50ee3.2f813"
+        "3fc33363.5b82ec",
+        "34c813e4.f5477c"
       ]
     ]
   },
   {
-    "id": "7e259f3c.438d9",
+    "id": "f6e5129a.8bd048",
     "type": "save",
     "name": "save pnf relationship to p-interface in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $unique-nodeId '/p-interfaces/p-interface/' + $unique-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=\"`$unique-ltpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1297.703857421875,
-    "y": 765.3333740234375,
-    "z": "a2160ede.50a7f8",
+    "x": 1610.703857421875,
+    "y": 784.3333740234375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "c670da77.075458",
+    "id": "2e1dc2b9.f23686",
     "type": "set",
     "name": "set unique-ltpId",
     "xml": "<set>\n<parameter name='unique-ltpId' value=\"`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`\" />\n",
     "comments": "",
-    "x": 1214.000244140625,
-    "y": 491.1111145019531,
-    "z": "a2160ede.50a7f8",
+    "x": 1534.000244140625,
+    "y": 570.1111145019531,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "32d96ea8.386a82",
+    "id": "8c187a81.9e4d28",
     "type": "execute",
     "name": "execute",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$network.network-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.network-id\"/>\n    <parameter name=\"target\" value=\"/\"/>\n    <parameter name=\"replacement\" value=\"-\"/>\n    ",
     "comments": "",
     "outputs": 1,
-    "x": 671.9935302734375,
-    "y": 75.99349212646484,
-    "z": "a2160ede.50a7f8",
+    "x": 640.9935302734375,
+    "y": 83.99349975585938,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "ba78539e.d2e248",
+    "id": "b27f201.393186",
     "type": "save",
     "name": "save pnf relation with esr-thirdparty-sdnc",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list' \n      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $node.node-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$node.node-id`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1012,
-    "y": 416.9934997558594,
-    "z": "a2160ede.50a7f8",
+    "x": 975,
+    "y": 434.9934997558594,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "9d09dea6.d30ca8",
+    "id": "3fc33363.5b82ec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1385.4998397827148,
-    "y": 617.7460689544678,
-    "z": "a2160ede.50a7f8",
+    "x": 1705.499885559082,
+    "y": 615.7460784912109,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "3d744c93.2eb20c"
+        "a873419b.bc81c"
       ]
     ]
   },
   {
-    "id": "abd50ee3.2f813",
+    "id": "34c813e4.f5477c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1379.1784286499023,
-    "y": 669.9603805541992,
-    "z": "a2160ede.50a7f8",
+    "x": 1699.1784744262695,
+    "y": 667.9603900909424,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "a0fb6003.0efd8"
+        "66113f50.7819f8"
       ]
     ]
   },
   {
-    "id": "3d744c93.2eb20c",
+    "id": "a873419b.bc81c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1536,
-    "y": 617,
-    "z": "a2160ede.50a7f8",
+    "x": 1856.0000457763672,
+    "y": 615.0000095367432,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "a0fb6003.0efd8",
+    "id": "66113f50.7819f8",
     "type": "update",
     "name": "update p-interface",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $node.node-id\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\n\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' >      \n<parameter name='interface-name' value='`$unique-ltpId`' />\n<parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\n<parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\n<parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\n<parameter name='operational-status' value='`$tp.te.oper-status`' />\n<parameter name='in-maint' value=\"true\" />\n\n<parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\n<parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />",
     "comments": "",
     "outputs": 1,
-    "x": 1556,
-    "y": 667,
-    "z": "a2160ede.50a7f8",
+    "x": 1885,
+    "y": 669,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa9ed7c5.9f2be8",
-    "type": "update",
+    "id": "c8e5472a.d10408",
+    "type": "save",
     "name": "save tunnel-termination-point",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $unique-nodeId\n      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1423,
-    "y": 205,
-    "z": "a2160ede.50a7f8",
+    "x": 1678,
+    "y": 331,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "54fe71d8.edb1c",
-        "6cd48f92.21a288"
+        "11cb3cf8.02c3eb",
+        "1a336806.ba4bc8"
       ]
     ]
   },
   {
-    "id": "7a876b8.f89b114",
+    "id": "8b0a557c.b35cd",
     "type": "for",
     "name": "for each tunnel termination point",
     "xml": "<for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1038,
-    "y": 281,
-    "z": "a2160ede.50a7f8",
+    "x": 1341,
+    "y": 319,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "79913f13.5b1fa",
-        "4552b8b5.e9ba2",
-        "aa9ed7c5.9f2be8",
-        "e23bdb7f.fdc9c"
+        "58c4d943.63d2f",
+        "e7e93cd.8f563c",
+        "c8e5472a.d10408",
+        "7c00c858.c87ab8"
       ]
     ]
   },
   {
-    "id": "79913f13.5b1fa",
+    "id": "58c4d943.63d2f",
     "type": "set",
     "name": "set tunnel termination point",
     "xml": "<set>\n<parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\n",
     "comments": "",
-    "x": 1393,
-    "y": 114,
-    "z": "a2160ede.50a7f8",
+    "x": 1676,
+    "y": 239,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "4552b8b5.e9ba2",
+    "id": "e7e93cd.8f563c",
     "type": "set",
     "name": "set unique-ttpId",
     "xml": "<set>\n<parameter name='unique-ttpId' value=\"`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 1370.888916015625,
-    "y": 151.111083984375,
-    "z": "a2160ede.50a7f8",
+    "x": 1634.888916015625,
+    "y": 277.111083984375,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "54fe71d8.edb1c",
+    "id": "11cb3cf8.02c3eb",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1680,
-    "y": 191,
-    "z": "a2160ede.50a7f8",
+    "x": 1944,
+    "y": 317,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "42f8b4e.c7b524c"
+        "9ad375c8.fab3e8"
       ]
     ]
   },
   {
-    "id": "6cd48f92.21a288",
+    "id": "1a336806.ba4bc8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1673.6785888671875,
-    "y": 243.21431159973145,
-    "z": "a2160ede.50a7f8",
+    "x": 1937.6785888671875,
+    "y": 369.21431159973145,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       [
-        "5f719388.c96efc"
+        "842e7e75.fc0558"
       ]
     ]
   },
   {
-    "id": "42f8b4e.c7b524c",
+    "id": "9ad375c8.fab3e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1830.5001602172852,
-    "y": 190.25393104553223,
-    "z": "a2160ede.50a7f8",
+    "x": 2094.500160217285,
+    "y": 316.2539310455322,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "5f719388.c96efc",
+    "id": "842e7e75.fc0558",
     "type": "update",
     "name": "update tunnel-termination-point",
-    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $node.node-id\n      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point' \n      key='pnf.pnf-name = $unique-nodeId\n      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\n\n<parameter name='ttp-id' value='`$unique-ttpId`' />\n<parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\n<parameter name='name' value='`$ttp.name`' />\n<parameter name='admin-status' value='`$ttp.admin-status`' />\n<parameter name='oper-status' value='`$ttp.oper-status`' />\n<parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\n<parameter name='switching-capability' value='`$ttp.switching-capability`' />\n<parameter name='protection-type' value='`$ttp.protection-type`' />\n<parameter name='encoding' value='`$ttp.encoding`' />\n\n\n\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1911,
-    "y": 245,
-    "z": "a2160ede.50a7f8",
+    "x": 2175,
+    "y": 371,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "46013f8c.54849",
+    "id": "7257c53.4f087bc",
     "type": "set",
     "name": "set local variables",
-    "xml": "<set>\n<parameter name='unique-networkId' value='`$tmp.network-id`' />\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
+    "xml": "<set>\n<parameter name='unique-nodeId' value=\"`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`\" />\n",
     "comments": "",
-    "x": 969,
-    "y": 167,
-    "z": "a2160ede.50a7f8",
+    "x": 927,
+    "y": 166,
+    "z": "6d6b8a1f.be1cb4",
     "wires": []
   },
   {
-    "id": "ffd24e55.e4afa",
+    "id": "55dde830.cc61b8",
     "type": "call",
     "name": "call update-network-links-to-aai",
     "xml": "<call module='DataChange' rpc='update-network-links-to-aai' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 648,
-    "y": 311,
-    "z": "a2160ede.50a7f8",
+    "x": 611,
+    "y": 329,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "f6959b19.b0bc18",
+    "id": "b86a9ee9.558c2",
     "type": "save",
     "name": "save pnf-interface relationship to pnf in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId\n      AND p-interface.interface-name = $unique-ltpId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"pnf\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $unique-nodeId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$unique-nodeId`\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1300,
-    "y": 724,
-    "z": "a2160ede.50a7f8",
+    "x": 1617,
+    "y": 728,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
   },
   {
-    "id": "e23bdb7f.fdc9c",
+    "id": "7c00c858.c87ab8",
     "type": "save",
     "name": "save pnf relationship to tunnel termination point in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $unique-nodeId' force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[$ttidx].related-to\" value=\"tunnel-termination-point\" />\n<parameter name=\"relationship-list.relationship[$ttidx].related-link\" value=\"`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-key\" value=\"tunnel-termination-point.ttp-id\" />\n<parameter name=\"relationship-list.relationship[$ttidx].relationship-data[0].relationship-value\" value=\"`$unique-ttpId`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1485,
-    "y": 297,
-    "z": "a2160ede.50a7f8",
+    "x": 1749,
+    "y": 423,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "395bef40.08498",
+    "type": "switchNode",
+    "name": "switch node ttp",
+    "xml": "<switch test='`$node.te.tunnel-termination-point_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 913,
+    "y": 295,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "84bf875e.b8d51",
+        "cc6df2e.2398e9",
+        "f2d2c388.1aa578"
+      ]
+    ]
+  },
+  {
+    "id": "5889c4ed.3fc544",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1261,
+    "y": 247,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f2d2c388.1aa578",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1103,
+    "y": 318,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "8b0a557c.b35cd"
+      ]
+    ]
+  },
+  {
+    "id": "1392eb55.76adbd",
+    "type": "switchNode",
+    "name": "switch node tp",
+    "xml": "<switch test='`$node.termination-point_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 893,
+    "y": 550,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "c5e649ab.cfe2e8",
+        "d7a3de29.b44a1",
+        "a21fbfb7.b6608"
+      ]
+    ]
+  },
+  {
+    "id": "c5e649ab.cfe2e8",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1072,
+    "y": 502,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "3d51c59d.7acffa"
+      ]
+    ]
+  },
+  {
+    "id": "d7a3de29.b44a1",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1071,
+    "y": 604,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "9c15e41a.6cfbc8"
+      ]
+    ]
+  },
+  {
+    "id": "3d51c59d.7acffa",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1227,
+    "y": 502,
+    "z": "6d6b8a1f.be1cb4",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "e55192de.2cc998",
+    "type": "record",
+    "name": "log file",
+    "xml": " <record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n    <parameter name=\"file\" value=\"/opt/onap/hesamlogx.txt\" />\n    <parameter name=\"field1\" value=\"__TIMESTAMP__\" />\n    <parameter name=\"field2\" value=\"sucess executing Hesam hesam log file\" />\n    <parameter name=\"field3\" value=\"`$node.te.tunnel-termination-point_length`\" />\n    <parameter name=\"field4\" value=\"`$node.termination-point_length`\" />\n    ",
+    "comments": "",
+    "outputs": 1,
+    "x": 891,
+    "y": 339,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "84bf875e.b8d51",
+    "type": "other",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1101,
+    "y": 181,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "5889c4ed.3fc544"
+      ]
+    ]
+  },
+  {
+    "id": "cc6df2e.2398e9",
+    "type": "outcome",
+    "name": "length 0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1106,
+    "y": 256,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "5889c4ed.3fc544"
+      ]
+    ]
+  },
+  {
+    "id": "a21fbfb7.b6608",
+    "type": "outcome",
+    "name": "length 0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1082,
+    "y": 550,
+    "z": "6d6b8a1f.be1cb4",
+    "wires": [
+      [
+        "3d51c59d.7acffa"
+      ]
+    ]
   }
 ]
\ No newline at end of file

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
index 3495214..8777891 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml
@@ -1,70 +1,192 @@
-<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='DataChange' version='${project.version}'>
-    <method rpc='update-network-links-to-aai' mode='sync'>
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">
+    <method rpc="update-network-links-to-aai" mode="sync">
         <block atomic="true">
-            <for index='pidx' start='0' end='`$network.link_length`' >
+            <for index="pidx" start="0" end="`$network.link_length`">
                 <set>
-                    <parameter name='link.' value='`$network.link[$pidx].`' />
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />
-                    <parameter name='unique-linkId' value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`" />
-                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />
-                    <parameter name='dst-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`" />
+                    <parameter name="link." value="`$network.link[$pidx].`"/>
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>
                 </set>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'
-                      key='logical-link.link-name = $unique-linkId' >
-                    <parameter name='link-name' value='`$unique-linkId`' />
-                    <parameter name='link-id' value='`$link.link-id`' />
-                </save>
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
-                      key='logical-link.link-name = $unique-linkId' 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="`'/p-interfaces/p-interface/' + $src-tpId`" />
-                    <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-tpId`" />
-                    <parameter name="relationship-list.relationship[1].related-to" value="p-interface" />
-                    <parameter name="relationship-list.relationship[1].related-link" value="`'/p-interfaces/p-interface/' + $dst-tpId`" />
-                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name" />
-                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`" />
-                </save>
-                <for index='tidx' start='0' end='`$link.te.te-link-attributes.label-restriction_length`' >
-                    <set>
-                        <parameter name='label-restriction.' value='`$link.te.te-link-attributes.label-restriction[$tidx].`' />
-                        <parameter name='unique-lrId' value="`$unique-linkId + '-lrId-' + $label-restriction.index`" />
-                    </set>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
-                          key='logical-link.link-name = $unique-linkId
-      AND label-restriction.id = $unique-lrId' >
-                        <parameter name='id' value='`$unique-lrId`' />
-                        <parameter name='label-start' value='`$label-restriction.label-start`' />
-                        <parameter name='label-end' value='`$label-restriction.label-end`' />
-                        <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                        <parameter name='label-step' value='`$label-restriction.label-step`' />
-                        <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
-                        <outcome value='success'>
-                            <block></block>
-                        </outcome>
-                        <outcome value='failure'>
-                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='label-restriction'
-                                    key='logical-link.link-name = $unique-linkId
-      AND label-restriction.id = $unique-lrId' >
-                                <parameter name='id' value='`$unique-lrId`' />
-                                <parameter name='label-start' value='`$label-restriction.label-start`' />
-                                <parameter name='label-end' value='`$label-restriction.label-end`' />
-                                <parameter name='range-bitmap' value='`$label-restriction.range-bitmap`' />
-                                <parameter name='label-step' value='`$label-restriction.label-step`' />
-                                <parameter name='inclusive-exclusive' value='`$label-restriction.inclusive-exclusive`' />
-                            </update>
-                        </outcome>
-                    </save>
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list'
-                          key='logical-link.link-name = $unique-linkId' force="true" pfx="tmp.AnAI-data">
-                        <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction" />
-                        <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`" />
-                        <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id" />
-                        <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`" />
-                    </save>
-                </for>
+                <set>
+                    <parameter name="unique-linkId" value="`'networkId-' + $unique-networkId + '-linkId-' + $link.link-id`"/>
+                    <parameter name="src-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`"/>
+                    <parameter name="unique-src-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node`"/>
+                </set>
+                <switch test="`$link.destination`">
+                    <outcome value="">
+                        <block>
+                            <set>
+                                <parameter name="is-open-ended-link" value="true"/>
+                            </set>
+                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-src-node-Id and p-interface.interface-name = $src-tpId" local-only="false" pfx="tmp.aai.p-interface">
+                                <outcome value="success">
+                                    <set>
+                                        <parameter name="alt-unique-linkId" value="`$tmp.aai.p-interface.inter-domain-plug-id`"/>
+                                    </set>
+                                </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="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`"/>
+                                    </return>
+                                </outcome>
+                                <outcome value="failure">
+                                    <return status="failure">
+                                        <parameter name="error-code" value=""/>
+                                        <parameter name="error-message" value=""/>
+                                    </return>
+                                </outcome>
+                            </get-resource>
+                        </block>
+                    </outcome>
+                    <outcome value="Other">
+                        <set>
+                            <parameter name="dst-tpId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node + '-ltpId-' + $link.destination.dest-tp`"/>
+                            <parameter name="unique-dst-node-Id" value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.destination.dest-node`"/>
+                            <parameter name="is-open-ended-link" value="false"/>
+                        </set>
+                    </outcome>
+                </switch>
+                <switch test="`$is-open-ended-link`">
+                    <outcome value="true">
+                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId" local-only="false" pfx="tmp.aai.logical-link">
+                            <outcome value="success">
+                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" 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/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`" />
+                                    -->
+                                    <!--
+                                    <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-tpId`" />
+                                    -->
+                                    <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+                                    <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+                                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+                                    <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$src-tpId`"/>
+                                </update>
+                            </outcome>
+                            <outcome value="not-found">
+                                <block atomic="true">
+                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $alt-unique-linkId">
+                                        <parameter name="link-name" value="`$alt-unique-linkId`"/>
+                                        <parameter name="link-id" value="`$link.link-id`"/>
+                                        <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
+                                    </save>
+                                    <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" 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/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+                                        <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-tpId`"/>
+                                    </save>
+                                    <switch test="`$link.te.te-link-attributes.label-restriction`">
+                                        <outcome value="">
+                                            <block/>
+                                        </outcome>
+                                        <outcome value="Other">
+                                            <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+                                                <set>
+                                                    <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+                                                    <parameter name="unique-lrId" value="`$alt-unique-linkId + '-lrId-' + $label-restriction.index`"/>
+                                                </set>
+                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+                                                    <parameter name="id" value="`$unique-lrId`"/>
+                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                                    <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                                    <outcome value="success">
+                                                        <block/>
+                                                    </outcome>
+                                                    <outcome value="failure">
+                                                        <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $alt-unique-linkId AND label-restriction.id = $unique-lrId">
+                                                            <parameter name="id" value="`$unique-lrId`"/>
+                                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                                            <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                                        </update>
+                                                    </outcome>
+                                                </save>
+                                                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $alt-unique-linkId" force="true" pfx="tmp.AnAI-data">
+                                                    <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
+                                                    <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
+                                                    <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+                                                </save>
+                                            </for>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </outcome>
+                        </get-resource>
+                    </outcome>
+                    <outcome value="false">
+                        <block atomic="true">
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link" key="logical-link.link-name = $unique-linkId">
+                                <parameter name="link-name" value="`$unique-linkId`"/>
+                                <parameter name="link-id" value="`$link.link-id`"/>
+                                <parameter name="link-type" value="`$link.te.te-link-attributes.access-type`"/>
+                            </save>
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" 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/' + $unique-src-node-Id + '/p-interfaces/p-interface/' + $src-tpId`"/>
+                                <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-tpId`"/>
+                                <parameter name="relationship-list.relationship[1].related-to" value="p-interface"/>
+                                <parameter name="relationship-list.relationship[1].related-link" value="`'/network/pnfs/pnf/' + $unique-dst-node-Id + '/p-interfaces/p-interface/' + $dst-tpId`"/>
+                                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-key" value="p-interface.interface-name"/>
+                                <parameter name="relationship-list.relationship[1].relationship-data[0].relationship-value" value="`$dst-tpId`"/>
+                            </save>
+                            <switch test="`$link.te.te-link-attributes.label-restriction`">
+                                <outcome value="">
+                                    <block/>
+                                </outcome>
+                                <outcome value="Other">
+                                    <for index="tidx" start="0" end="`$link.te.te-link-attributes.label-restriction_length`">
+                                        <set>
+                                            <parameter name="label-restriction." value="`$link.te.te-link-attributes.label-restriction[$tidx].`"/>
+                                            <parameter name="unique-lrId" value="`$unique-linkId + '-lrId-' + $label-restriction.index`"/>
+                                        </set>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+                                            <parameter name="id" value="`$unique-lrId`"/>
+                                            <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                            <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                            <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                            <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                            <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                            <outcome value="success">
+                                                <block/>
+                                            </outcome>
+                                            <outcome value="failure">
+                                                <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="label-restriction" key="logical-link.link-name = $unique-linkId AND label-restriction.id = $unique-lrId">
+                                                    <parameter name="id" value="`$unique-lrId`"/>
+                                                    <parameter name="label-start" value="`$label-restriction.label-start`"/>
+                                                    <parameter name="label-end" value="`$label-restriction.label-end`"/>
+                                                    <parameter name="range-bitmap" value="`$label-restriction.range-bitmap`"/>
+                                                    <parameter name="label-step" value="`$label-restriction.label-step`"/>
+                                                    <parameter name="inclusive-exclusive" value="`$label-restriction.inclusive-exclusive`"/>
+                                                </update>
+                                            </outcome>
+                                        </save>
+                                        <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="logical-link:relationship-list" key="logical-link.link-name = $unique-linkId" force="true" pfx="tmp.AnAI-data">
+                                            <parameter name="relationship-list.relationship[$tidx].related-to" value="label-restriction"/>
+                                            <parameter name="relationship-list.relationship[$tidx].related-link" value="`'/network/label-restrictions/label-restriction/' + $unique-lrId`"/>
+                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-key" value="label-restriction.id"/>
+                                            <parameter name="relationship-list.relationship[$tidx].relationship-data[0].relationship-value" value="`$unique-lrId`"/>
+                                        </save>
+                                    </for>
+                                </outcome>
+                            </switch>
+                        </block>
+                    </outcome>
+                </switch>
             </for>
         </block>
     </method>

diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
index 9c17eac..17be19e 100644 (file)
--- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml
@@ -1,148 +1,149 @@
-<service-logic\r
-        xmlns='http://www.onap.org/sdnc/svclogic'\r
-        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>\r
-    <method rpc='update-network-to-aai' mode='sync'>\r
+<service-logic xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module="DataChange" version="${project.version}">\r
+    <method rpc="update-network-to-aai" mode="sync">\r
         <block atomic="true">\r
-            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\r
+            <execute plugin="org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils" method="replace">\r
                 <parameter name="source" value="`$network.network-id`"/>\r
                 <parameter name="outputPath" value="tmp.network-id"/>\r
                 <parameter name="target" value="/"/>\r
                 <parameter name="replacement" value="-"/>\r
             </execute>\r
-            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='network-resource'\r
-                  key='network-resource.network-id = $tmp.network-id' >\r
-                <parameter name='network-id' value='`$tmp.network-id`' />\r
-                <parameter name='client-id' value='`$network.client-id`' />\r
-                <parameter name='te-topo-id' value='`$network.te-topology-id`' />\r
-                <parameter name='provider-id' value='`$network.provider-id`' />\r
-                <parameter name='network-type' value='`$network.network-types`' />\r
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="network-resource" key="network-resource.network-id = $tmp.network-id">\r
+                <parameter name="network-id" value="`$tmp.network-id`"/>\r
+                <parameter name="client-id" value="`$network.client-id`"/>\r
+                <parameter name="te-topo-id" value="`$network.te-topology-id`"/>\r
+                <parameter name="provider-id" value="`$network.provider-id`"/>\r
+                <parameter name="network-type" value="`$network.network-types`"/>\r
             </save>\r
-            <for index='pidx' start='0' end='`$network.node_length`' >\r
+            <for index="pidx" start="0" end="`$network.node_length`">\r
                 <set>\r
-                    <parameter name='node.' value='`$network.node[$pidx].`' />\r
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />\r
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />\r
-                    <parameter name='src-tpId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $link.source.source-node + '-ltpId-' + $link.source.source-tp`" />\r
+                    <parameter name="node." value="`$network.node[$pidx].`"/>\r
+                    <parameter name="unique-networkId" value="`$tmp.network-id`"/>\r
                 </set>\r
                 <set>\r
-                    <parameter name='unique-networkId' value='`$tmp.network-id`' />\r
-                    <parameter name='unique-nodeId' value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`" />\r
+                    <parameter name="unique-nodeId" value="`'networkId-' + $unique-networkId + '-nodeId-' + $node.node-id`"/>\r
                 </set>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'\r
-                      key='pnf.pnf-name = $unique-nodeId' >\r
-                    <parameter name='pnf-name' value='`$unique-nodeId`' />\r
-                    <parameter name='pnf-id' value='`$node.node-id`' />\r
-                    <parameter name='operational-status' value='`$node.te.oper-status`' />\r
-                    <parameter name='admin-status' value='`$node.te.te-node-attributes.admin-status`' />\r
-                    <parameter name='in-maint' value='true' />\r
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf" key="pnf.pnf-name = $unique-nodeId">\r
+                    <parameter name="pnf-name" value="`$unique-nodeId`"/>\r
+                    <parameter name="pnf-id" value="`$node.node-id`"/>\r
+                    <parameter name="operational-status" value="`$node.te.oper-status`"/>\r
+                    <parameter name="admin-status" value="`$node.te.te-node-attributes.admin-status`"/>\r
+                    <parameter name="in-maint" value="true"/>\r
                 </save>\r
-                <for index='ttidx' start='0' end='`$node.te.tunnel-termination-point_length`' >\r
-                    <set>\r
-                        <parameter name='ttp.' value='`$node.te.tunnel-termination-point[$ttidx].`' />\r
-                    </set>\r
-                    <set>\r
-                        <parameter name='unique-ttpId' value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`" />\r
-                    </set>\r
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'\r
-                          key='pnf.pnf-name = $unique-nodeId\r
-      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\r
-                        <parameter name='ttp-id' value='`$unique-ttpId`' />\r
-                        <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\r
-                        <parameter name='name' value='`$ttp.name`' />\r
-                        <parameter name='admin-status' value='`$ttp.admin-status`' />\r
-                        <parameter name='oper-status' value='`$ttp.oper-status`' />\r
-                        <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\r
-                        <parameter name='switching-capability' value='`$ttp.switching-capability`' />\r
-                        <parameter name='protection-type' value='`$ttp.protection-type`' />\r
-                        <parameter name='encoding' value='`$ttp.encoding`' />\r
-                        <outcome value='success'>\r
-                            <block></block>\r
-                        </outcome>\r
-                        <outcome value='failure'>\r
-                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='tunnel-termination-point'\r
-                                    key='pnf.pnf-name = $node.node-id\r
-      AND tunnel-termination-point.ttp-id = $unique-ttpId' >\r
-                                <parameter name='tunnel-tp-id' value='`$ttp.tunnel-tp-id`' />\r
-                                <parameter name='name' value='`$ttp.name`' />\r
-                                <parameter name='admin-status' value='`$ttp.admin-status`' />\r
-                                <parameter name='oper-status' value='`$ttp.oper-status`' />\r
-                                <parameter name='inter-layer-lock-id' value='`$ttp.inter-layer-lock-id`' />\r
-                                <parameter name='switching-capability' value='`$ttp.switching-capability`' />\r
-                                <parameter name='protection-type' value='`$ttp.protection-type`' />\r
-                                <parameter name='encoding' value='`$ttp.encoding`' />\r
-                            </update>\r
-                        </outcome>\r
-                    </save>\r
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'\r
-                          key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">\r
-                        <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point" />\r
-                        <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`" />\r
-                        <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id" />\r
-                        <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`" />\r
-                    </save>\r
-                </for>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list'\r
-                      key='pnf.pnf-name = $unique-nodeId' force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`" />\r
+                <switch test="`$node.te.tunnel-termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
+                    </outcome>\r
+                    <outcome value="0">\r
+                        <block/>\r
+                    </outcome>\r
+                    <outcome value="Other">\r
+                        <for index="ttidx" start="0" end="`$node.te.tunnel-termination-point_length`">\r
+                            <set>\r
+                                <parameter name="ttp." value="`$node.te.tunnel-termination-point[$ttidx].`"/>\r
+                            </set>\r
+                            <set>\r
+                                <parameter name="unique-ttpId" value="`$unique-nodeId + '-ttpId-' + $ttp.tunnel-tp-id`"/>\r
+                            </set>\r
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
+                                <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
+                                <parameter name="name" value="`$ttp.name`"/>\r
+                                <parameter name="admin-status" value="`$ttp.admin-status`"/>\r
+                                <parameter name="oper-status" value="`$ttp.oper-status`"/>\r
+                                <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>\r
+                                <parameter name="switching-capability" value="`$ttp.switching-capability`"/>\r
+                                <parameter name="protection-type" value="`$ttp.protection-type`"/>\r
+                                <parameter name="encoding" value="`$ttp.encoding`"/>\r
+                                <outcome value="success">\r
+                                    <block/>\r
+                                </outcome>\r
+                                <outcome value="failure">\r
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="tunnel-termination-point" key="pnf.pnf-name = $unique-nodeId AND tunnel-termination-point.ttp-id = $unique-ttpId">\r
+                                        <parameter name="ttp-id" value="`$unique-ttpId`"/>\r
+                                        <parameter name="tunnel-tp-id" value="`$ttp.tunnel-tp-id`"/>\r
+                                        <parameter name="name" value="`$ttp.name`"/>\r
+                                        <parameter name="admin-status" value="`$ttp.admin-status`"/>\r
+                                        <parameter name="oper-status" value="`$ttp.oper-status`"/>\r
+                                        <parameter name="inter-layer-lock-id" value="`$ttp.inter-layer-lock-id`"/>\r
+                                        <parameter name="switching-capability" value="`$ttp.switching-capability`"/>\r
+                                        <parameter name="protection-type" value="`$ttp.protection-type`"/>\r
+                                        <parameter name="encoding" value="`$ttp.encoding`"/>\r
+                                    </update>\r
+                                </outcome>\r
+                            </save>\r
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">\r
+                                <parameter name="relationship-list.relationship[$ttidx].related-to" value="tunnel-termination-point"/>\r
+                                <parameter name="relationship-list.relationship[$ttidx].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id + '/pnfs/pnf/' + $node.node-id '/tunnel-termination-points/tunnel-termination-point/' + $unique-ttpId`"/>\r
+                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-key" value="tunnel-termination-point.ttp-id"/>\r
+                                <parameter name="relationship-list.relationship[$ttidx].relationship-data[0].relationship-value" value="`$unique-ttpId`"/>\r
+                            </save>\r
+                        </for>\r
+                    </outcome>\r
+                </switch>\r
+                <record plugin="org.onap.ccsdk.sli.core.sli.recording.FileRecorder">\r
+                    <parameter name="file" value="/opt/onap/hesamlogx.txt"/>\r
+                    <parameter name="field1" value="__TIMESTAMP__"/>\r
+                    <parameter name="field2" value="sucess executing Hesam hesam log file"/>\r
+                    <parameter name="field3" value="`$node.te.tunnel-termination-point_length`"/>\r
+                    <parameter name="field4" value="`$node.termination-point_length`"/>\r
+                </record>\r
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="pnf:relationship-list" key="pnf.pnf-name = $unique-nodeId" force="true" pfx="tmp.AnAI-data">\r
+                    <parameter name="relationship-list.relationship[0].related-to" value="network-resource"/>\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/network-resources/network-resource/' + $tmp.network-id`"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="network-resource.network-id"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.network-id`"/>\r
                 </save>\r
-                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='esr-thirdparty-sdnc:relationship-list'\r
-                      key='esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id'\r
-                      force="true" pfx="tmp.AnAI-data">\r
-                    <parameter name="relationship-list.relationship[0].related-to" value="pnf" />\r
-                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />\r
-                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`" />\r
+                <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc:relationship-list" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.sdncRestApi.thirdpartySdnc.id" force="true" pfx="tmp.AnAI-data">\r
+                    <parameter name="relationship-list.relationship[0].related-to" value="pnf"/>\r
+                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $node.node-id`"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name"/>\r
+                    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$node.node-id`"/>\r
                 </save>\r
-                <for index='tidx' start='0' end='`$node.termination-point_length`' >\r
-                    <set>\r
-                        <parameter name='tp.' value='`$node.termination-point[$tidx].`' />\r
-                    </set>\r
-                    <set>\r
-                        <parameter name='unique-ltpId' value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`" />\r
-                    </set>\r
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'\r
-                          key='pnf.pnf-name = $unique-nodeId\r
-      AND p-interface.interface-name = $unique-ltpId' >\r
-                        <parameter name='interface-name' value='`$unique-ltpId`' />\r
-                        <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
-                        <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
-                        <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
-                        <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
-                        <parameter name='in-maint' value="true" />\r
-                        <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\r
-                        <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
-                        <outcome value='success'>\r
-                            <block></block>\r
-                        </outcome>\r
-                        <outcome value='failure'>\r
-                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface'\r
-                                    key='pnf.pnf-name = $node.node-id\r
-      AND p-interface.interface-name = $unique-ltpId' >\r
-                                <parameter name='interface-name' value='`$unique-ltpId`' />\r
-                                <parameter name='network-ref' value='`$tp.supporting-termination-point[0].network-ref`' />\r
-                                <parameter name='transparent' value='`$tp.svc.supported-classification.transparent`' />\r
-                                <parameter name='speed-value' value='`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`' />\r
-                                <parameter name='operational-status' value='`$tp.te.oper-status`' />\r
-                                <parameter name='in-maint' value="true" />\r
-                                <parameter name='inter-layer-lock-id' value='`$tp.te.inter-layer-lock-id[0]`' />\r
-                                <parameter name='inter-domain-plug-id' value='`$tp.te.inter-domain-plug-id`' />\r
-                            </update>\r
-                        </outcome>\r
-                    </save>\r
-                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface:relationship-list'\r
-                          key='pnf.pnf-name = $unique-nodeId\r
-      AND p-interface.interface-name = $unique-ltpId' force="true" pfx="tmp.AnAI-data">\r
-                        <parameter name="relationship-list.relationship[0].related-to" value="pnf" />\r
-                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/pnfs/pnf/' + $unique-nodeId`" />\r
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="pnf.pnf-name" />\r
-                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$unique-nodeId`" />\r
-                    </save>\r
-                </for>\r
+                <switch test="`$node.termination-point_length`">\r
+                    <outcome value="">\r
+                        <block/>\r
+                    </outcome>\r
+                    <outcome value="0">\r
+                        <block/>\r
+                    </outcome>\r
+                    <outcome value="Other">\r
+                        <for index="tidx" start="0" end="`$node.termination-point_length`">\r
+                            <set>\r
+                                <parameter name="tp." value="`$node.termination-point[$tidx].`"/>\r
+                            </set>\r
+                            <set>\r
+                                <parameter name="unique-ltpId" value="`$unique-nodeId + '-ltpId-' + $tp.te-tp-id`"/>\r
+                            </set>\r
+                            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">\r
+                                <parameter name="interface-name" value="`$unique-ltpId`"/>\r
+                                <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
+                                <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>\r
+                                <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>\r
+                                <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
+                                <parameter name="in-maint" value="true"/>\r
+                                <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
+                                <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                <outcome value="success">\r
+                                    <block/>\r
+                                </outcome>\r
+                                <outcome value="failure">\r
+                                    <update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="p-interface" key="pnf.pnf-name = $unique-nodeId AND p-interface.interface-name = $unique-ltpId">\r
+                                        <parameter name="interface-name" value="`$unique-ltpId`"/>\r
+                                        <parameter name="network-ref" value="`$tp.supporting-termination-point[0].network-ref`"/>\r
+                                        <parameter name="transparent" value="`$tp.svc.supported-classification.transparent`"/>\r
+                                        <parameter name="speed-value" value="`$tp.te.interface-switching-capability[0].max-lsp-bandwidth[0].te-bandwidth.eth-bandwidth`"/>\r
+                                        <parameter name="operational-status" value="`$tp.te.oper-status`"/>\r
+                                        <parameter name="in-maint" value="true"/>\r
+                                        <parameter name="inter-layer-lock-id" value="`$tp.te.inter-layer-lock-id[0]`"/>\r
+                                        <parameter name="inter-domain-plug-id" value="`$tp.te.inter-domain-plug-id`"/>\r
+                                    </update>\r
+                                </outcome>\r
+                            </save>\r
+                        </for>\r
+                    </outcome>\r
+                </switch>\r
             </for>\r
-            <call module='DataChange' rpc='update-network-links-to-aai' mode='sync' ></call>\r
+            <call module="DataChange" rpc="update-network-links-to-aai" mode="sync"/>\r
         </block>\r
     </method>\r
 </service-logic>
\ No newline at end of file