From b06adb947bb41b3a0b273cef0ae6819a69e97ffc Mon Sep 17 00:00:00 2001
From: janani b <janani.b@huawei.com>
Date: Fri, 5 Apr 2019 19:19:29 +0530
Subject: Changing the DG param to use "_"

All the parameters of DG will use "_" instead of ":"

Issue-ID: CCSDK-1045

Change-Id: Iaf4d76f808798ca9a3209dfe0fd792f26a3c939a
Signed-off-by: janani b <janani.b@huawei.com>

Former-commit-id: 0fb3e0e11b347f001353df62b428f5e2d5ef1f9c
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  | 998 ++++++++++-----------
 .../DataChange_esr-thirdparty-sdnc-discovery.xml   |   3 +-
 2 files changed, 500 insertions(+), 501 deletions(-)

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

diff --git a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
index c502687a..7c2cc108 100644
--- a/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
+++ b/platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json
@@ -1,639 +1,639 @@
 [
     {
-        "id": "26c72de4.f15082", 
-        "type": "other", 
-        "name": "update", 
-        "xml": "<outcome value='Update'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 666, 
-        "y": 254, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "41629315.bd4abc",
+        "type": "other",
+        "name": "update",
+        "xml": "<outcome value='Update'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 724.9999961853027,
+        "y": 349.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "414d6ccb.3d26fc"
+                "9970355a.979a58"
             ]
         ]
-    }, 
+    },
     {
-        "id": "41138058.b8876", 
-        "type": "other", 
-        "name": "delete", 
-        "xml": "<outcome value='delete'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 666, 
-        "y": 334, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "bb11b779.ca75f8",
+        "type": "other",
+        "name": "delete",
+        "xml": "<outcome value='delete'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 724.9999961853027,
+        "y": 429.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "25011722.26281"
+                "7e0497f8.ddad68"
             ]
         ]
-    }, 
-    {
-        "id": "25011722.26281", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">", 
-        "atomic": "true", 
-        "outputs": 1, 
-        "x": 807.5, 
-        "y": 334, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "8fedb811.8ebe38", 
-        "type": "comment", 
-        "name": "TODO: Delete topology from AAI", 
-        "info": "", 
-        "comments": "", 
-        "x": 740.3335189819336, 
-        "y": 301.96899485588074, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "fc46fa0c.31e87", 
-        "type": "switchNode", 
-        "name": "switch aai-event-trigger", 
-        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 496.5, 
-        "y": 294, 
-        "z": "1a9b8475.da0d2c", 
+    },
+    {
+        "id": "7e0497f8.ddad68",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 866.4999961853027,
+        "y": 429.9999942779541,
+        "z": "43e1d1ad.d6a8e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c60c87fa.e5d1a8",
+        "type": "comment",
+        "name": "TODO: Delete topology from AAI",
+        "info": "",
+        "comments": "",
+        "x": 799.3335151672363,
+        "y": 397.96898913383484,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "cb414b17.62b928",
+        "type": "switchNode",
+        "name": "switch aai-event-trigger",
+        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 555.4999961853027,
+        "y": 389.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "26c72de4.f15082", 
-                "41138058.b8876"
+                "41629315.bd4abc",
+                "bb11b779.ca75f8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "73bed9ba.1eeb9", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">", 
-        "atomic": "true", 
-        "outputs": 1, 
-        "x": 1193.5, 
-        "y": 165, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "5f482ccf.0ae764",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1252.4999961853027,
+        "y": 260.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "ebd26579.8d9818", 
-                "7c364355.c7d31c", 
-                "6bff7a95.f6b11c", 
-                "e40bbeb2.1466c", 
-                "257a5269.7c0d86"
+                "d220c063.b8e9a",
+                "9a482a6d.6b7268",
+                "97f2ea03.107968",
+                "f06d5e7a.dcdff",
+                "1b8d7ae8.41c4c5"
             ]
         ]
-    }, 
+    },
     {
-        "id": "7c364355.c7d31c", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get token", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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\"/>", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1466.5001983642578, 
-        "y": 86.00000953674316, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "9a482a6d.6b7268",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1525.5001945495605,
+        "y": 182.00000381469727,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "460f203b.a3333", 
-                "2634113c.c7fc8e"
+                "6b4e87a7.382818",
+                "8968e872.1395d8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "460f203b.a3333", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1756.000244140625, 
-        "y": 78, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "6b4e87a7.382818",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1815.0002403259277,
+        "y": 173.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "964773.4acb289"
+                "abb4b716.9e6c48"
             ]
         ]
