From 76c5155fb4262a1aa2872c7e34e29ed2bcefac5c Mon Sep 17 00:00:00 2001
From: wsx25289 <10200860@zte.com.cn>
Date: Sun, 2 Dec 2018 21:12:15 -0500
Subject: fix topology discovery bug for ccvpn

Issue-ID: SDNC-354

Change-Id: I3c3d0a464af933da449f009690085d778bbb4614
Signed-off-by: Wsx25289 <10200860@zte.com.cn>

Former-commit-id: f795758fd327fad2a9ed7ac411cfd10a3d5922a0
---
 .../DataChange_esr-thirdparty-sdnc-discovery.json  | 1213 ++++++++++----------
 1 file changed, 638 insertions(+), 575 deletions(-)

(limited to 'platform-logic/datachange/src/main/json/DataChange_esr-thirdparty-sdnc-discovery.json')

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 ba7a9894..c502687a 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,576 +1,639 @@
-[
-    {
-        "id": "197ffd5b.105fa3",
-        "type": "other",
-        "name": "update",
-        "xml": "<outcome value='Update'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 310,
-        "y": 360,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "8298d18a.63e4b"
-            ]
-        ]
-    },
-    {
-        "id": "3bcc844d.917dbc",
-        "type": "other",
-        "name": "delete",
-        "xml": "<outcome value='delete'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 310,
-        "y": 440,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "9a40237.2d204e"
-            ]
-        ]
-    },
-    {
-        "id": "9a40237.2d204e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 451.5,
-        "y": 440,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7bf268a7.980d48",
-        "type": "comment",
-        "name": "TODO: Delete topology from AAI",
-        "info": "",
-        "comments": "",
-        "x": 384.3335189819336,
-        "y": 407.96899485588074,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "9d107456.f08fe8",
-        "type": "switchNode",
-        "name": "switch aai-event-trigger",
-        "xml": "<switch test=\"`$data-change-notification-input.aai-event-trigger`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 140.5,
-        "y": 400,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "197ffd5b.105fa3",
-                "3bcc844d.917dbc"
-            ]
-        ]
-    },
-    {
-        "id": "68d03f9b.5e646",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 871.5,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "608a6bc.8344d94",
-                "7a11c3b.828ac3c",
-                "365e44a4.701f6c",
-                "a3a71589.3e7428",
-                "c3222caa.a5e2a"
-            ]
-        ]
-    },
-    {
-        "id": "7a11c3b.828ac3c",
-        "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": 1144.5001983642578,
-        "y": 161.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "15e6e327.6bb24d",
-                "b8526c6a.21372"
-            ]
-        ]
-    },
-    {
-        "id": "15e6e327.6bb24d",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1358.0001983642578,
-        "y": 141.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "eada649a.e312c8"
-            ]
-        ]
-    },
-    {
-        "id": "b8526c6a.21372",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1354.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "bf5d38a1.f76208"
-            ]
-        ]
-    },
-    {
-        "id": "eada649a.e312c8",
-        "type": "set",
-        "name": "set token-id",
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
-        "comments": "",
-        "x": 1508.5001983642578,
-        "y": 141.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "3ad01439.f9afec",
-        "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": 1575.5001983642578,
-        "y": 261.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "a2f37f5d.3d152",
-                "76d94eec.78391"
-            ]
-        ]
-    },
-    {
-        "id": "a2f37f5d.3d152",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1818.0001983642578,
-        "y": 281.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "f2edc52a.829ae8"
-            ]
-        ]
-    },
-    {
-        "id": "f2edc52a.829ae8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1975.5001983642578,
-        "y": 281.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "2876228a.bd45de"
-            ]
-        ]
-    },
-    {
-        "id": "f0deaa8b.a77c48",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",
-        "comments": "",
-        "x": 1952.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "76d94eec.78391",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1814.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "f0deaa8b.a77c48"
-            ]
-        ]
-    },
-    {
-        "id": "a45743c4.fd9ac",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 98,
-        "y": 100,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "4069c94b.4e3178"
-            ]
-        ]
-    },
-    {
-        "id": "4069c94b.4e3178",
-        "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": 164,
-        "y": 160,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "a97cf7f0.905958"
-            ]
-        ]
-    },
-    {
-        "id": "a97cf7f0.905958",
-        "type": "method",
-        "name": "method esr-thirdparty-sdnc-discovery",
-        "xml": "<method rpc='esr-thirdparty-sdnc-discovery' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 184,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "8d013bc1.d159b8"
-            ]
-        ]
-    },
-    {
-        "id": "8d013bc1.d159b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 431.5,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "9d107456.f08fe8"
-            ]
-        ]
-    },
-    {
-        "id": "2876228a.bd45de",
-        "type": "for",
-        "name": "for each Network",
-        "xml": "<for index='nidx' start='0' end='`$topology.networks.network_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1401.5002136230469,
-        "y": 380.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "ef7b8418.bcb8e8"
-            ]
-        ]
-    },
-    {
-        "id": "ef7b8418.bcb8e8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1550.0002136230469,
-        "y": 380.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "64202ed1.e0b41",
-                "93269044.8fece"
-            ]
-        ]
-    },
-    {
-        "id": "64202ed1.e0b41",
-        "type": "call",
-        "name": "call update-network-to-aai",
-        "xml": "<call module='DataChange' rpc='update-network-to-aai' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1729.0002136230469,
-        "y": 400.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "93269044.8fece",
-        "type": "set",
-        "name": "set network",
-        "xml": "<set>\n<parameter name='network.' value='`$topology.networks.network[$nidx].`' />\n",
-        "comments": "",
-        "x": 1684.0002136230469,
-        "y": 360.0000247955322,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "bf5d38a1.f76208",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1474.0001983642578,
-        "y": 181.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9588f43b.0d44f8",
-        "type": "comment",
-        "name": "Do Nothing",
-        "info": "",
-        "comments": "",
-        "x": 1644.0001983642578,
-        "y": 221.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "60d84913.695d78",
-        "type": "switchNode",
-        "name": "switch type",
-        "xml": "<switch test=\"`$prop.sdncRestApi.type`\">\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 563,
-        "y": 360,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "de59227b.bacf9",
-                "1a34048f.8eca2b"
-            ]
-        ]
-    },
-    {
-        "id": "8298d18a.63e4b",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 430,
-        "y": 360,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "60d84913.695d78"
-            ]
-        ]
-    },
-    {
-        "id": "de59227b.bacf9",
-        "type": "other",
-        "name": "SOTN",
-        "xml": "<outcome value='SOTN'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 710,
-        "y": 240,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "68d03f9b.5e646"
-            ]
-        ]
-    },
-    {
-        "id": "1a34048f.8eca2b",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 725.0000076293945,
-        "y": 479.00003242492676,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "7faf207a.622e5"
-            ]
-        ]
-    },
-    {
-        "id": "7faf207a.622e5",
-        "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=\"`'Unsupported type = ' + $prop.sdncRestApi.type`\" />\n\n",
-        "comments": "",
-        "x": 903.0000076293945,
-        "y": 479.00003242492676,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "608a6bc.8344d94",
-        "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": 1091.0001983642578,
-        "y": 121.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "365e44a4.701f6c",
-        "type": "switchNode",
-        "name": "switch prop.sdncRestApi.token_id",
-        "xml": "<switch test=\"`$prop.sdncRestApi.token_id`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1137.5001983642578,
-        "y": 241.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "b737a6fe.87cf68",
-                "878b1fd0.506dd"
-            ]
-        ]
-    },
-    {
-        "id": "b737a6fe.87cf68",
-        "type": "other",
-        "name": "Null",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1354.0001983642578,
-        "y": 221.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "de7d499c.f87aa8"
-            ]
-        ]
-    },
-    {
-        "id": "878b1fd0.506dd",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1354.0001983642578,
-        "y": 261.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "3ad01439.f9afec"
-            ]
-        ]
-    },
-    {
-        "id": "de7d499c.f87aa8",
-        "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": 1575.5001983642578,
-        "y": 221.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            [
-                "76d94eec.78391",
-                "a2f37f5d.3d152"
-            ]
-        ]
-    },
-    {
-        "id": "c3222caa.a5e2a",
-        "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": 1134.0001983642578,
-        "y": 381.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a3a71589.3e7428",
-        "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": 1094.0001983642578,
-        "y": 341.00000953674316,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    },
-    {
-        "id": "98c18166.4a0f3",
-        "type": "comment",
-        "name": "Notification subscription",
-        "info": "",
-        "comments": "",
-        "x": 1099.000343322754,
-        "y": 298.00000858306885,
-        "z": "a54d391e.88f7d8",
-        "wires": []
-    }
+[
+    {
+        "id": "26c72de4.f15082", 
+        "type": "other", 
+        "name": "update", 
+        "xml": "<outcome value='Update'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 666, 
+        "y": 254, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "414d6ccb.3d26fc"
+            ]
+        ]
+    }, 
+    {
+        "id": "41138058.b8876", 
+        "type": "other", 
+        "name": "delete", 
+        "xml": "<outcome value='delete'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 666, 
+        "y": 334, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "25011722.26281"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "26c72de4.f15082", 
+                "41138058.b8876"
+            ]
+        ]
+    }, 
+    {
+        "id": "73bed9ba.1eeb9", 
+        "type": "block", 
+        "name": "block : atomic", 
+        "xml": "<block atomic=\"true\">", 
+        "atomic": "true", 
+        "outputs": 1, 
+        "x": 1193.5, 
+        "y": 165, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "ebd26579.8d9818", 
+                "7c364355.c7d31c", 
+                "6bff7a95.f6b11c", 
+                "e40bbeb2.1466c", 
+                "257a5269.7c0d86"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "460f203b.a3333", 
+                "2634113c.c7fc8e"
+            ]
+        ]
+    }, 
+    {
+        "id": "460f203b.a3333", 
+        "type": "success", 
+        "name": "success", 
+        "xml": "<outcome value='success'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1756.000244140625, 
+        "y": 78, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "964773.4acb289"
+            ]
+        ]
+    }, 
+    {
+        "id": "2634113c.c7fc8e", 
+        "type": "failure", 
+        "name": "failure", 
+        "xml": "<outcome value='failure'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1752.000244140625, 
+        "y": 118, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "67cff30a.da3b54"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "83daffef.93261", 
+                "9a6001a7.b0681"
+            ]
+        ]
+    }, 
+    {
+        "id": "83daffef.93261", 
+        "type": "success", 
+        "name": "success", 
+        "xml": "<outcome value='success'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 2216.000244140625, 
+        "y": 218, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "815ae1d4.60f8"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "a1b0634d.e55008"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "56a034a.503e6cc"
+            ]
+        ]
+    }, 
+    {
+        "id": "39a13bfe.fb4444", 
+        "type": "dgstart", 
+        "name": "DGSTART", 
+        "outputs": 1, 
+        "x": 66, 
+        "y": 29, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "5147cfad.5c3908"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "15128d59.469f9b"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "1baee5be.1b11da"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "f40069ea.6c541"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "e7339f4e.4a45b8"
+            ]
+        ]
+    }, 
+    {
+        "id": "e7339f4e.4a45b8", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1948.000259399414, 
+        "y": 317.00001525878906, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "e39a1349.d59948", 
+                "a69e5196.594768"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "d7810e52.09a7a8", 
+                "ef809a67.dde878"
+            ]
+        ]
+    }, 
+    {
+        "id": "414d6ccb.3d26fc", 
+        "type": "block", 
+        "name": "block", 
+        "xml": "<block>\n", 
+        "atomic": "false", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 786, 
+        "y": 254, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "9b7ecf5d.bb983"
+            ]
+        ]
+    }, 
+    {
+        "id": "d7810e52.09a7a8", 
+        "type": "other", 
+        "name": "SOTN", 
+        "xml": "<outcome value='SOTN'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1032, 
+        "y": 165, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "73bed9ba.1eeb9"
+            ]
+        ]
+    }, 
+    {
+        "id": "ef809a67.dde878", 
+        "type": "other", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1047.0000076293945, 
+        "y": 404.00003242492676, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "ad793f5e.17f88"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "baf46d81.bf5f6", 
+                "789590c1.ea5428"
+            ]
+        ]
+    }, 
+    {
+        "id": "baf46d81.bf5f6", 
+        "type": "other", 
+        "name": "Null", 
+        "xml": "<outcome value=''>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1752.000244140625, 
+        "y": 158, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "fe0ff87c.8c90c"
+            ]
+        ]
+    }, 
+    {
+        "id": "789590c1.ea5428", 
+        "type": "other", 
+        "name": "other", 
+        "xml": "<outcome value='Other'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 1752.000244140625, 
+        "y": 198, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "3bf66a70.af3866"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "9a6001a7.b0681", 
+                "83daffef.93261"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [
+                "5e28a0df.7fabe", 
+                "39367b0f.d19614"
+            ]
+        ]
+    }, 
+    {
+        "id": "5e28a0df.7fabe", 
+        "type": "outcomeFalse", 
+        "name": "false", 
+        "xml": "<outcome value='false'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 293, 
+        "y": 294, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "fc46fa0c.31e87"
+            ]
+        ]
+    }, 
+    {
+        "id": "39367b0f.d19614", 
+        "type": "outcomeTrue", 
+        "name": "true", 
+        "xml": "<outcome value='true'>\n", 
+        "comments": "", 
+        "outputs": 1, 
+        "x": 294, 
+        "y": 419, 
+        "z": "1a9b8475.da0d2c", 
+        "wires": [
+            [
+                "8828fa0f.91d7c8"
+            ]
+        ]
+    }, 
+    {
+        "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", 
+        "wires": [
+            [ ]
+        ]
+    }
 ]
\ No newline at end of file
-- 
cgit 1.2.3-korg