4 files changed, 440 insertions, 287 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
index 5f91a3d2..5bba62e6 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.json
@@ -1897,7 +1897,7 @@
     "id": "3620f5be.990eda",
     "type": "save",
     "name": "save overlay configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.dci.network-id' >\n<parameter name='configuration-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-type' value='overlay' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='configuration' \n      key='configuration.configuration-id = $prop.dci.network-id' >\n<parameter name='configuration-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-type' value='overlay' />\n<parameter name='configuration-sub-type' value='VPN-DCI' />\n<parameter name='orchestration-status' value='Created' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$prop.dci.network-id`' />\n<parameter name='configuration-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
     "x": 845.53125,
@@ -1911,7 +1911,7 @@
     "id": "2b8696d6.909b7a",
     "type": "save",
     "name": "save service relationship in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-id' >\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"/network/configurations/configuration\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id \n         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"configuration\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/configurations/configuration/' + $prop.dci.network-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"configuration.configuration-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.dci.network-id`\" />",
     "comments": "",
     "outputs": 1,
     "x": 803.5312805175781,
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 81bc7e9b..df6236cc 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": "6559b393.6f861c",
+    "id": "afc82ce2.121c78",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 119.03125,
-    "y": 56,
-    "z": "5c765a65.b2ea34",
+    "x": 79,
+    "y": 77,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "7c1b2fe9.45548"
+        "db617858.b4ddb"
       ]
     ]
   },
   {
-    "id": "7c1b2fe9.45548",
+    "id": "db617858.b4ddb",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,652 +22,793 @@
     "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": 380.03125,
-    "y": 127,
-    "z": "5c765a65.b2ea34",
+    "x": 340,
+    "y": 148,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "aa816cc6.1183d"
+        "bb132476.9ca4e"
       ]
     ]
   },
   {
-    "id": "aa816cc6.1183d",
+    "id": "bb132476.9ca4e",
     "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": 270.03125,
-    "y": 212,
-    "z": "5c765a65.b2ea34",
+    "x": 230,
+    "y": 233,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "eac98b7a.9d5828"
+        "2a9be4c6.eb14b4"
       ]
     ]
   },
   {
-    "id": "eac98b7a.9d5828",
+    "id": "2a9be4c6.eb14b4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 605.0312652587891,
-    "y": 212.00000953674316,
-    "z": "5c765a65.b2ea34",
+    "x": 565.0000152587891,
+    "y": 233.00000953674316,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "477ac034.f205c",
-        "f8509dc8.168a7",
-        "8e2e032c.881de",
-        "68a7916a.a5311",
-        "6f360656.1dec58",
-        "7aead92.5a32728"
+        "ab306509.d7099",
+        "d2dfa358.504c58",
+        "a8a63952.1bc7f8",
+        "57931680.a91588",
+        "4204819e.38435",
+        "82e8e8d7.c3425",
+        "c09f45a3.c220d8"
       ]
     ]
   },
   {
-    "id": "477ac034.f205c",
+    "id": "ab306509.d7099",
     "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": 930.0313568115234,
-    "y": 52.00000190734863,
-    "z": "5c765a65.b2ea34",
+    "x": 900,
+    "y": 102,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       []
     ]
   },
   {
-    "id": "f8509dc8.168a7",
+    "id": "d2dfa358.504c58",
     "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.03125,
-    "y": 974,
-    "z": "5c765a65.b2ea34",
+    "x": 774,
+    "y": 995,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "c12d1dde.f4e3",
+    "id": "ae004639.5a1a9",
     "type": "block",
     "name": "block : sendRequest",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1001.5312805175781,
-    "y": 555.5156650543213,
-    "z": "5c765a65.b2ea34",
+    "x": 961.5000305175781,
+    "y": 576.5156650543213,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "4ec4fd77.ad10f4",
-        "aa980a06.38e9b8",
-        "e11c9638.70d6a8",
-        "376cb70c.ff4a7"
+        "ca9f4012.a368f",
+        "6f0aecce.06e20c",
+        "29bbe40.27fea1c",
+        "1ce08181.681226"
       ]
     ]
   },
   {
-    "id": "5870b6d9.9c5e38",
+    "id": "4509fe22.e5801",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1534.031177520752,
-    "y": 352.51519107818604,
-    "z": "5c765a65.b2ea34",
+    "x": 1493.999927520752,
+    "y": 373.51519107818604,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "25c20f00.fa6cf"
+        "fd4a0bd2.51c28"
       ]
     ]
   },
   {
-    "id": "39a6df4a.252ba",
+    "id": "72b32ace.1dce64",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1541.031177520752,
-    "y": 390.51519107818604,
-    "z": "5c765a65.b2ea34",
+    "x": 1500.999927520752,
+    "y": 411.51519107818604,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "3e95b312.6100ac"
+        "6310ff1e.a9757"
       ]
     ]
   },
   {
-    "id": "f0e345da.109628",
+    "id": "3dd8b536.d8d3e2",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1533.031177520752,
-    "y": 432.51519107818604,
-    "z": "5c765a65.b2ea34",
+    "x": 1492.999927520752,
+    "y": 453.51519107818604,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "3f665015.a6a47"
+        "bf2176dd.c8fbf8"
       ]
     ]
   },
   {
-    "id": "3e95b312.6100ac",
+    "id": "6310ff1e.a9757",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1698.031177520752,
-    "y": 394.51519107818604,
-    "z": "5c765a65.b2ea34",
+    "x": 1657.999927520752,
+    "y": 415.51519107818604,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "3f665015.a6a47",
+    "id": "bf2176dd.c8fbf8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1691.031177520752,
-    "y": 441.51519107818604,
-    "z": "5c765a65.b2ea34",
+    "x": 1650.999927520752,
+    "y": 462.51519107818604,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "e11c9638.70d6a8",
+    "id": "ca9f4012.a368f",
     "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": 1310.031265258789,
-    "y": 399.51519799232483,
-    "z": "5c765a65.b2ea34",
+    "x": 1270.000015258789,
+    "y": 420.51519799232483,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "5870b6d9.9c5e38",
-        "39a6df4a.252ba",
-        "f0e345da.109628"
+        "4509fe22.e5801",
+        "72b32ace.1dce64",
+        "3dd8b536.d8d3e2"
       ]
     ]
   },
   {
-    "id": "25c20f00.fa6cf",
+    "id": "fd4a0bd2.51c28",
     "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.esr-system-info[0].service-url`\" />\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.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.vendor' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`\" />\n\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.vendor' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`\" />\n\n",
     "comments": "",