-    }, 
+    },
     {
-        "id": "2634113c.c7fc8e", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1752.000244140625, 
-        "y": 118, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "8968e872.1395d8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1811.0002403259277,
+        "y": 213.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "67cff30a.da3b54"
+                "570488eb.f03fc8"
             ]
         ]
-    }, 
-    {
-        "id": "964773.4acb289", 
-        "type": "set", 
-        "name": "set token-id", 
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n", 
-        "comments": "", 
-        "x": 1906.500244140625, 
-        "y": 78, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "3bf66a70.af3866", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get Topology", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1973.500244140625, 
-        "y": 198, 
-        "z": "1a9b8475.da0d2c", 
+    },
+    {
+        "id": "abb4b716.9e6c48",
+        "type": "set",
+        "name": "set token-id",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
+        "comments": "",
+        "x": 1965.5002403259277,
+        "y": 173.9999942779541,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "157313d5.db8b4c",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get Topology",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2032.5002403259277,
+        "y": 293.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "83daffef.93261", 
-                "9a6001a7.b0681"
+                "33873b8b.c155b4",
+                "ce710140.b905e"
             ]
         ]
-    }, 
+    },
     {
-        "id": "83daffef.93261", 
-        "type": "success", 
-        "name": "success", 
-        "xml": "<outcome value='success'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2216.000244140625, 
-        "y": 218, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "33873b8b.c155b4",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2275.0002403259277,
+        "y": 313.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "815ae1d4.60f8"
+                "e5513b6e.ef8ac8"
             ]
         ]
-    }, 
+    },
     {
-        "id": "815ae1d4.60f8", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">", 
-        "atomic": "true", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2373.500244140625, 
-        "y": 218, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "e5513b6e.ef8ac8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2432.5002403259277,
+        "y": 313.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "a1b0634d.e55008"
+                "5d082e27.1f397"
             ]
         ]
-    }, 
-    {
-        "id": "56a034a.503e6cc", 
-        "type": "returnFailure", 
-        "name": "return failure", 
-        "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n", 
-        "comments": "", 
-        "x": 2350.000244140625, 
-        "y": 118, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "9a6001a7.b0681", 
-        "type": "failure", 
-        "name": "failure", 
-        "xml": "<outcome value='failure'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2212.000244140625, 
-        "y": 118, 
-        "z": "1a9b8475.da0d2c", 
+    },
+    {
+        "id": "528cf13c.0c237",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n <parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
+        "comments": "",
+        "x": 2409.0002403259277,
+        "y": 213.9999942779541,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "ce710140.b905e",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2271.0002403259277,
+        "y": 213.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "56a034a.503e6cc"
+                "528cf13c.0c237"
             ]
         ]
-    }, 
+    },
     {
-        "id": "39a13bfe.fb4444", 
-        "type": "dgstart", 
-        "name": "DGSTART", 
-        "outputs": 1, 
-        "x": 66, 
-        "y": 29, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "e8420532.df1058",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 124.99999618530273,
+        "y": 124.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "5147cfad.5c3908"
+                "8ccfff99.445d6"
             ]
         ]
-    }, 
+    },
     {
-        "id": "5147cfad.5c3908", 
-        "type": "service-logic", 
-        "name": "DataChange ${project.version}", 
-        "module": "DataChange", 
-        "version": "${project.version}", 
-        "comments": "", 
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>", 
-        "outputs": 1, 
-        "x": 132, 
-        "y": 89, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "8ccfff99.445d6",
+        "type": "service-logic",
+        "name": "DataChange ${project.version}",
+        "module": "DataChange",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='DataChange' version='${project.version}'>",
+        "outputs": 1,
+        "x": 190.99999618530273,
+        "y": 184.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "15128d59.469f9b"
+                "9ae5c632.b6f538"
             ]
         ]
-    }, 
+    },
     {
-        "id": "15128d59.469f9b", 
-        "type": "method", 
-        "name": "method esr-thirdparty-sdnc-discovery", 
-        "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 152, 
-        "y": 169, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "9ae5c632.b6f538",
+        "type": "method",
+        "name": "method esr-thirdparty-sdnc-discovery",
+        "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 210.99999618530273,
+        "y": 264.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "1baee5be.1b11da"
+                "12028600.fb215a"
             ]
         ]
