From 98c82621446df1902b136b2a67eba68cfa8e1507 Mon Sep 17 00:00:00 2001
From: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>
Date: Fri, 3 Apr 2020 05:50:12 +0000
Subject: Changes in MSA service flow

to support MDONs use case

Change-Id: I11244d58d6adc3400d3a97e294c0f914ab6192a1
Issue-ID: SDNC-1144
Signed-off-by: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>

Former-commit-id: 64490238f742f486d4ab5ede3b49140d2859cbcd
---
 .../json/DataChange_msa-update-network-to-aai.json | 600 ++++++++++-----------
 .../xml/DataChange_msa-update-network-to-aai.xml   |   2 +-
 2 files changed, 301 insertions(+), 301 deletions(-)

(limited to 'platform-logic/datachange/src')

diff --git a/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
index 1dd336e8..cb664239 100644
--- a/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
+++ b/platform-logic/datachange/src/main/json/DataChange_msa-update-network-to-aai.json
@@ -1,6 +1,6 @@
 [
     {
-        "id": "8b4dcfe.e866f3",
+        "id": "104e7d48.f3cf6b",
         "type": "service-logic",
         "name": "DataChange ${project.version}",
         "module": "DataChange",
@@ -8,897 +8,897 @@
         "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": 401,
-        "y": 62,
-        "z": "d8656b08.07aab8",
+        "x": 406.5,
+        "y": 79.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "adc1d56c.b72ff"
+                "5d813483.feaafc"
             ]
         ]
     },
     {
-        "id": "adc1d56c.b72ff",
+        "id": "5d813483.feaafc",
         "type": "method",
         "name": "method msa-update-network-to-aai",
         "xml": "<method rpc='msa-update-network-to-aai' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 144,
-        "y": 136,
-        "z": "d8656b08.07aab8",
+        "x": 149.5,
+        "y": 153.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "106658a8.d884c7"
+                "f1373060.5fa1b8"
             ]
         ]
     },
     {
-        "id": "106658a8.d884c7",
+        "id": "f1373060.5fa1b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 382.00003814697266,
-        "y": 136.00001335144043,
-        "z": "d8656b08.07aab8",
+        "x": 387.50003814697266,
+        "y": 153.5666790008545,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "4b7c5962.7cf4f8"
+                "118d904f.a73618"
             ]
         ]
     },
     {
-        "id": "8e1c9818.33b57",
+        "id": "5148e490.8887ac",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 123,
-        "y": 64,
-        "z": "d8656b08.07aab8",
+        "x": 128.5,
+        "y": 81.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "8b4dcfe.e866f3"
+                "104e7d48.f3cf6b"
             ]
         ]
     },
     {
-        "id": "4b7c5962.7cf4f8",
+        "id": "118d904f.a73618",
         "type": "switchNode",
         "name": "switch network-id",
         "xml": "<switch test=\"`$networks.network-id`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 178.5104522705078,
-        "y": 247.0000114440918,
-        "z": "d8656b08.07aab8",
+        "x": 184.0104522705078,
+        "y": 264.56667709350586,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "b84da364.adfac",
-                "3a113c69.68266c"
+                "1a591305.fd6b45",
+                "315839fb.fe3f4e"
             ]
         ]
     },
     {
-        "id": "b84da364.adfac",
+        "id": "1a591305.fd6b45",
         "type": "other",
         "name": "other: Do Nothing",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 443.5104064941406,
-        "y": 469.99993896484375,
-        "z": "d8656b08.07aab8",
+        "x": 449.0104064941406,
+        "y": 487.5666046142578,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "3a113c69.68266c",
+        "id": "315839fb.fe3f4e",
         "type": "outcome",
         "name": "otn-topology",
         "xml": "<outcome value='otn-topology'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 410,
-        "y": 247,
-        "z": "d8656b08.07aab8",
+        "x": 415.5,
+        "y": 264.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "5112d334.33a61c"
+                "975d8fa3.881088"
             ]
         ]
     },
     {
-        "id": "5112d334.33a61c",
+        "id": "975d8fa3.881088",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 605,
-        "y": 247,
-        "z": "d8656b08.07aab8",
+        "x": 610.5,
+        "y": 264.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "4a7e5696.0715b",
-                "d2e8624a.31b89",
-                "22d90846.8bc5b8",
-                "6c4d9e05.4fa72",
-                "1587342a.1379dc"
+                "68d9f126.b948e",
+                "a34b2c50.7ce4f",
+                "e99fa34f.55a988",
+                "4503a33d.d9bd8c",
+                "81e5bdae.f433c8"
             ]
         ]
     },
     {
-        "id": "4a7e5696.0715b",
+        "id": "68d9f126.b948e",
         "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 = $networks.network-id' >\n<parameter name='network-id' value='`$networks.network-id`' />\n<parameter name='network-type' value='`$networks.network-types`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 897,
-        "y": 100,
-        "z": "d8656b08.07aab8",
+        "x": 902.5,
+        "y": 117.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "d2e8624a.31b89",
+        "id": "a34b2c50.7ce4f",
         "type": "save",
         "name": "save network-resource 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=\"network-resource\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/network-resources/network-resource/' + $networks.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=\"`$networks.network-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 987,
-        "y": 159,
-        "z": "d8656b08.07aab8",
+        "x": 992.5,
+        "y": 176.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "22d90846.8bc5b8",
+        "id": "e99fa34f.55a988",
         "type": "for",
         "name": "for each node",
         "xml": "<for index='nidx' start='0' end='`$networks.node_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 831,
-        "y": 301,
-        "z": "d8656b08.07aab8",
+        "x": 836.5,
+        "y": 318.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "f56585e4.72bcc",
-                "b3dc81c8.6f70f8"
+                "8d4a4f94.782ed",
+                "dbb6b256.7c00a"
             ]
         ]
     },
     {
-        "id": "f56585e4.72bcc",
+        "id": "8d4a4f94.782ed",
         "type": "set",
         "name": "set node",
         "xml": "<set>\n<parameter name='node.' value='`$networks.node[$nidx].`' />\n",
         "comments": "",
-        "x": 1013,
-        "y": 300,
-        "z": "d8656b08.07aab8",
+        "x": 1018.5,
+        "y": 317.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "b3dc81c8.6f70f8",
+        "id": "dbb6b256.7c00a",
         "type": "switchNode",
         "name": "switch node-type",
         "xml": "<switch test=\"`$node.node-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1034,
-        "y": 400,
-        "z": "d8656b08.07aab8",
+        "x": 1039.5,
+        "y": 417.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "ac532b61.57fca8",
-                "a021c2b4.589bc"
+                "c77859ef.314a08",
+                "34a91f9c.019b1"
             ]
         ]
     },
     {
-        "id": "ac532b61.57fca8",
+        "id": "c77859ef.314a08",
         "type": "outcome",
         "name": "SWITCH",
         "xml": "<outcome value='SWITCH'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1219,
-        "y": 401,
-        "z": "d8656b08.07aab8",
+        "x": 1224.5,
+        "y": 418.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "8591e2ec.94b2d8"
+                "70a2f008.086aa8"
             ]
         ]
     },
     {
-        "id": "a021c2b4.589bc",
+        "id": "34a91f9c.019b1",
         "type": "other",
         "name": "other : Do Nothing",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1262,
-        "y": 524,
-        "z": "d8656b08.07aab8",
+        "x": 1267.5,
+        "y": 541.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "8591e2ec.94b2d8",
+        "id": "70a2f008.086aa8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1390,
-        "y": 402,
-        "z": "d8656b08.07aab8",
+        "x": 1395.5,
+        "y": 419.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "8d6438ce.9a465",
-                "7c327396.cf8004",
-                "92a0366b.9648d8",
-                "506cbe9f.0da148",
-                "9a96883c.2c0c6",
-                "76be62e9.bf594c"
+                "1172ae87.ebdb29",
+                "9cec7146.2e6ac",
+                "d1692405.c347a",
+                "50bbb17d.793c4",
+                "869684c2.e7fdb",
+                "e310391d.26926"
             ]
         ]
     },
     {
-        "id": "8d6438ce.9a465",
+        "id": "1172ae87.ebdb29",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"pnfname\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1569,
-        "y": 194,
-        "z": "d8656b08.07aab8",
+        "x": 1574.5,
+        "y": 211.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "7c327396.cf8004",
+        "id": "9cec7146.2e6ac",
         "type": "save",
         "name": "save pnf details to AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf'\nkey='pnf.pnf-name = $pnfname' >\n    <parameter name='pnf-name' value='`$pnfname`' />\n    <parameter name='pnf-id' value='`$node.node-id`' />\n    <parameter name='operational-status' value='`$node.node-status`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='equip-type' value='`$node.node-type`' />\n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1624,
-        "y": 250,
-        "z": "d8656b08.07aab8",
+        "x": 1629.5,
+        "y": 267.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "92a0366b.9648d8",
+        "id": "d1692405.c347a",
         "type": "save",
         "name": "save pnf relationship to network-resource in AAI",
         "xml": "\n<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='pnf:relationship-list' \n      key='pnf.pnf-name = $pnfname' 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/' + $networks.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=\"`$networks.network-id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1727,
-        "y": 314,
-        "z": "d8656b08.07aab8",
+        "x": 1732.5,
+        "y": 331.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "506cbe9f.0da148",
+        "id": "50bbb17d.793c4",
         "type": "for",
         "name": "for each termination point",
         "xml": "<for index='tpidx' start='0' end='`$node.termination-point_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1595,
-        "y": 575,
-        "z": "d8656b08.07aab8",
+        "x": 1600.5,
+        "y": 592.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "a9a91cea.c7d998",
-                "3e218bee.5222ec",
-                "763d8580.7328c4",
-                "a8ff331a.025d",
-                "8e2b2ac1.d11b2",
-                "6bb4981.68f2ee8",
-                "9bf5664b.07737"
+                "7af64957.8fa6b8",
+                "f7da9215.3d16c",
+                "9a1981e1.920fd8",
+                "6b40a855.ff49b",
+                "32cd571a.6766f",
+                "79c2bf41.e84278",
+                "6ab14ba2.b06b3c"
             ]
         ]
     },
     {
-        "id": "a9a91cea.c7d998",
+        "id": "7af64957.8fa6b8",
         "type": "set",
         "name": "set termination point",
         "xml": "<set>\n<parameter name='tp.' value='`$node.termination-point[$tpidx].`' />\n",
         "comments": "",
-        "x": 1865,
-        "y": 606,
-        "z": "d8656b08.07aab8",
+        "x": 1870.5,
+        "y": 623.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "a8ff331a.025d",
+        "id": "6b40a855.ff49b",
         "type": "save",
         "name": "save p-interface to AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='p-interface' \n      key='pnf.pnf-name = $pnfname\n      AND p-interface.interface-name = $interfaceName' >      \n<parameter name='interface-name' value='`$interfaceName`' />\n<parameter name='port-description' value='`$tp.tp-id`' />\n<parameter name='network-ref' value='`$tp.network-ref`' />\n<parameter name='interface-type' value='`$tp.tp-type`' />\n<parameter name='in-maint' value=\"true\" />\n<parameter name='network-interface-type' value='`$network-interface-type`' />\n<parameter name='speed-units' value=\"Gbps\" />\n<parameter name='speed-value' value='100' />\n<parameter name='available-capacity' value='100' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1862,
-        "y": 814,
-        "z": "d8656b08.07aab8",
+        "x": 1867.5,
+        "y": 831.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "763d8580.7328c4",
+        "id": "9a1981e1.920fd8",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"interfaceName\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1839,
-        "y": 752,
-        "z": "d8656b08.07aab8",
+        "x": 1844.5,
+        "y": 769.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "3e218bee.5222ec",
+        "id": "f7da9215.3d16c",
         "type": "switchNode",
         "name": "switch tp-type",
         "xml": "<switch test=\"`$tp.tp-type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1852,
-        "y": 674,
-        "z": "d8656b08.07aab8",
+        "x": 1857.5,
+        "y": 691.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "88cb4971.2e8588",
-                "43b07fb6.69d3f",
-                "818ba69d.e74cf8"
+                "6b889540.d3439c",
+                "6c79f8e4.880e78",
+                "22f2d784.911b5"
             ]
         ]
     },
     {
-        "id": "88cb4971.2e8588",
+        "id": "6b889540.d3439c",
         "type": "outcome",
         "name": "XPONDER-NETWORK",
         "xml": "<outcome value='XPONDER-NETWORK'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2090,
-        "y": 630,
-        "z": "d8656b08.07aab8",
+        "x": 2095.5,
+        "y": 647.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "4bf140e7.df7828"
+                "6a2abc7e.072b44"
             ]
         ]
     },
     {
-        "id": "43b07fb6.69d3f",
+        "id": "6c79f8e4.880e78",
         "type": "outcome",
         "name": "XPONDER-CLIENT",
         "xml": "<outcome value='XPONDER-CLIENT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2080,
-        "y": 707,
-        "z": "d8656b08.07aab8",
+        "x": 2085.5,
+        "y": 724.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "d2a50717.2a1d9"
+                "c1e1de7a.899c9"
             ]
         ]
     },
     {
-        "id": "818ba69d.e74cf8",
+        "id": "22f2d784.911b5",
         "type": "other",
         "name": "other  : Do Nothing",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2090,
-        "y": 780,
-        "z": "d8656b08.07aab8",
+        "x": 2095.5,
+        "y": 797.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "6c4d9e05.4fa72",
+        "id": "4503a33d.d9bd8c",
         "type": "for",
         "name": "for each link",
         "xml": "<for index='lidx' start='0' end='`$networks.link_length`' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 792,
-        "y": 575,
-        "z": "d8656b08.07aab8",
+        "x": 797.5,
+        "y": 592.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "575b0050.f3102",
-                "f4b57e4d.f91c18"
+                "e267bbc9.6ea998",
+                "3d7fd479.ed54bc"
             ]
         ]
     },
     {
-        "id": "575b0050.f3102",
+        "id": "e267bbc9.6ea998",
         "type": "set",
         "name": "set link",
         "xml": "<set>\n<parameter name='link.' value='`$networks.link[$lidx].`' />\n",
         "comments": "",
-        "x": 987,
-        "y": 521,
-        "z": "d8656b08.07aab8",
+        "x": 992.5,
+        "y": 538.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "f4b57e4d.f91c18",
+        "id": "3d7fd479.ed54bc",
         "type": "switchNode",
         "name": "switch link-type",
         "xml": "<switch test=\"`$link.link-type`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 954,
-        "y": 661,
-        "z": "d8656b08.07aab8",
+        "x": 959.5,
+        "y": 678.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "c7be7986.f3d7",
-                "b81cc555.59f47"
+                "73a2e499.1ff214",
+                "f6f62047.3cff1"
             ]
         ]
     },
     {
-        "id": "c7be7986.f3d7",
+        "id": "73a2e499.1ff214",
         "type": "outcome",
         "name": "OTN-LINK",
         "xml": "<outcome value='OTN-LINK'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1167,
-        "y": 657,
-        "z": "d8656b08.07aab8",
+        "x": 1172.5,
+        "y": 674.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "b99bdbf4.fe7ab8"
+                "2630e595.f233aa"
             ]
         ]
     },
     {
-        "id": "b81cc555.59f47",
+        "id": "f6f62047.3cff1",
         "type": "other",
         "name": "other : Do Nothing",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1119,
-        "y": 761,
-        "z": "d8656b08.07aab8",
+        "x": 1124.5,
+        "y": 778.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "b99bdbf4.fe7ab8",
+        "id": "2630e595.f233aa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1168,
-        "y": 1158,
-        "z": "d8656b08.07aab8",
+        "x": 1173.5,
+        "y": 1175.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "eb78e1a4.f6c888",
-                "9c6cd27.ce7a0b",
-                "8d15fb9d.87f2c8",
-                "df343460.1e46a",
-                "d885100b.8f343",
-                "3c142cb3.61690c",
-                "14cce7fe.30486",
-                "4284a26f.1ce334"
+                "4e7725d2.f582b4",
+                "e002d5f0.653908",
+                "b0fde3b8.a17ea",
+                "f2c0c6e.cf39138",
+                "281eb291.a9a1e6",
+                "fe4625e.c7038d8",
+                "af77ded3.a07b1",
+                "f2060323.e44fc8"
             ]
         ]
     },
     {
-        "id": "eb78e1a4.f6c888",
+        "id": "4e7725d2.f582b4",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$link.link-id`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.link-id\"/>\n    <parameter name=\"target\" value=\"#\"/>\n    <parameter name=\"replacement\" value=\"_\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1428,
-        "y": 1017,
-        "z": "d8656b08.07aab8",
+        "x": 1433.5,
+        "y": 1034.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c6cd27.ce7a0b",
+        "id": "e002d5f0.653908",
         "type": "save",
         "name": "save logical-link details to AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link'\nkey='logical-link.link-name = $tmp.link-id' >\n    <parameter name='link-name' value='`$tmp.link-id`' />\n    <parameter name='link-type' value='`$link.link-type`' />\n    <parameter name='in-maint' value='true' />\n    <parameter name='speed-value' value='100' />\n    <parameter name='speed-units' value='Gbps' />\n    <parameter name='operational-status' value='`$link.administrative-state`' />\n    <parameter name='available-capacity' value='100' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1517,
-        "y": 1157,
-        "z": "d8656b08.07aab8",
+        "x": 1522.5,
+        "y": 1174.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bf140e7.df7828",
+        "id": "6a2abc7e.072b44",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2304,
-        "y": 631,
-        "z": "d8656b08.07aab8",
+        "x": 2309.5,
+        "y": 648.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "dd7793ee.4f994"
+                "99d1c3f3.3da028"
             ]
         ]
     },
     {
-        "id": "d2a50717.2a1d9",
+        "id": "c1e1de7a.899c9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2291,
-        "y": 710,
-        "z": "d8656b08.07aab8",
+        "x": 2296.5,
+        "y": 727.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "765312cb.e91374"
+                "98775e23.b3ef58"
             ]
         ]
     },
     {
-        "id": "dd7793ee.4f994",
+        "id": "99d1c3f3.3da028",
         "type": "set",
         "name": "set network-interface-type as NNI",
         "xml": "<set>\n<parameter name='network-interface-type' value='NNI' />\n",
         "comments": "",
-        "x": 2545,
-        "y": 630,
-        "z": "d8656b08.07aab8",
+        "x": 2550.5,
+        "y": 647.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "765312cb.e91374",
+        "id": "98775e23.b3ef58",
         "type": "set",
         "name": "set network-interface-type as UNI",
         "xml": "<set>\n<parameter name='network-interface-type' value='UNI' />\n",
         "comments": "",
-        "x": 2548,
-        "y": 708,
-        "z": "d8656b08.07aab8",
+        "x": 2553.5,
+        "y": 725.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "8e2b2ac1.d11b2",
+        "id": "32cd571a.6766f",
         "type": "set",
         "name": "set speed-value as null",
         "xml": "<set>\n<parameter name='speed-value' value='' />\n<parameter name='available-capacity' value='' />\n<parameter name='network-interface-type' value='' />\n",
         "comments": "",
-        "x": 1874,
-        "y": 523,
-        "z": "d8656b08.07aab8",
+        "x": 1879.5,
+        "y": 540.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "8d15fb9d.87f2c8",
+        "id": "b0fde3b8.a17ea",
         "type": "set",
         "name": "set link-parameters",
         "xml": "<set>\n<parameter name='interface1' value=\"`$link.source.source-tp`\" />\n<parameter name='interface2' value=\"`$link.destination.dest-tp`\" />\n<parameter name='pnf1' value=\"`$link.source.source-node`\" />\n<parameter name='pnf2' value=\"`$link.destination.dest-node`\" />\n",
         "comments": "",
-        "x": 1489,
-        "y": 1066,
-        "z": "d8656b08.07aab8",
+        "x": 1494.5,
+        "y": 1083.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "df343460.1e46a",
+        "id": "f2c0c6e.cf39138",
         "type": "save",
         "name": "save logical-link relationship to p-interface",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='logical-link:relationship-list' \n      key='logical-link.link-name = $tmp.link-id' 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/' + $pnfname1 + '/p-interfaces/p-interface/' + $pinterface1 `\" />\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=\"`$pnfname1`\" /> \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/' + $pnfname2 + '/p-interfaces/p-interface/' + $pinterface2 `\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-key\" value=\"pnf.pnf-name\" />\n<parameter name=\"relationship-list.relationship[1].relationship-data[0].relationship-value\" value=\"`$pnfname2`\" /> ",
         "comments": "",
         "outputs": 1,
-        "x": 1500,
-        "y": 1528,
-        "z": "d8656b08.07aab8",
+        "x": 1505.5,
+        "y": 1545.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bb4981.68f2ee8",
+        "id": "79c2bf41.e84278",
         "type": "save",
         "name": "save pnf & p-interface in DB",
-        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , '100' , $clli , null );\">\n\n",
+        "xml": "<save plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\" key=\"INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , $controller_id , '100' , $clli , null );\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1788,
-        "y": 998,
-        "z": "d8656b08.07aab8",
+        "x": 1793.5,
+        "y": 1015.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "d885100b.8f343",
+        "id": "281eb291.a9a1e6",
         "type": "get-resource",
         "name": "get source pnf-name and interface-name UUID from DB",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT pnf_name, interface_name \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE pnf_id = $link.source.source-node\nAND interface_id = $link.source.source-tp' \npfx='db.source'>\n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1613,