-    "x": 1713.5311279296875,
-    "y": 345.01513671875,
-    "z": "5c765a65.b2ea34",
+    "x": 1673.4998779296875,
+    "y": 366.01513671875,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "4ae70608.d9f108",
+    "id": "270eaaaf.6d8a76",
     "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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\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": 2109.531539916992,
-    "y": 549.5156259536743,
-    "z": "5c765a65.b2ea34",
+    "x": 2097.500289916992,
+    "y": 566.5156259536743,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       []
     ]
   },
   {
-    "id": "cb70d9c8.c98578",
+    "id": "108e039c.2a2694",
     "type": "switchNode",
     "name": "switch tunnelType",
     "xml": "<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1572.5309982299805,
-    "y": 574.01513671875,
-    "z": "5c765a65.b2ea34",
+    "x": 1560.4997482299805,
+    "y": 591.01513671875,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "cd693888.f47b98",
-        "41c50c84.a9e5b4"
+        "b27ecfa7.2e204",
+        "70cba102.5a4918"
       ]
     ]
   },
   {
-    "id": "cd693888.f47b98",
+    "id": "b27ecfa7.2e204",
     "type": "outcomeTrue",
     "name": "L3-DCI",
     "xml": "<outcome value='L3-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1785.5311279296875,
-    "y": 554.01513671875,
-    "z": "5c765a65.b2ea34",
+    "x": 1773.4998779296875,
+    "y": 571.01513671875,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "4ae70608.d9f108"
+        "270eaaaf.6d8a76"
       ]
     ]
   },
   {
-    "id": "41c50c84.a9e5b4",
+    "id": "70cba102.5a4918",
     "type": "outcomeTrue",
     "name": "L2-DCI",
     "xml": "<outcome value='L2-DCI'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1783.530948638916,
-    "y": 626.01513671875,
-    "z": "5c765a65.b2ea34",
+    "x": 1771.499698638916,
+    "y": 643.01513671875,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "c9cdc266.ba884"
+        "a70a8740.35415"
       ]
     ]
   },
   {
-    "id": "c9cdc266.ba884",
+    "id": "a70a8740.35415",
     "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\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "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": 2103.531494140625,
-    "y": 626.5155620574951,
-    "z": "5c765a65.b2ea34",
+    "x": 2091.500244140625,
+    "y": 643.5155620574951,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       []
     ]
   },
   {
-    "id": "56ea174e.66fdc8",
+    "id": "b6e2380b.22053",
     "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": 1064.031234741211,
-    "y": 156.51563167572021,
-    "z": "5c765a65.b2ea34",
+    "x": 1023.9999847412109,
+    "y": 177.51563167572021,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "d467ada9.bc47a"
+        "93278f1f.6117c"
       ]
     ]
   },
   {
-    "id": "4ec4fd77.ad10f4",
+    "id": "6f0aecce.06e20c",
     "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": 1247.3646240234375,
-    "y": 508,
-    "z": "5c765a65.b2ea34",
+    "x": 1207.3333740234375,
+    "y": 529,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       []
     ]
   },
   {
-    "id": "d467ada9.bc47a",
+    "id": "93278f1f.6117c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1297.3646774291992,
-    "y": 156.00000762939453,
-    "z": "5c765a65.b2ea34",
+    "x": 1257.3334274291992,
+    "y": 177.00000762939453,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "dfb8e94f.3061f8",
-        "6ee22c97.f3fe94"
+        "98a85984.08bf9",
+        "c01c858f.6535f"
       ]
     ]
   },
   {
-    "id": "dfb8e94f.3061f8",
+    "id": "98a85984.08bf9",
     "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": 1503.6978874206543,
-    "y": 125.00000381469727,
-    "z": "5c765a65.b2ea34",
+    "x": 1463.6666374206543,
+    "y": 146.00000381469727,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "424ca41d.d8b57c"
+        "931a8fd9.57dc4"
       ]
     ]
   },
   {
-    "id": "424ca41d.d8b57c",
+    "id": "931a8fd9.57dc4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1704.697982788086,
-    "y": 124.00000286102295,
-    "z": "5c765a65.b2ea34",
+    "x": 1664.666732788086,
+    "y": 145.00000286102295,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "3b8b7bc.f6de684"
+        "bf8602b7.a89dd"
       ]
     ]
   },
   {
-    "id": "3b8b7bc.f6de684",
+    "id": "bf8602b7.a89dd",
     "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": 1878.3643341064453,
-    "y": 123.66654777526855,
-    "z": "5c765a65.b2ea34",
+    "x": 1838.3330841064453,
+    "y": 144.66654777526855,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "6ee22c97.f3fe94",
+    "id": "c01c858f.6535f",
     "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": 1513.6979675292969,
-    "y": 178.00000977516174,
-    "z": "5c765a65.b2ea34",
+    "x": 1473.6667175292969,
+    "y": 199.00000977516174,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "b8f51f64.5384d"
+        "21e6cd01.99ffda"
       ]
     ]
   },
   {
-    "id": "b8f51f64.5384d",
+    "id": "21e6cd01.99ffda",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1719.6979675292969,
-    "y": 178.00000977516174,
-    "z": "5c765a65.b2ea34",
+    "x": 1679.6667175292969,
+    "y": 199.00000977516174,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "a2c0d127.d5692"
+        "4b7be50f.b4ead4"
       ]
     ]
   },
   {
-    "id": "a2c0d127.d5692",
+    "id": "4b7be50f.b4ead4",
     "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": 1888.6980667114258,
-    "y": 178.0000250339508,
-    "z": "5c765a65.b2ea34",
+    "x": 1848.6668167114258,
+    "y": 199.0000250339508,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "8e2e032c.881de",
+    "id": "a8a63952.1bc7f8",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 793.3645858764648,
-    "y": 157.66666412353516,
-    "z": "5c765a65.b2ea34",
+    "x": 753.3333358764648,
+    "y": 178.66666412353516,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "56ea174e.66fdc8",
-        "c12d1dde.f4e3"
+        "b6e2380b.22053",
+        "ae004639.5a1a9"
       ]
     ]
   },
   {
-    "id": "c8ad7c0c.e274a",
+    "id": "e321a5f2.fe2e3",
     "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": 1069.0313186645508,
-    "y": 262.66663551330566,
-    "z": "5c765a65.b2ea34",
+    "x": 1029.0000686645508,
+    "y": 283.66663551330566,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "323207f2.263c18"
+        "d37e272b.ea0298"
       ]
     ]
   },
   {
-    "id": "323207f2.263c18",
+    "id": "d37e272b.ea0298",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1297.3646850585938,
-    "y": 265.15101146698,
-    "z": "5c765a65.b2ea34",
+    "x": 1257.3334350585938,
+    "y": 286.15101146698,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "3c001f99.e738d"
+        "d847cda0.0460f"
       ]
     ]
   },
   {
-    "id": "3c001f99.e738d",
+    "id": "d847cda0.0460f",
     "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": 1498.3646354675293,
-    "y": 265.15099716186523,
-    "z": "5c765a65.b2ea34",
+    "x": 1458.3333854675293,
+    "y": 286.15099716186523,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "69a68f4d.5d472"
+        "7ed96e02.76a578"
       ]
     ]
   },
   {
-    "id": "69a68f4d.5d472",
+    "id": "7ed96e02.76a578",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1699.364730834961,
-    "y": 264.1509962081909,
-    "z": "5c765a65.b2ea34",
+    "x": 1659.333480834961,
+    "y": 285.1509962081909,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "2194fc1d.e7f094"
+        "d7f24acd.dc28e"
       ]
     ]
   },
   {
-    "id": "2194fc1d.e7f094",
+    "id": "d7f24acd.dc28e",
     "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": 1873.0310821533203,
-    "y": 263.8175411224365,
-    "z": "5c765a65.b2ea34",
+    "x": 1832.9998321533203,
+    "y": 284.8175411224365,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "68a7916a.a5311",
+    "id": "57931680.a91588",
     "type": "block",
     "name": "block : executeSite1",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 793.3645935058594,
-    "y": 266.8176679611206,
-    "z": "5c765a65.b2ea34",
+    "x": 753.3333435058594,
+    "y": 287.8176679611206,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "c8ad7c0c.e274a",
-        "c12d1dde.f4e3"
+        "e321a5f2.fe2e3",
+        "ae004639.5a1a9"
       ]
     ]
   },
   {
-    "id": "c71a68d.91d3a98",
-    "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",
+    "id": "85aea54b.a8d68",
+    "type": "comment",
+    "name": "TODO",
+    "info": "Currently deactivate does deletion too, later divide in two phases.",
     "comments": "",
-    "x": 1108.3685760498047,
-    "y": 787.8607425689697,
-    "z": "5c765a65.b2ea34",
+    "x": 687.3333358764648,
+    "y": 41,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "8529d043.0aea5",
-    "type": "set",
-    "name": "set networkId",
-    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
+    "id": "4204819e.38435",
+    "type": "delete",
+    "name": "delete underlay configuration in AAI",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
-    "x": 1102.654209136963,
-    "y": 750.7178506851196,
-    "z": "5c765a65.b2ea34",
-    "wires": []
+    "outputs": 1,
+    "x": 847,
+    "y": 636,
+    "z": "5a5462f8.9bc3ac",
+    "wires": [
+      []
+    ]
   },
   {
-    "id": "6f360656.1dec58",
-    "type": "block",
-    "name": "block : saveNetworkData",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
+    "id": "29bbe40.27fea1c",
+    "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": 1242,
+    "y": 477,
+    "z": "5a5462f8.9bc3ac",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1ce08181.681226",
+    "type": "switchNode",
+    "name": "switch vendor",
+    "xml": "<switch test=\"`$prop.sdncRestApi.thirdpartySdnc.vendor`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1198,
+    "y": 591,
+    "z": "5a5462f8.9bc3ac",
+    "wires": [
+      [
+        "d96f0afb.72174"
+      ]
+    ]
+  },
+  {
+    "id": "d96f0afb.72174",
+    "type": "outcomeTrue",
+    "name": "SPTN",
+    "xml": "<outcome value='SPTN'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 845.3646469116211,
-    "y": 726.6666917800903,
-    "z": "5c765a65.b2ea34",
+    "x": 1373,
+    "y": 591,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "8529d043.0aea5",
-        "c71a68d.91d3a98",
-        "b1e695ce.6afdf8",
-        "7c7891ee.131d7"
+        "108e039c.2a2694"
       ]
     ]
   },
   {
-    "id": "3da3119d.a99f0e",
+    "id": "b44d2822.3215d8",
     "type": "comment",
-    "name": "TODO",
-    "info": "Currently deactivate does deletion too, later divide in two phases.",
+    "name": "Remove network from service data",
+    "info": "",
     "comments": "",
-    "x": 727.3645858764648,
-    "y": 20,
-    "z": "5c765a65.b2ea34",
+    "x": 863.0000610351562,
+    "y": 696.9999389648438,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "b1e695ce.6afdf8",
+    "id": "82e8e8d7.c3425",
+    "type": "switchNode",
+    "name": "switch $service-data.networks.network_length",
+    "xml": "<switch test='`$service-data.networks.network_length`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 878.7658081054688,
+    "y": 740.0079956054688,
+    "z": "5a5462f8.9bc3ac",
+    "wires": [
+      [
+        "dba62b53.9a3ec",
+        "57166c95.83901c"
+      ]
+    ]
+  },
+  {
+    "id": "c09f45a3.c220d8",
     "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",
+    "name": "set output to api handler",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />\n \n",
     "comments": "",
-    "x": 1138.3646545410156,
-    "y": 707.0000038146973,
-    "z": "5c765a65.b2ea34",
+    "x": 814.7658081054688,
+    "y": 886.0079956054688,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "7c7891ee.131d7",
-    "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",
+    "id": "500bd365.2cd4bc",
+    "type": "comment",
+    "name": "If only one remove all networks",
+    "info": "",
     "comments": "",
-    "x": 1152.3645858764648,
-    "y": 834.9999618530273,
-    "z": "5c765a65.b2ea34",
+    "x": 1253.1837692260742,
+    "y": 701.267255783081,
+    "z": "5a5462f8.9bc3ac",
     "wires": []
   },
   {
-    "id": "7aead92.5a32728",
-    "type": "delete",
-    "name": "delete underlay configuration in AAI",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
+    "id": "dba62b53.9a3ec",
+    "type": "outcome",
+    "name": "1",
+    "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 882.03125,
-    "y": 894,
-    "z": "5c765a65.b2ea34",
+    "x": 1181.8134078979492,
+    "y": 736.674482345581,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
-      []
+      [
+        "9f9202f3.6e105"
+      ]
     ]
   },
   {
-    "id": "aa980a06.38e9b8",
-    "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": "",
+    "id": "9f9202f3.6e105",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
     "outputs": 1,
-    "x": 1282.03125,
-    "y": 456,
-    "z": "5c765a65.b2ea34",
+    "x": 1361.1467208862305,
+    "y": 737.3782787322998,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
-      []
+      [
+        "f066bd89.a6c2e8",
+        "c6b689fd.992278"
+      ]
     ]
   },
   {
-    "id": "376cb70c.ff4a7",
-    "type": "switchNode",
-    "name": "switch vendor",
-    "xml": "<switch test=\"`$prop.sdncRestApi.thirdpartySdnc.vendor`\">\n",
+    "id": "57166c95.83901c",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1239,
-    "y": 576,
-    "z": "5c765a65.b2ea34",
+    "x": 1148.1943588256836,
+    "y": 889.0078001022339,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "26c37886.1a934"
+        "3d590d9a.bcff9a"
       ]
     ]
   },
   {
-    "id": "26c37886.1a934",
-    "type": "outcomeTrue",
-    "name": "SPTN",
-    "xml": "<outcome value='SPTN'>\n",
+    "id": "3d590d9a.bcff9a",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1370.194236755371,
+    "y": 889.0078001022339,
+    "z": "5a5462f8.9bc3ac",
+    "wires": [
+      [
+        "5a71292a.6b8408",
+        "d3de161f.966088",
+        "963a7919.b37fb8",
+        "227d053b.c1572a"
+      ]
+    ]
+  },
+  {
+    "id": "f066bd89.a6c2e8",
+    "type": "set",
+    "name": "Remove networks",
+    "xml": "<set>\n\t<parameter name=\"service-data.networks.\" value=\"\"/>\n\n",
+    "comments": "",
+    "x": 1611.432273864746,
+    "y": 740.3413572311401,
+    "z": "5a5462f8.9bc3ac",
+    "wires": []
+  },
+  {
+    "id": "c6b689fd.992278",
+    "type": "set",
+    "name": "set new network length",
+    "xml": "<set>\n\t<parameter name=\"service-data.networks.network_length\" value=\"0\"/>\n\n\t\n",
+    "comments": "",
+    "x": 1627.7656478881836,
+    "y": 775.045015335083,
+    "z": "5a5462f8.9bc3ac",
+    "wires": []
+  },
+  {
+    "id": "227d053b.c1572a",
+    "type": "set",
+    "name": "Set new network length",
+    "xml": "<set>\n\t<parameter name=\"tmp.new_length\" value=\"`$service-data.networks.network_length - 1`\"/>\n\t\n\t\n",
+    "comments": "",
+    "x": 1633.8979721069336,
+    "y": 826.2671995162964,
+    "z": "5a5462f8.9bc3ac",
+    "wires": []
+  },
+  {
+    "id": "5a71292a.6b8408",
+    "type": "for",
+    "name": "for snidx..service-data.networks.network[]",
+    "xml": "<for silentFailure='true' index='snidx' start='`$tmp.nidx + 1`' end='`$service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1393,
-    "y": 578,
-    "z": "5c765a65.b2ea34",
+    "x": 1682.603172302246,
+    "y": 878.5711545944214,
+    "z": "5a5462f8.9bc3ac",
     "wires": [
       [
-        "cb70d9c8.c98578"
+        "ccdd9c9d.183f1"
       ]
     ]
+  },
+  {
+    "id": "963a7919.b37fb8",
+    "type": "set",
+    "name": "set new network length",
+    "xml": "<set>\n\t<parameter name=\"service-data.networks.network_length\" value=\"`$service-data.networks.network_length - 1`\"/>\n\n\t\n",
+    "comments": "",
+    "x": 1641.0620422363281,
+    "y": 922.3414134979248,
+    "z": "5a5462f8.9bc3ac",
+    "wires": []
+  },
+  {
+    "id": "d3de161f.966088",
+    "type": "set",
+    "name": "Remove networks",
+    "xml": "<set>\n\t<parameter name=\"service-data.networks.network[$tmp.new_length].\" value=\"\"/>\n\n",
+    "comments": "",
+    "x": 1620.9085083007812,
+    "y": 960.3093585968018,
+    "z": "5a5462f8.9bc3ac",
+    "wires": []
+  },
+  {
+    "id": "ccdd9c9d.183f1",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1971.1941833496094,
+    "y": 888.007833480835,
+    "z": "5a5462f8.9bc3ac",
+    "wires": [
+      []
+    ]
   }
 ]
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
index 3afa4b93..411cbb38 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-activate.xml
@@ -460,12 +460,15 @@
             <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $prop.dci.network-id">
                 <parameter name="configuration-id" value="`$prop.dci.network-id`" />
                 <parameter name="configuration-type" value="overlay" />