-    }, 
+    },
     {
-        "id": "1baee5be.1b11da", 
-        "type": "block", 
-        "name": "block : atomic", 
-        "xml": "<block atomic=\"true\">\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 399.5, 
-        "y": 169, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "12028600.fb215a",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 458.49999618530273,
+        "y": 264.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "f40069ea.6c541"
+                "807f3d.fff210c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "a1b0634d.e55008", 
-        "type": "for", 
-        "name": "for each Network", 
-        "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1799.500259399414, 
-        "y": 317.00001525878906, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "5d082e27.1f397",
+        "type": "for",
+        "name": "for each Network",
+        "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1858.5002555847168,
+        "y": 413.00000953674316,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "e7339f4e.4a45b8"
+                "e62b44ce.a0e368"
             ]
         ]
-    }, 
+    },
     {
-        "id": "e7339f4e.4a45b8", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1948.000259399414, 
-        "y": 317.00001525878906, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "e62b44ce.a0e368",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007.0002555847168,
+        "y": 413.00000953674316,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "e39a1349.d59948", 
-                "a69e5196.594768"
+                "69d3f3bb.60d83c",
+                "4e20c7e0.4989a8"
             ]
         ]
-    }, 
-    {
-        "id": "e39a1349.d59948", 
-        "type": "call", 
-        "name": "call update-network-to-aai", 
-        "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 2127.000259399414, 
-        "y": 337.00001525878906, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "a69e5196.594768", 
-        "type": "set", 
-        "name": "set network", 
-        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n", 
-        "comments": "", 
-        "x": 2082.000259399414, 
-        "y": 297.00001525878906, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "67cff30a.da3b54", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1872.000244140625, 
-        "y": 118, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "86d88e9f.569c1", 
-        "type": "comment", 
-        "name": "Do Nothing", 
-        "info": "", 
-        "comments": "", 
-        "x": 2042.000244140625, 
-        "y": 158, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "9b7ecf5d.bb983", 
-        "type": "switchNode", 
-        "name": "switch type", 
-        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 919, 
-        "y": 254, 
-        "z": "1a9b8475.da0d2c", 
+    },
+    {
+        "id": "69d3f3bb.60d83c",
+        "type": "call",
+        "name": "call update-network-to-aai",
+        "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2186.000255584717,
+        "y": 433.00000953674316,
+        "z": "43e1d1ad.d6a8e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4e20c7e0.4989a8",
+        "type": "set",
+        "name": "set network",
+        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
+        "comments": "",
+        "x": 2141.000255584717,
+        "y": 393.00000953674316,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "570488eb.f03fc8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1931.0002403259277,
+        "y": 213.9999942779541,
+        "z": "43e1d1ad.d6a8e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8485b334.0774f",
+        "type": "comment",
+        "name": "Do Nothing",
+        "info": "",
+        "comments": "",
+        "x": 2101.0002403259277,
+        "y": 253.9999942779541,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "4662cdd1.b4f8a4",
+        "type": "switchNode",
+        "name": "switch type",
+        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 977.9999961853027,
+        "y": 349.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "d7810e52.09a7a8", 
-                "ef809a67.dde878"
+                "c4659524.ddaee8",
+                "b8841114.e40fb"
             ]
         ]
-    }, 
+    },
     {
-        "id": "414d6ccb.3d26fc", 
-        "type": "block", 
-        "name": "block", 
-        "xml": "<block>\n", 
-        "atomic": "false", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 786, 
-        "y": 254, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "9970355a.979a58",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 844.9999961853027,
+        "y": 349.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "9b7ecf5d.bb983"
+                "4662cdd1.b4f8a4"
             ]
         ]
-    }, 
+    },
     {
-        "id": "d7810e52.09a7a8", 
-        "type": "other", 
-        "name": "SOTN", 
-        "xml": "<outcome value='SOTN'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1032, 
-        "y": 165, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "c4659524.ddaee8",
+        "type": "other",
+        "name": "SOTN",
+        "xml": "<outcome value='SOTN'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1090.9999961853027,
+        "y": 260.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "73bed9ba.1eeb9"
+                "5f482ccf.0ae764"
             ]
         ]
-    }, 
+    },
     {
-        "id": "ef809a67.dde878", 
-        "type": "other", 
-        "name": "other", 
-        "xml": "<outcome value='Other'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1047.0000076293945, 
-        "y": 404.00003242492676, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "b8841114.e40fb",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1106.0000038146973,
+        "y": 500.00002670288086,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "ad793f5e.17f88"
+                "3b070a5d.7f8e96"
             ]
         ]