-        "y": 1308,
-        "z": "d8656b08.07aab8",
+        "x": 1618.5,
+        "y": 1325.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "4c55d475.77aecc"
+                "20ab3da2.39562a"
             ]
         ]
     },
     {
-        "id": "3c142cb3.61690c",
+        "id": "fe4625e.c7038d8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"print direct name\"/>\n<parameter name=\"field2\" value=\"`$pnfname1`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1468,
-        "y": 1366,
-        "z": "d8656b08.07aab8",
+        "x": 1473.5,
+        "y": 1383.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c55d475.77aecc",
+        "id": "20ab3da2.39562a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1931,
-        "y": 1312,
-        "z": "d8656b08.07aab8",
+        "x": 1936.5,
+        "y": 1329.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "2acd3a80.9f5afe"
+                "22cab29c.5a4c96"
             ]
         ]
     },
     {
-        "id": "2acd3a80.9f5afe",
+        "id": "22cab29c.5a4c96",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='pnfname1' value='`$db.source.pnf-name`' />\n<parameter name='pinterface1' value='`$db.source.interface-name`' />\n\n\n\n\n\n",
         "comments": "",
-        "x": 2085,
-        "y": 1304,
-        "z": "d8656b08.07aab8",
+        "x": 2090.5,
+        "y": 1321.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "14cce7fe.30486",
+        "id": "af77ded3.a07b1",
         "type": "get-resource",
         "name": "get destination pnf-name and interface-name UUID from DB",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' \nkey='SELECT pnf_name, interface_name \nfrom TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE \nWHERE pnf_id = $link.destination.dest-node\nAND interface_id = $link.destination.dest-tp' \npfx='db1.destination'>\n    \n    \n    \n    \n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1584,
-        "y": 1443,
-        "z": "d8656b08.07aab8",
+        "x": 1589.5,
+        "y": 1460.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "2b2056ba.68c06a"
+                "de812346.e33968"
             ]
         ]
     },
     {
-        "id": "2b2056ba.68c06a",
+        "id": "de812346.e33968",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1917,
-        "y": 1436,
-        "z": "d8656b08.07aab8",
+        "x": 1922.5,
+        "y": 1453.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "190b0926.27e49f"
+                "7c98abe2.520c94"
             ]
         ]
     },
     {
-        "id": "190b0926.27e49f",
+        "id": "7c98abe2.520c94",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='pnfname2' value='`$db1.destination.pnf-name`' />\n<parameter name='pinterface2' value='`$db1.destination.interface-name`' />\n\n\n\n\n\n",
         "comments": "",
-        "x": 2077,
-        "y": 1438,
-        "z": "d8656b08.07aab8",
+        "x": 2082.5,
+        "y": 1455.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "4284a26f.1ce334",
+        "id": "f2060323.e44fc8",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-create.log\" />\n<parameter name=\"level\" value=\"info\" />\n\n<parameter name=\"field1\" value=\"`$pnf1`\"/>\n<parameter name=\"field2\" value=\"`$interface1`\"/>\n<parameter name=\"field3\" value=\"`$pnf2`\"/>\n<parameter name=\"field4\" value=\"`$interface2`\"/>\n\n\n\n\n\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1459,
-        "y": 1109,
-        "z": "d8656b08.07aab8",
+        "x": 1464.5,
+        "y": 1126.566665649414,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "9a96883c.2c0c6",
+        "id": "869684c2.e7fdb",
         "type": "execute",
         "name": "split node-id",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$node.node-id`'/>\n<parameter name=\"regex\" value=\"-\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix1\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1627,
-        "y": 370,
-        "z": "d8656b08.07aab8",
+        "x": 1632.5,
+        "y": 387.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "76be62e9.bf594c",
+        "id": "e310391d.26926",
         "type": "execute",
         "name": "execute",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/cxf/openroadm/v2/networks/openroadm-network/nodes/' + $param-prefix1[0]`\"/>  \n    <parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\"/>  \n    <parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\"/>  \n    <parameter name=\"format\" value=\"json\"/>  \n    <parameter name=\"httpMethod\" value=\"get\"/>  \n    <parameter name=\"responsePrefix\" value=\"cllires\"/>\n    <parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.msa.jks\"/>  \n    <parameter name=\"trustStorePassword\" value=\"adminadmin\"/>  \n    <parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>  \n    <parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n    \n    \n    \n    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1626,
-        "y": 429,
-        "z": "d8656b08.07aab8",
+        "x": 1631.5,
+        "y": 446.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "c6fee13e.a22228",
-                "4241c0e7.e68e5"
+                "e92a74f4.54bde",
+                "3cb543e1.cd89e4"
             ]
         ]
     },
     {
-        "id": "b707b093.cd8c68",
+        "id": "3ae8595f.f2c786",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1941,
-        "y": 444,
-        "z": "d8656b08.07aab8",
+        "x": 1946.5,
+        "y": 461.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "bfdcc473.e8754"
+                "e714cae6.771e5"
             ]
         ]
     },
     {
-        "id": "bfdcc473.e8754",
+        "id": "e714cae6.771e5",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='clli' value='`$cllires.supporting-node[0].node-ref`' />\n",
         "comments": "",
-        "x": 2123,
-        "y": 439,
-        "z": "d8656b08.07aab8",
+        "x": 2128.5,
+        "y": 456.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": []
     },
     {
-        "id": "4241c0e7.e68e5",
+        "id": "3cb543e1.cd89e4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1804,
-        "y": 376,
-        "z": "d8656b08.07aab8",
+        "x": 1809.5,
+        "y": 393.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "8f6ab8.a5f3cd48"
+                "db88dbe6.1f184"
             ]
         ]
     },
     {
-        "id": "c6fee13e.a22228",
+        "id": "e92a74f4.54bde",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1770,
-        "y": 445,
-        "z": "d8656b08.07aab8",
+        "x": 1775.5,
+        "y": 462.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             [
-                "b707b093.cd8c68"
+                "3ae8595f.f2c786"
             ]
         ]
     },
     {
-        "id": "8f6ab8.a5f3cd48",
+        "id": "db88dbe6.1f184",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/optical-service-delete.log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"Getting clli failed\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1945,
-        "y": 370,
-        "z": "d8656b08.07aab8",
+        "x": 1950.5,
+        "y": 387.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "9bf5664b.07737",
+        "id": "6ab14ba2.b06b3c",
         "type": "save",
         "name": "save",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='custom-query' \n      key=\"format='resource'\"\n      force=\"true\"\n      local-only=\"false\"\n      pfx=\"data\">      \n<parameter name='interface-name' value='`$interfaceName`' />\n<parameter name='port-description' value='`$tp.tp-id`' />",
         "comments": "",
         "outputs": 1,
-        "x": 1803.5,
-        "y": 886,
-        "z": "d8656b08.07aab8",
+        "x": 1809,
+        "y": 903.5666656494141,
+        "z": "8859ea1e.d24268",
         "wires": [
             []
         ]
     },
     {
-        "id": "1587342a.1379dc",
+        "id": "81e5bdae.f433c8",
         "type": "set",
         "name": "set controller_id",
         "xml": "<set>\n<parameter name='controller_id' value=\"`$prop.sdncRestApi.type + '_' + $prop.sdncRestApi.thirdpartySdnc.url`\" />\n\n\n\n",
         "comments": "",
-        "x": 860,
-        "y": 218,
-        "z": "d8656b08.07aab8",
+        "x": 865.5,
+        "y": 235.56666564941406,
+        "z": "8859ea1e.d24268",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
index a370575d..a4076e51 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_msa-update-network-to-aai.xml
@@ -128,7 +128,7 @@ key='pnf.pnf-name = $pnfname' >
                                                 <parameter name='interface-name' value='`$interfaceName`' />
                                                 <parameter name='port-description' value='`$tp.tp-id`' />
                                             </save>
-                                            <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , '100' , $clli , null );"></save>
+                                            <save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" key="INSERT INTO TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE VALUES ( $interfaceName , $tp.tp-id , $pnfname , $node.node-id , $controller_id , '100' , $clli , null );"></save>
                                         </for>
                                     </block>
                                 </outcome>
-- 
cgit 1.2.3-korg