+                <parameter name="configuration-sub-type" value="VPN-DCI" />
                 <parameter name="orchestration-status" value="Created" />
+                <parameter name="operational-status" value="Created" />
+                <parameter name="model-customization-id" value="`$prop.dci.network-id`" />
                 <parameter name="configuration-selflink" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.dci.network-id  + '/network-data/'` " />
             </save>
-            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-id">
+            <save plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="service-instance:relationship-list" key="service-instance.service-instance-id = $service-data.service-information.service-instance-id           AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id           AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type" force="true" pfx="tmp.AnAI-data">
                 <parameter name="relationship-list.relationship[0].related-to" value="configuration" />
-                <parameter name="relationship-list.relationship[0].related-link" value="/network/configurations/configuration" />
+                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/configurations/configuration/' + $prop.dci.network-id`" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="configuration.configuration-id" />
                 <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.dci.network-id`" />
             </save>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
index 04cbb6e9..d70691bc 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_dci-connects-network-topology-operation-deactivate.xml
@@ -27,7 +27,6 @@
                   <outcome value="success">
                      <set>
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
@@ -74,7 +73,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                         <outcome value="L2-DCI">
@@ -85,7 +83,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                      </switch>
@@ -110,7 +107,6 @@
                   <outcome value="success">
                      <set>
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                        <parameter name="prop.sdncRestApi.templateDir" value="/opt/onap/sdnc/data" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.user" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
                         <parameter name="prop.sdncRestApi.thirdpartySdnc.vendor" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].vendor`" />