-    }, 
-    {
-        "id": "ad793f5e.17f88", 
-        "type": "returnFailure", 
-        "name": "return failure", 
-        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n", 
-        "comments": "", 
-        "x": 1225.0000076293945, 
-        "y": 404.00003242492676, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "ebd26579.8d9818", 
-        "type": "execute", 
-        "name": "execute Properties", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1413.0001983642578, 
-        "y": 46.000009536743164, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "6bff7a95.f6b11c", 
-        "type": "switchNode", 
-        "name": "switch prop.sdncRestApi.token_id", 
-        "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1459.5001983642578, 
-        "y": 166.00000953674316, 
-        "z": "1a9b8475.da0d2c", 
+    },
+    {
+        "id": "3b070a5d.7f8e96",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
+        "comments": "",
+        "x": 1284.0000038146973,
+        "y": 500.00002670288086,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "d220c063.b8e9a",
+        "type": "execute",
+        "name": "execute Properties",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1472.0001945495605,
+        "y": 142.00000381469727,
+        "z": "43e1d1ad.d6a8e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "97f2ea03.107968",
+        "type": "switchNode",
+        "name": "switch prop.sdncRestApi.token_id",
+        "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1518.5001945495605,
+        "y": 262.00000381469727,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "baf46d81.bf5f6", 
-                "789590c1.ea5428"
+                "a5358ccb.9e8dd",
+                "7f5cb122.be2df"
             ]
         ]
-    }, 
+    },
     {
-        "id": "baf46d81.bf5f6", 
-        "type": "other", 
-        "name": "Null", 
-        "xml": "<outcome value=''>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1752.000244140625, 
-        "y": 158, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "a5358ccb.9e8dd",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1811.0002403259277,
+        "y": 253.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "fe0ff87c.8c90c"
+                "ef0365d3.97ff38"
             ]
         ]
-    }, 
+    },
     {
-        "id": "789590c1.ea5428", 
-        "type": "other", 
-        "name": "other", 
-        "xml": "<outcome value='Other'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1752.000244140625, 
-        "y": 198, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "7f5cb122.be2df",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1811.0002403259277,
+        "y": 293.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "3bf66a70.af3866"
+                "157313d5.db8b4c"
             ]
         ]
-    }, 
+    },
     {
-        "id": "fe0ff87c.8c90c", 
-        "type": "execute", 
-        "name": "execute RestApiCallNode Get Topology", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1973.500244140625, 
-        "y": 158, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "ef0365d3.97ff38",
+        "type": "execute",
+        "name": "execute RestApiCallNode Get Topology",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />\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=\"topology\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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",
+        "comments": "",
+        "outputs": 1,
+        "x": 2032.5002403259277,
+        "y": 253.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "9a6001a7.b0681", 
-                "83daffef.93261"
+                "ce710140.b905e",
+                "33873b8b.c155b4"
             ]
         ]
