Fix for overlay DGs.

Changes includes:
1) use `` for expressions.
2) fix loading issue.

Change-Id: Iff71b5be7e606b3bc343cf9d5f9e81eba0e51e06
Issue-Id: SDNC-113
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

Former-commit-id: 0f1278b2a69a5c0ab0acd2693111d56577ed0d90

1 files changed, 211 insertions, 211 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
index cfccd825..c6ec5441 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.json
@@ -1,20 +1,20 @@
 [
   {
-    "id":"148f01b9.7651be",
+    "id":"afc28ff2.d8ea9",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":127.66666412353516,
-    "y":59.666664123535156,
-    "z":"b8d6a9b7.54bca8",
+    "x":101.93510437011719,
+    "y":56,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "75389724.73d1d8"
+        "a8585fe8.5793e"
       ]
     ]
   },
   {
-    "id":"75389724.73d1d8",
+    "id":"a8585fe8.5793e",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
@@ -22,61 +22,61 @@
     "comments":"",
     "xml":"<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
     "outputs":1,
-    "x":388.66666412353516,
-    "y":130.66666412353516,
-    "z":"b8d6a9b7.54bca8",
+    "x":362.9351043701172,
+    "y":127,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "c572bb07.b4aab8"
+        "94697b2b.bea8e8"
       ]
     ]
   },
   {
-    "id":"c572bb07.b4aab8",
+    "id":"94697b2b.bea8e8",
     "type":"method",
     "name":"method dci-connects-network-topology-operation-deactivate",
     "xml":"<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":278.66666412353516,
-    "y":215.66666412353516,
-    "z":"b8d6a9b7.54bca8",
+    "x":252.9351043701172,
+    "y":212,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "2e7d9d36.9e8932"
+        "24e4978b.40bb18"
       ]
     ]
   },
   {
-    "id":"2e7d9d36.9e8932",
+    "id":"24e4978b.40bb18",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":613.6666793823242,
-    "y":215.66667366027832,
-    "z":"b8d6a9b7.54bca8",
+    "x":587.9351196289062,
+    "y":212.00000953674316,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "b8044390.c16c5",
-        "d126698a.8dba88",
-        "3c585b18.c1b394",
-        "17e0f0e1.f4a85f",
-        "c13afebf.e4af7"
+        "60e59d5a.4ad384",
+        "9bff20c0.b11cf",
+        "35e712db.b43fee",
+        "6edb8096.c4d1e",
+        "a782fd8c.f34ee"
       ]
     ]
   },
   {
-    "id":"b8044390.c16c5",
+    "id":"60e59d5a.4ad384",
     "type":"call",
     "name":"call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml":"<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments":"",
     "outputs":1,
-    "x":948.6666641235352,
-    "y":84.66666412353516,
-    "z":"b8d6a9b7.54bca8",
+    "x":922.9351043701172,
+    "y":81,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -84,97 +84,97 @@
     ]
   },
   {
-    "id":"d126698a.8dba88",
+    "id":"9bff20c0.b11cf",
     "type":"returnSuccess",
     "name":"return success",
     "xml":"<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
     "comments":"",
-    "x":814.6666412353516,
-    "y":863.6666374206543,
-    "z":"b8d6a9b7.54bca8",
+    "x":788.9350814819336,
+    "y":859.9999732971191,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"a0179072.b0699",
+    "id":"bb4ced0c.de7b8",
     "type":"block",
     "name":"block : sendRequest",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":1010.1666946411133,
-    "y":559.1823291778564,
-    "z":"b8d6a9b7.54bca8",
+    "x":984.4351348876953,
+    "y":555.5156650543213,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "2004f909.4303c6",
-        "8f1e5d77.2d978",
-        "db4a772d.b48518",
-        "a9badb26.f8ff08"
+        "d1e4e88.126bd18",
+        "bfe084a4.ec1ca8",
+        "d78e26a8.5dd648",
+        "1f1b0399.96268c"
       ]
     ]
   },
   {
-    "id":"48d3ef18.744f9",
+    "id":"24a23dfb.9014c2",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1542.666591644287,
-    "y":356.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1516.9350318908691,
+    "y":352.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "f3e0b35b.ac7e6"
+        "4f88ee45.9763"
       ]
     ]
   },
   {
-    "id":"1f0ce6e6.d7e319",
+    "id":"e4d7297.507cad8",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1549.666591644287,
-    "y":394.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1523.9350318908691,
+    "y":390.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "25422e06.a06362"
+        "30ddc43e.1be0dc"
       ]
     ]
   },
   {
-    "id":"c9371824.9cf4a8",
+    "id":"7ed45316.3f63cc",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1541.666591644287,
-    "y":436.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1515.9350318908691,
+    "y":432.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "caa6b2ac.fdad4"
+        "f80e7609.f66618"
       ]
     ]
   },
   {
-    "id":"f3e0b35b.ac7e6",
+    "id":"4f88ee45.9763",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1707.666591644287,
-    "y":345.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1681.9350318908691,
+    "y":341.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -182,72 +182,72 @@
     ]
   },
   {
-    "id":"25422e06.a06362",
+    "id":"30ddc43e.1be0dc",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1706.666591644287,
-    "y":398.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1680.9350318908691,
+    "y":394.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"caa6b2ac.fdad4",
+    "id":"f80e7609.f66618",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1699.666591644287,
-    "y":445.1818552017212,
-    "z":"b8d6a9b7.54bca8",
+    "x":1673.9350318908691,
+    "y":441.51519107818604,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"2004f909.4303c6",
+    "id":"d1e4e88.126bd18",
     "type":"get-resource",
     "name":"get-resource esr-thirdparty-sdnc",
     "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n",
     "comments":"",
     "outputs":1,
-    "x":1318.6666793823242,
-    "y":403.18186211586,
-    "z":"b8d6a9b7.54bca8",
+    "x":1292.9351196289062,
+    "y":399.51519799232483,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "48d3ef18.744f9",
-        "1f0ce6e6.d7e319",
-        "c9371824.9cf4a8"
+        "24a23dfb.9014c2",
+        "e4d7297.507cad8",
+        "7ed45316.3f63cc"
       ]
     ]
   },
   {
-    "id":"8f1e5d77.2d978",
+    "id":"bfe084a4.ec1ca8",
     "type":"set",
     "name":"set controller data",
     "xml":"<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`\" />\n<parameter name='prop.sdncRestApi.templateDir' value='/opt/onap/sdnc/data' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`\" />\n\n",
     "comments":"",
-    "x":1290.1665306091309,
-    "y":504.6818163394928,
-    "z":"b8d6a9b7.54bca8",
+    "x":1264.434970855713,
+    "y":501.01515221595764,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"fc904692.6194d8",
+    "id":"4fcdf2bb.86953c",
     "type":"execute",
     "name":"execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id\"/>\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=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id`\"/>\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=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>\n",
     "comments":"",
     "outputs":1,
-    "x":1818.1669692993164,
-    "y":622.1822843551636,
-    "z":"b8d6a9b7.54bca8",
+    "x":1792.4354095458984,
+    "y":618.5156202316284,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -255,64 +255,64 @@
     ]
   },
   {
-    "id":"db4a772d.b48518",
+    "id":"d78e26a8.5dd648",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1281.1664276123047,
-    "y":646.6817951202393,
-    "z":"b8d6a9b7.54bca8",
+    "x":1255.4348678588867,
+    "y":643.0151309967041,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "435458d3.7f7428",
-        "ac616ba.5114198"
+        "ee3b94c4.136978",
+        "935dfafd.d77e18"
       ]
     ]
   },
   {
-    "id":"435458d3.7f7428",
+    "id":"ee3b94c4.136978",
     "type":"outcomeTrue",
     "name":"L3-DCI",
     "xml":"<outcome value='L3-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1494.1665573120117,
-    "y":626.6817951202393,
-    "z":"b8d6a9b7.54bca8",
+    "x":1468.4349975585938,
+    "y":623.0151309967041,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "fc904692.6194d8"
+        "4fcdf2bb.86953c"
       ]
     ]
   },
   {
-    "id":"ac616ba.5114198",
+    "id":"935dfafd.d77e18",
     "type":"outcomeTrue",
     "name":"L2-DCI",
     "xml":"<outcome value='L2-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1492.1663780212402,
-    "y":698.6817951202393,
-    "z":"b8d6a9b7.54bca8",
+    "x":1466.4348182678223,
+    "y":695.0151309967041,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "43446998.00c4b8"
+        "b315041d.581508"
       ]
     ]
   },
   {
-    "id":"43446998.00c4b8",
+    "id":"b315041d.581508",
     "type":"execute",
     "name":"execute RestApiCallNode De-Activate Vxlan Tunnel",
-    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id\"/>\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=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
+    "xml":"<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id`\"/>\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=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"restapi-result\"/>",
     "comments":"",
     "outputs":1,
-    "x":1812.1669235229492,
-    "y":699.1822204589844,
-    "z":"b8d6a9b7.54bca8",
+    "x":1786.4353637695312,
+    "y":695.5155563354492,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -320,31 +320,31 @@
     ]
   },
   {
-    "id":"f950c622.50d2c8",
+    "id":"df0f7d7d.fb7f7",
     "type":"for",
     "name":"for each network-input-parameters",
     "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":1072.666648864746,
-    "y":160.18229579925537,
-    "z":"b8d6a9b7.54bca8",
+    "x":1046.9350891113281,
+    "y":156.51563167572021,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "2803809e.cd6f9"
+        "d4d1f0ce.b7e74"
       ]
     ]
   },
   {
-    "id":"a9badb26.f8ff08",
+    "id":"1f1b0399.96268c",
     "type":"record",
     "name":"record",
     "xml":"<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"dci-network-topology-operation-deactivate\"/>\n<parameter name=\"field3\" value=\"dci-connects.id\" />\n<parameter name=\"field4\" value=\"`$prop.dci-connects.id`\"/>\n<parameter name=\"field5\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field6\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field7\" value=\"dci-connects.tunnelType\" />\n<parameter name=\"field8\" value=\"`$prop.dci-connects.tunnelType`\"/>\n<parameter name=\"field9\" value=\"sdncRestApi.thirdpartySdnc.url\"/>\n<parameter name=\"field10\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url`\"/>",
     "comments":"",
     "outputs":1,
-    "x":1255.0000305175781,
-    "y":578.6666641235352,
-    "z":"b8d6a9b7.54bca8",
+    "x":1229.2684707641602,
+    "y":575,
+    "z":"7989b353.45560c",
     "wires":[
       [
 
@@ -352,308 +352,308 @@
     ]
   },
   {
-    "id":"2803809e.cd6f9",
+    "id":"d4d1f0ce.b7e74",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1306.0000915527344,
-    "y":159.6666717529297,
-    "z":"b8d6a9b7.54bca8",
+    "x":1280.2685317993164,
+    "y":156.00000762939453,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "b059e691.786878",
-        "e3c86ec7.af8ef"
+        "36149500.01f18c",
+        "ba269191.56dc8"
       ]
     ]
   },
   {
-    "id":"b059e691.786878",
+    "id":"36149500.01f18c",
     "type":"switchNode",
     "name":"switch site1_id",
     "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1512.3333015441895,
-    "y":128.66666793823242,
-    "z":"b8d6a9b7.54bca8",
+    "x":1486.6017417907715,
+    "y":125.00000381469727,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "6b8958be.1a4d18"
+        "acfbd7a0.59b5e8"
       ]
     ]
   },
   {
-    "id":"6b8958be.1a4d18",
+    "id":"acfbd7a0.59b5e8",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1713.333396911621,
-    "y":127.6666669845581,
-    "z":"b8d6a9b7.54bca8",
+    "x":1687.6018371582031,
+    "y":124.00000286102295,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "4c747d09.9d8e34"
+        "237ecb59.1d0964"
       ]
     ]
   },
   {
-    "id":"4c747d09.9d8e34",
+    "id":"237ecb59.1d0964",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1886.9997482299805,
-    "y":127.33321189880371,
-    "z":"b8d6a9b7.54bca8",
+    "x":1861.2681884765625,
+    "y":123.66654777526855,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"e3c86ec7.af8ef",
+    "id":"ba269191.56dc8",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'tunnelType'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1522.333381652832,
-    "y":181.6666738986969,
-    "z":"b8d6a9b7.54bca8",
+    "x":1496.601821899414,
+    "y":178.00000977516174,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "53a3a5f5.60a92c"
+        "6d15d351.7a469c"
       ]
     ]
   },
   {
-    "id":"53a3a5f5.60a92c",
+    "id":"6d15d351.7a469c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1728.333381652832,
-    "y":181.6666738986969,
-    "z":"b8d6a9b7.54bca8",
+    "x":1702.601821899414,
+    "y":178.00000977516174,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "e41570df.a2318"
+        "330168fb.71c318"
       ]
     ]
   },
   {
-    "id":"e41570df.a2318",
+    "id":"330168fb.71c318",
     "type":"set",
     "name":"set tunnelType",
     "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1897.333480834961,
-    "y":181.66668915748596,
-    "z":"b8d6a9b7.54bca8",
+    "x":1871.601921081543,
+    "y":178.0000250339508,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"3c585b18.c1b394",
+    "id":"35e712db.b43fee",
     "type":"block",
     "name":"block : executeSite1",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":802,
-    "y":161.3333282470703,
-    "z":"b8d6a9b7.54bca8",
+    "x":776.268440246582,
+    "y":157.66666412353516,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "f950c622.50d2c8",
-        "a0179072.b0699"
+        "df0f7d7d.fb7f7",
+        "bb4ced0c.de7b8"
       ]
     ]
   },
   {
-    "id":"3cc5f533.01012a",
+    "id":"5b0cba4c.81dcb4",
     "type":"for",
     "name":"for each network-input-parameters",
     "xml":"<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":1077.666732788086,
-    "y":266.3332996368408,
-    "z":"b8d6a9b7.54bca8",
+    "x":1051.935173034668,
+    "y":262.66663551330566,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "38542283.614a3e"
+        "2694ce03.b776a2"
       ]
     ]
   },
   {
-    "id":"38542283.614a3e",
+    "id":"2694ce03.b776a2",
     "type":"block",
     "name":"block",
     "xml":"<block>\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1306.000099182129,
-    "y":268.81767559051514,
-    "z":"b8d6a9b7.54bca8",
+    "x":1280.268539428711,
+    "y":265.15101146698,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "4cb30828.1cc3b8"
+        "cdac3e08.6cbf5"
       ]
     ]
   },
   {
-    "id":"4cb30828.1cc3b8",
+    "id":"cdac3e08.6cbf5",
     "type":"switchNode",
     "name":"switch site2_id",
     "xml":"<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site2_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1507.0000495910645,
-    "y":268.8176612854004,
-    "z":"b8d6a9b7.54bca8",
+    "x":1481.2684898376465,
+    "y":265.15099716186523,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "dd6bc853.9b86f8"
+        "6bd0e46.d18a11c"
       ]
     ]
   },
   {
-    "id":"dd6bc853.9b86f8",
+    "id":"6bd0e46.d18a11c",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1708.000144958496,
-    "y":267.8176603317261,
-    "z":"b8d6a9b7.54bca8",
+    "x":1682.2685852050781,
+    "y":264.1509962081909,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "eabf42ba.5e4d4"
+        "aa108b27.c2a0e8"
       ]
     ]
   },
   {
-    "id":"eabf42ba.5e4d4",
+    "id":"aa108b27.c2a0e8",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1881.6664962768555,
-    "y":267.4842052459717,
-    "z":"b8d6a9b7.54bca8",
+    "x":1855.9349365234375,
+    "y":263.8175411224365,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"17e0f0e1.f4a85f",
+    "id":"6edb8096.c4d1e",
     "type":"block",
     "name":"block : executeSite1",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":802.0000076293945,
-    "y":270.48433208465576,
-    "z":"b8d6a9b7.54bca8",
+    "x":776.2684478759766,
+    "y":266.8176679611206,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "3cc5f533.01012a",
-        "a0179072.b0699"
+        "5b0cba4c.81dcb4",
+        "bb4ced0c.de7b8"
       ]
     ]
   },
   {
-    "id":"ba49b6c1.a72218",
+    "id":"45699908.a75b98",
     "type":"set",
     "name":"set object-path",
     "xml":"<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/network-topology/'` \" />\n \n",
     "comments":"",
-    "x":1117.0039901733398,
-    "y":791.5274066925049,
-    "z":"b8d6a9b7.54bca8",
+    "x":1091.2724304199219,
+    "y":787.8607425689697,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"378e343e.0cb45c",
+    "id":"d2e9c512.6abce8",
     "type":"set",
     "name":"set networkId",
     "xml":"<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
     "comments":"",
-    "x":1111.289623260498,
-    "y":754.3845148086548,
-    "z":"b8d6a9b7.54bca8",
+    "x":1085.55806350708,
+    "y":750.7178506851196,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"c13afebf.e4af7",
+    "id":"a782fd8c.f34ee",
     "type":"block",
     "name":"block : saveNetworkData",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":854.0000610351562,
-    "y":730.3333559036255,
-    "z":"b8d6a9b7.54bca8",
+    "x":828.2685012817383,
+    "y":726.6666917800903,
+    "z":"7989b353.45560c",
     "wires":[
       [
-        "378e343e.0cb45c",
-        "ba49b6c1.a72218",
-        "44d19a8f.ba7544",
-        "e247e731.bf5fd8"
+        "d2e9c512.6abce8",
+        "45699908.a75b98",
+        "50cb404a.13f74",
+        "768af1e8.a21de"
       ]
     ]
   },
   {
-    "id":"74d41b77.b05d54",
+    "id":"d2714bfd.01d828",
     "type":"comment",
     "name":"TODO",
     "info":"Currently deactivate does deletion too, later divide in two phases.",
     "comments":"",
-    "x":736,
-    "y":23.666664123535156,
-    "z":"b8d6a9b7.54bca8",
+    "x":710.268440246582,
+    "y":20,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"44d19a8f.ba7544",
+    "id":"50cb404a.13f74",
     "type":"set",
     "name":"copy input to service-data",
     "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
     "comments":"",
-    "x":1147.0000686645508,
-    "y":710.6666679382324,
-    "z":"b8d6a9b7.54bca8",
+    "x":1121.2685089111328,
+    "y":707.0000038146973,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]
   },
   {
-    "id":"e247e731.bf5fd8",
+    "id":"768af1e8.a21de",
     "type":"set",
     "name":"set network-level-oper-status",
     "xml":"<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
     "comments":"",
-    "x":1161,
-    "y":838.6666259765625,
-    "z":"b8d6a9b7.54bca8",
+    "x":1135.268440246582,
+    "y":834.9999618530273,
+    "z":"7989b353.45560c",
     "wires":[
 
     ]