@@ -157,7 +153,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                         <outcome value="L2-DCI">
@@ -168,7 +163,6 @@
                               <parameter name="format" value="json" />
                               <parameter name="httpMethod" value="delete" />
                               <parameter name="responsePrefix" value="restapi-result" />
-                              <parameter name="customHttpHeaders" value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                            </execute>
                         </outcome>
                      </switch>
@@ -176,24 +170,39 @@
                </switch>
             </block>
          </block>
-         <block atomic="true">
-            <set>
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header." value="`$network-topology-operation-input.sdnc-request-header.`" />
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.request-information." value="`$network-topology-operation-input.request-information.`" />
-            </set>
-            <set>
-               <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
-            </set>
-            <set>
-               <parameter name="network-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $networkId  + '/network-data/network-topology/'` " />
-            </set>
-            <set>
-               <parameter name="service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status" value="Deleted" />
-               <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`" />
-               <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`" />
-            </set>
-         </block>
          <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="configuration" key="configuration.configuration-id = $network-topology-operation-input.network-information.network-id" />
+         <switch test="`$service-data.networks.network_length`">
+            <outcome value="1">
+               <block atomic="true">
+                  <set>
+                     <parameter name="service-data.networks." value="" />
+                  </set>
+                  <set>
+                     <parameter name="service-data.networks.network_length" value="0" />
+                  </set>
+               </block>
+            </outcome>
+            <outcome value="Other">
+               <block atomic="true">
+                  <set>
+                     <parameter name="tmp.new_length" value="`$service-data.networks.network_length - 1`" />
+                  </set>
+                  <for silentFailure="true" index="snidx" start="`$tmp.nidx + 1`" end="`$service-data.networks.network_length`">
+                     <block atomic="true" />
+                  </for>
+                  <set>
+                     <parameter name="service-data.networks.network_length" value="`$service-data.networks.network_length - 1`" />
+                  </set>
+                  <set>
+                     <parameter name="service-data.networks.network[$tmp.new_length]." value="" />
+                  </set>
+               </block>
+            </outcome>
+         </switch>
+         <set>
+            <parameter name="networkId" value="`$network-topology-operation-input.network-information.network-id`" />
+            <parameter name="service-object-path" value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/service-topology/'` " />
+         </set>
          <return status="success">
             <parameter name="ack-final-indicator" value="Y" />
             <parameter name="error-code" value="200" />