-    }, 
-    {
-        "id": "257a5269.7c0d86", 
-        "type": "execute", 
-        "name": "execute RestconfDiscoveryNode", 
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 1456.0001983642578, 
-        "y": 306.00000953674316, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [
-            [ ]
-        ]
-    }, 
-    {
-        "id": "e40bbeb2.1466c", 
-        "type": "set", 
-        "name": "set encoding-format", 
-        "xml": "<set>\n<parameter name='input' value='ietf-subscribed-notifications:establish-subscription.input.' />\n<parameter name=\"`$input + 'encoding'`\" value=\"encode-json\" />", 
-        "comments": "", 
-        "x": 1416.0001983642578, 
-        "y": 266.00000953674316, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "d34b58fb.df8cd", 
-        "type": "comment", 
-        "name": "Notification subscription", 
-        "info": "", 
-        "comments": "", 
-        "x": 1421.000343322754, 
-        "y": 223.00000858306885, 
-        "z": "1a9b8475.da0d2c", 
-        "wires": [ ]
-    }, 
-    {
-        "id": "f40069ea.6c541", 
-        "type": "switchNode", 
-        "name": "switch", 
-        "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 106, 
-        "y": 294, 
-        "z": "1a9b8475.da0d2c", 
+    },
+    {
+        "id": "1b8d7ae8.41c4c5",
+        "type": "execute",
+        "name": "execute RestconfDiscoveryNode",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode' method='establishSubscription' >\n<parameter name=\"subscriberId\" value=\"sotn-controller\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/operations/ietf-subscribed-notifications:establish-subscription'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />\n<parameter name=\"sseConnectURL\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/streams/yang-push-json'`\" />\n<parameter name=\"dirPath\" value=\"/opt/sdnc/restconfapi/yang/notification\" />\n<parameter name=\"format\" value=\"json\" />\n<parameter name=\"httpMethod\" value=\"post\" />\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n<parameter name=\"module\" value=\"DataChange\" />\n<parameter name=\"rpc\" value=\"sotn-notification-handler\" />\n<parameter name=\"mode\" value=\"sync\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1517.0001525878906,
+        "y": 400.9999828338623,
+        "z": "43e1d1ad.d6a8e",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f06d5e7a.dcdff",
+        "type": "set",
+        "name": "set encoding-format",
+        "xml": "<set>\n<parameter name='ietf-subscribed-notifications_establish-subscription.input.encoding' value=\"encode-json\" />",
+        "comments": "",
+        "x": 1475.0001945495605,
+        "y": 362.00000381469727,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "971a117b.a06b9",
+        "type": "comment",
+        "name": "Notification subscription",
+        "info": "",
+        "comments": "",
+        "x": 1480.0003395080566,
+        "y": 319.00000286102295,
+        "z": "43e1d1ad.d6a8e",
+        "wires": []
+    },
+    {
+        "id": "807f3d.fff210c",
+        "type": "switchNode",
+        "name": "switch",
+        "xml": "<switch test=\"`$prop.sdncRestApi.vendor == 'ZTE'`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 164.99999618530273,
+        "y": 389.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "5e28a0df.7fabe", 
-                "39367b0f.d19614"
+                "1b70ca9c.7c9985",
+                "c9877e2e.2d6a5"
             ]
         ]
-    }, 
+    },
     {
-        "id": "5e28a0df.7fabe", 
-        "type": "outcomeFalse", 
-        "name": "false", 
-        "xml": "<outcome value='false'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 293, 
-        "y": 294, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "1b70ca9c.7c9985",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 351.99999618530273,
+        "y": 389.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "fc46fa0c.31e87"
+                "cb414b17.62b928"
             ]
         ]
-    }, 
+    },
     {
-        "id": "39367b0f.d19614", 
-        "type": "outcomeTrue", 
-        "name": "true", 
-        "xml": "<outcome value='true'>\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 294, 
-        "y": 419, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "c9877e2e.2d6a5",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 352.99999618530273,
+        "y": 514.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
             [
-                "8828fa0f.91d7c8"
+                "66b25f6e.ea9c2"
             ]
         ]
-    }, 
+    },
     {
-        "id": "8828fa0f.91d7c8", 
-        "type": "call", 
-        "name": "call esr-thirdparty-sdnc-of-zte", 
-        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n", 
-        "comments": "", 
-        "outputs": 1, 
-        "x": 517, 
-        "y": 419, 
-        "z": "1a9b8475.da0d2c", 
+        "id": "66b25f6e.ea9c2",
+        "type": "call",
+        "name": "call esr-thirdparty-sdnc-of-zte",
+        "xml": "<call module='DataChange' rpc='esr-thirdparty-sdnc-of-zte' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 575.9999961853027,
+        "y": 514.9999942779541,
+        "z": "43e1d1ad.d6a8e",
         "wires": [
-            [ ]
+            []
         ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
index e11daddd..f6cd4d19 100644
--- a/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
+++ b/platform-logic/datachange/src/main/xml/DataChange_esr-thirdparty-sdnc-discovery.xml
@@ -102,8 +102,7 @@
                         </outcome>
                       </switch>
                       <set> 
-                        <parameter name="input" value="ietf-subscribed-notifications:establish-subscription.input."/>  
-                        <parameter name="`$input + 'encoding'`" value="encode-json"/>
+                        <parameter name="ietf-subscribed-notifications_establish-subscription.input.encoding" value="encode-json"/>
                       </set>
                       <execute plugin="org.onap.ccsdk.sli.plugins.restconfdiscovery.RestconfDiscoveryNode" method="establishSubscription"> 
                         <parameter name="subscriberId" value="sotn-controller"/>  
-- 
cgit 1.2.3-korg