From b625cdd2063e4ce28a6d807a64bb54682eda9447 Mon Sep 17 00:00:00 2001
From: Gaurav Agrawal <gaurav.agrawal@huawei.com>
Date: Fri, 29 Sep 2017 00:50:55 +0530
Subject: Update plugin references

Following changes made for overlay deactivate
1) Updated record plugin to latest one.
2) Replace ecomp schema with onap.

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

Former-commit-id: fceb8a2083d4c0a52329fb4375874e96c5253715
---
 ...ects-network-topology-operation-deactivate.json | 338 ++++++++++-----------
 ...nects-network-topology-operation-deactivate.xml | 186 ++++++------
 2 files changed, 263 insertions(+), 261 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 6fafe879..960679ff 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,83 +1,83 @@
 [
   {
-    "id":"eeae4316.cdec",
+    "id":"b4ab3cc5.98a8",
     "type":"dgstart",
     "name":"DGSTART",
     "outputs":1,
-    "x":115.515625,
-    "y":122.99999809265137,
-    "z":"2933569e.30217a",
+    "x":77,
+    "y":35,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "7ad6aab3.a56c94"
+        "e6efa6d3.e15398"
       ]
     ]
   },
   {
-    "id":"7ad6aab3.a56c94",
+    "id":"e6efa6d3.e15398",
     "type":"service-logic",
     "name":"GENERIC-RESOURCE-API ${project.version}",
     "module":"GENERIC-RESOURCE-API",
     "version":"${project.version}",
     "comments":"",
-    "xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "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":376.515625,
-    "y":193.99999809265137,
-    "z":"2933569e.30217a",
+    "x":338,
+    "y":106,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "bd801194.dff35"
+        "55bb413f.73fa7"
       ]
     ]
   },
   {
-    "id":"bd801194.dff35",
+    "id":"55bb413f.73fa7",
     "type":"method",
-    "name":"method network-topology-operation-deactivate",
-    "xml":"<method rpc='network-topology-operation-deactivate' mode='sync'>\n",
+    "name":"method dci-connects-network-topology-operation-deactivate",
+    "xml":"<method rpc='dci-connects-network-topology-operation-deactivate' mode='sync'>\n",
     "comments":"",
     "outputs":1,
-    "x":266.515625,
-    "y":278.99999809265137,
-    "z":"2933569e.30217a",
+    "x":228,
+    "y":191,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "8b1d6765.c218b8"
+        "750ee4c.8fdd21c"
       ]
     ]
   },
   {
-    "id":"8b1d6765.c218b8",
+    "id":"750ee4c.8fdd21c",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "outputs":1,
-    "x":565.515625,
-    "y":272.99999809265137,
-    "z":"2933569e.30217a",
+    "x":527,
+    "y":185,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "85df938d.13ecb",
-        "b2094172.75092",
-        "13babe31.b69a72",
-        "f439b4ae.e8d898",
-        "4f2b1067.595de",
-        "8fe14514.6a6bc8"
+        "ea6f8a69.5601e8",
+        "2f344129.2fe78e",
+        "33c821d9.b212fe",
+        "15fa4d45.d0b353",
+        "7e978ea8.0c5a1",
+        "a04a290c.948ab8"
       ]
     ]
   },
   {
-    "id":"85df938d.13ecb",
+    "id":"ea6f8a69.5601e8",
     "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":936.515625,
-    "y":147.99999809265137,
-    "z":"2933569e.30217a",
+    "x":898,
+    "y":60,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
 
@@ -85,188 +85,188 @@
     ]
   },
   {
-    "id":"b2094172.75092",
+    "id":"2f344129.2fe78e",
     "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":802.5156021118164,
-    "y":926.9999713897705,
-    "z":"2933569e.30217a",
+    "x":763.9999771118164,
+    "y":838.9999732971191,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"13babe31.b69a72",
+    "id":"33c821d9.b212fe",
     "type":"get-resource",
-    "name":"get-resource l3-dci-connects",
+    "name":"get-resource dci-connects",
     "xml":"<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"dci-connects\" \n\t\tkey=\"dci-connects.id AND depth = '1'\"\n        pfx='tmp.aai.dci-connects' local-only='false' >\n",
     "comments":"",
     "outputs":1,
-    "x":842.5156097412109,
-    "y":394.99998688697815,
-    "z":"2933569e.30217a",
+    "x":803.9999847412109,
+    "y":306.9999887943268,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "ff781717.68c208",
-        "9a6836ab.43f888",
-        "a0abee05.64d97"
+        "bcbac350.046e5",
+        "bcb8c268.c1efd",
+        "95a7f0ae.33df5"
       ]
     ]
   },
   {
-    "id":"ff781717.68c208",
+    "id":"bcbac350.046e5",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1091.515609741211,
-    "y":358.99998688697815,
-    "z":"2933569e.30217a",
+    "x":1052.999984741211,
+    "y":270.9999887943268,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "5e87a4a5.a7530c"
+        "9441b536.e2c908"
       ]
     ]
   },
   {
-    "id":"9a6836ab.43f888",
+    "id":"bcb8c268.c1efd",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1098.515609741211,
-    "y":396.99998688697815,
-    "z":"2933569e.30217a",
+    "x":1059.999984741211,
+    "y":308.9999887943268,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "5ebdd537.9ec61c"
+        "22635f7c.d7e7a"
       ]
     ]
   },
   {
-    "id":"a0abee05.64d97",
+    "id":"95a7f0ae.33df5",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1090.515609741211,
-    "y":438.99998688697815,
-    "z":"2933569e.30217a",
+    "x":1051.999984741211,
+    "y":350.9999887943268,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "50c37e9e.947eb"
+        "a0aae260.9c5c2"
       ]
     ]
   },
   {
-    "id":"5ebdd537.9ec61c",
+    "id":"22635f7c.d7e7a",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1255.515609741211,
-    "y":400.99998688697815,
-    "z":"2933569e.30217a",
+    "x":1216.999984741211,
+    "y":312.9999887943268,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"50c37e9e.947eb",
+    "id":"a0aae260.9c5c2",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1248.515609741211,
-    "y":447.99998688697815,
-    "z":"2933569e.30217a",
+    "x":1209.999984741211,
+    "y":359.9999887943268,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"f439b4ae.e8d898",
+    "id":"15fa4d45.d0b353",
     "type":"block",
     "name":"block : sendRequest",
     "xml":"<block atomic=\"true\">",
     "atomic":"true",
     "comments":"",
     "outputs":1,
-    "x":804.015625,
-    "y":694.515625,
-    "z":"2933569e.30217a",
+    "x":765.5,
+    "y":606.5156269073486,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "8b5b23cb.a33ca",
-        "f4a22786.a36188",
-        "c94f0b3c.ea6228"
+        "e1e92378.2c99d",
+        "673c8079.171c7",
+        "5c11d741.ea97f8"
       ]
     ]
   },
   {
-    "id":"1b157d61.6e8663",
+    "id":"c5be9b53.183ee8",
     "type":"success",
     "name":"success",
     "xml":"<outcome value='success'>\n",
     "comments":"",
     "outputs":1,
-    "x":1297.5153923034668,
-    "y":546.5151443481445,
-    "z":"2933569e.30217a",
+    "x":1258.9997673034668,
+    "y":458.51514625549316,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "1b1e8622.49dc9a"
+        "c033d341.3f6dc"
       ]
     ]
   },
   {
-    "id":"96522a7e.300418",
+    "id":"dcc81047.e0f45",
     "type":"not-found",
     "name":"not-found",
     "xml":"<outcome value='not-found'>\n",
     "comments":"",
     "outputs":1,
-    "x":1304.5153923034668,
-    "y":584.5151443481445,
-    "z":"2933569e.30217a",
+    "x":1265.9997673034668,
+    "y":496.51514625549316,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "656e7a99.f99cc4"
+        "a86ff2ba.5ed55"
       ]
     ]
   },
   {
-    "id":"a258e00f.28592",
+    "id":"38f7300e.03a3f",
     "type":"other",
     "name":"other",
     "xml":"<outcome value='Other'>\n",
     "comments":"",
     "outputs":1,
-    "x":1296.5153923034668,
-    "y":626.5151443481445,
-    "z":"2933569e.30217a",
+    "x":1257.9997673034668,
+    "y":538.5151462554932,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "d5ca22dc.f5439"
+        "d2f0ad9e.7cf8d"
       ]
     ]
   },
   {
-    "id":"1b1e8622.49dc9a",
+    "id":"c033d341.3f6dc",
     "type":"block",
     "name":"block : atomic",
     "xml":"<block atomic=\"true\">\n",
     "atomic":"false",
     "comments":"",
     "outputs":1,
-    "x":1462.5153923034668,
-    "y":535.5151443481445,
-    "z":"2933569e.30217a",
+    "x":1423.9997673034668,
+    "y":447.51514625549316,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
 
@@ -274,72 +274,72 @@
     ]
   },
   {
-    "id":"656e7a99.f99cc4",
+    "id":"a86ff2ba.5ed55",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1461.5153923034668,
-    "y":588.5151443481445,
-    "z":"2933569e.30217a",
+    "x":1422.9997673034668,
+    "y":500.51514625549316,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"d5ca22dc.f5439",
+    "id":"d2f0ad9e.7cf8d",
     "type":"returnFailure",
     "name":"return failure",
     "xml":"<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments":"",
-    "x":1454.5153923034668,
-    "y":635.5151443481445,
-    "z":"2933569e.30217a",
+    "x":1415.9997673034668,
+    "y":547.5151462554932,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"8b5b23cb.a33ca",
+    "id":"e1e92378.2c99d",
     "type":"get-resource",
     "name":"get-resource dci-connects",
     "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":1109.5155143737793,
-    "y":593.5151634216309,
-    "z":"2933569e.30217a",
+    "x":1070.9998893737793,
+    "y":505.5151653289795,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "1b157d61.6e8663",
-        "96522a7e.300418",
-        "a258e00f.28592"
+        "c5be9b53.183ee8",
+        "dcc81047.e0f45",
+        "38f7300e.03a3f"
       ]
     ]
   },
   {
-    "id":"f4a22786.a36188",
+    "id":"673c8079.171c7",
     "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":1081.015365600586,
-    "y":695.0151176452637,
-    "z":"2933569e.30217a",
+    "x":1042.499740600586,
+    "y":607.0151195526123,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"3f552595.383f8a",
+    "id":"2589b144.7be4de",
     "type":"execute",
-    "name":"execute RestApiCallNode 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.l3-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",
+    "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",
     "comments":"",
     "outputs":1,
-    "x":1612.0158996582031,
-    "y":757.5155801773071,
-    "z":"2933569e.30217a",
+    "x":1573.5002746582031,
+    "y":669.5155820846558,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
 
@@ -347,64 +347,64 @@
     ]
   },
   {
-    "id":"c94f0b3c.ea6228",
+    "id":"5c11d741.ea97f8",
     "type":"switchNode",
     "name":"switch tunnelType",
     "xml":"<switch test=\"`$prop.dci-connects.tunnelType`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1075.0153579711914,
-    "y":782.0150909423828,
-    "z":"2933569e.30217a",
+    "x":1036.4997329711914,
+    "y":694.0150928497314,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "914d6e77.2cf0c",
-        "3cebe90a.101a76"
+        "6492045a.52a02c",
+        "647c96d8.6f1708"
       ]
     ]
   },
   {
-    "id":"914d6e77.2cf0c",
+    "id":"6492045a.52a02c",
     "type":"outcomeTrue",
     "name":"L3-DCI",
     "xml":"<outcome value='L3-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1288.0154876708984,
-    "y":762.0150909423828,
-    "z":"2933569e.30217a",
+    "x":1249.4998626708984,
+    "y":674.0150928497314,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "3f552595.383f8a"
+        "2589b144.7be4de"
       ]
     ]
   },
   {
-    "id":"3cebe90a.101a76",
+    "id":"647c96d8.6f1708",
     "type":"outcomeTrue",
     "name":"L2-DCI",
     "xml":"<outcome value='L2-DCI'>\n",
     "comments":"",
     "outputs":1,
-    "x":1286.015308380127,
-    "y":834.0150909423828,
-    "z":"2933569e.30217a",
+    "x":1247.499683380127,
+    "y":746.0150928497314,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "b5ca32ee.3260d"
+        "4fb66e63.84804"
       ]
     ]
   },
   {
-    "id":"b5ca32ee.3260d",
+    "id":"4fb66e63.84804",
     "type":"execute",
-    "name":"execute RestApiCallNode 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.l2-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\"/>",
+    "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\"/>",
     "comments":"",
     "outputs":1,
-    "x":1606.015853881836,
-    "y":834.5155162811279,
-    "z":"2933569e.30217a",
+    "x":1567.500228881836,
+    "y":746.5155181884766,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
 
@@ -412,15 +412,15 @@
     ]
   },
   {
-    "id":"4f2b1067.595de",
+    "id":"7e978ea8.0c5a1",
     "type":"record",
     "name":"record",
-    "xml":"<record plugin=\"org.openecomp.sdnc.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"Time\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"Method\" value=\"network-topology-operation-deactivate\"/>\n<parameter name=\"SubMethod\" value=\"l3-dci-connects\"/>\n<parameter name=\"L3DciConnectsId\" value=\"`$l3-dci-connects.id`\"/>\n",
+    "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=\"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`\"/>",
     "comments":"",
     "outputs":1,
-    "x":777.515625,
-    "y":517.0000152587891,
-    "z":"2933569e.30217a",
+    "x":739,
+    "y":429.0000171661377,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
 
@@ -428,77 +428,77 @@
     ]
   },
   {
-    "id":"5e87a4a5.a7530c",
+    "id":"9441b536.e2c908",
     "type":"set",
     "name":"set tunnelType",
     "xml":"<set>\n<parameter name='prop.dci-connects.tunnelType' value=\"`$tmp.aai.dci-connects.dci-connects.serviceType`\" />\n",
     "comments":"",
-    "x":1279.5157089233398,
-    "y":348.5156841278076,
-    "z":"2933569e.30217a",
+    "x":1241.0000839233398,
+    "y":260.51568603515625,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   },
   {
-    "id":"8fe14514.6a6bc8",
+    "id":"a04a290c.948ab8",
     "type":"for",
     "name":"for each network-input-parameters",
     "xml":"<for index='idx' start='0' end='`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`' >\n\n",
     "comments":"",
     "outputs":1,
-    "x":829.515625,
-    "y":268.515625,
-    "z":"2933569e.30217a",
+    "x":791,
+    "y":180.51562690734863,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "9bafb819.fdc5e8"
+        "ecdadcb9.f534b"
       ]
     ]
   },
   {
-    "id":"9bafb819.fdc5e8",
+    "id":"ecdadcb9.f534b",
     "type":"switchNode",
     "name":"switch id",
     "xml":"<switch test=\"`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`\">\n",
     "comments":"",
     "outputs":1,
-    "x":1084.015724182129,
-    "y":269.51563453674316,
-    "z":"2933569e.30217a",
+    "x":1045.500099182129,
+    "y":181.5156364440918,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "773bba4f.547604"
+        "6f6c6213.b682dc"
       ]
     ]
   },
   {
-    "id":"773bba4f.547604",
+    "id":"6f6c6213.b682dc",
     "type":"outcomeTrue",
     "name":"true",
     "xml":"<outcome value='true'>\n",
     "comments":"",
     "outputs":1,
-    "x":1286.0158500671387,
-    "y":268.5156497955322,
-    "z":"2933569e.30217a",
+    "x":1247.5002250671387,
+    "y":180.51565170288086,
+    "z":"4954cd5d.30ecf4",
     "wires":[
       [
-        "f4c8640f.9553e8"
+        "9c537412.9158a8"
       ]
     ]
   },
   {
-    "id":"f4c8640f.9553e8",
+    "id":"9c537412.9158a8",
     "type":"set",
     "name":"set id",
     "xml":"<set>\n<parameter name='prop.dci-connects.id' value='`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments":"",
-    "x":1467.6822319030762,
-    "y":267.1821994781494,
-    "z":"2933569e.30217a",
+    "x":1429.1666069030762,
+    "y":179.18220138549805,
+    "z":"4954cd5d.30ecf4",
     "wires":[
 
     ]
   }
-]
\ No newline at end of file
+]
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 d9c3fbb3..3a9e57dc 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
@@ -1,95 +1,97 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module="GENERIC-RESOURCE-API" version="${project.version}">
-    <method rpc="network-topology-operation-deactivate" mode="sync">
-        <block atomic="true">
-            <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
-            <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
-                <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
-                    <outcome value="true">
-                        <set>
-                            <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
-                        </set>
-                    </outcome>
-                </switch>
-            </for>
-            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="dci-connects" key="dci-connects.id AND depth = '1'" pfx="tmp.aai.dci-connects" local-only="false">
-                <outcome value="success">
-                    <set>
-                        <parameter name="prop.dci-connects.tunnelType" value="`$tmp.aai.dci-connects.dci-connects.serviceType`" />
-                    </set>
-                </outcome>
-                <outcome value="not-found">
-                    <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                    </return>
-                </outcome>
-                <outcome value="Other">
-                    <return status="failure">
-                        <parameter name="error-code" value="" />
-                        <parameter name="error-message" value="" />
-                    </return>
-                </outcome>
+<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}">
+   <method rpc="dci-connects-network-topology-operation-deactivate" mode="sync">
+      <block atomic="true">
+         <call module="GENERIC-RESOURCE-API" rpc="validate-network-input-parameters" mode="sync" />
+         <for index="idx" start="0" end="`$network-topology-operation-input.network-request-input.network-input-parameters.param_length`">
+            <switch test="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].name == 'site1_id'`">
+               <outcome value="true">
+                  <set>
+                     <parameter name="prop.dci-connects.id" value="`$network-topology-operation-input.network-request-input.network-input-parameters.param[$idx].value`" />
+                  </set>
+               </outcome>
+            </switch>
+         </for>
+         <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="dci-connects" key="dci-connects.id AND depth = '1'" pfx="tmp.aai.dci-connects" local-only="false">
+            <outcome value="success">
+               <set>
+                  <parameter name="prop.dci-connects.tunnelType" value="`$tmp.aai.dci-connects.dci-connects.serviceType`" />
+               </set>
+            </outcome>
+            <outcome value="not-found">
+               <return status="failure">
+                  <parameter name="error-code" value="" />
+                  <parameter name="error-message" value="" />
+               </return>
+            </outcome>
+            <outcome value="Other">
+               <return status="failure">
+                  <parameter name="error-code" value="" />
+                  <parameter name="error-message" value="" />
+               </return>
+            </outcome>
+         </get-resource>
+         <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
+            <parameter name="logger" value="message-log" />
+            <parameter name="field1" value="__TIMESTAMP__" />
+            <parameter name="field2" value="network-topology-operation-deactivate" />
+            <parameter name="field3" value="dci-connects.id" />
+            <parameter name="field4" value="`$prop.dci-connects.id`" />
+            <parameter name="field5" value="dci-connects.tunnelType" />
+            <parameter name="field6" value="`$prop.dci-connects.tunnelType`" />
+         </record>
+         <block atomic="true">
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
+               <outcome value="success">
+                  <block atomic="true" />
+               </outcome>
+               <outcome value="not-found">
+                  <return status="failure">
+                     <parameter name="error-code" value="" />
+                     <parameter name="error-message" value="" />
+                  </return>
+               </outcome>
+               <outcome value="Other">
+                  <return status="failure">
+                     <parameter name="error-code" value="" />
+                     <parameter name="error-message" value="" />
+                  </return>
+               </outcome>
             </get-resource>
-            <record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
-                <parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log" />
-                <parameter name="Time" value="__TIMESTAMP__" />
-                <parameter name="Method" value="network-topology-operation-deactivate" />
-                <parameter name="SubMethod" value="l3-dci-connects" />
-                <parameter name="L3DciConnectsId" value="`$l3-dci-connects.id`" />
-            </record>
-            <block atomic="true">
-                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="esr-thirdparty-sdnc" key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $prop.dci-connects.id AND         depth = '1'" pfx="tmp.aai.esr-thirdparty-sdnc" local-only="false">
-                    <outcome value="success">
-                        <block atomic="true" />
-                    </outcome>
-                    <outcome value="not-found">
-                        <return status="failure">
-                            <parameter name="error-code" value="" />
-                            <parameter name="error-message" value="" />
-                        </return>
-                    </outcome>
-                    <outcome value="Other">
-                        <return status="failure">
-                            <parameter name="error-code" value="" />
-                            <parameter name="error-message" value="" />
-                        </return>
-                    </outcome>
-                </get-resource>
-                <set>
-                    <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
-                    <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[0].esr-system-info.user-name`" />
-                    <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
-                </set>
-                <switch test="`$prop.dci-connects.tunnelType`">
-                    <outcome value="L3-DCI">
-                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.l3-dci-connects.id" />
-                            <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                            <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
-                            <parameter name="format" value="json" />
-                            <parameter name="httpMethod" value="delete" />
-                            <parameter name="responsePrefix" value="restapi-result" />
-                        </execute>
-                    </outcome>
-                    <outcome value="L2-DCI">
-                        <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
-                            <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.l2-dci-connects.id" />
-                            <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
-                            <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
-                            <parameter name="format" value="json" />
-                            <parameter name="httpMethod" value="delete" />
-                            <parameter name="responsePrefix" value="restapi-result" />
-                        </execute>
-                    </outcome>
-                </switch>
-            </block>
-            <return status="success">
-                <parameter name="ack-final-indicator" value="Y" />
-                <parameter name="error-code" value="200" />
-                <parameter name="error-message" value="`$error-message`" />
-            </return>
-        </block>
-    </method>
+            <set>
+               <parameter name="prop.sdncRestApi.thirdpartySdnc.url" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.serviceUrl`" />
+               <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[0].esr-system-info.user-name`" />
+               <parameter name="prop.sdncRestApi.thirdpartySdnc.password" value="`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list[0].esr-system-info.password`" />
+            </set>
+            <switch test="`$prop.dci-connects.tunnelType`">
+               <outcome value="L3-DCI">
+                  <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                     <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l3-dci-connects/' + $prop.dci-connects.id" />
+                     <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                     <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                     <parameter name="format" value="json" />
+                     <parameter name="httpMethod" value="delete" />
+                     <parameter name="responsePrefix" value="restapi-result" />
+                  </execute>
+               </outcome>
+               <outcome value="L2-DCI">
+                  <execute plugin="org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode" method="sendRequest">
+                     <parameter name="restapiUrl" value="$prop.sdncRestApi.thirdpartySdnc.url + '/v2.0/l2-dci-connects/' + $prop.dci-connects.id" />
+                     <parameter name="restapiUser" value="$prop.sdncRestApi.thirdpartySdnc.user" />
+                     <parameter name="restapiPassword" value="$prop.sdncRestApi.thirdpartySdnc.password" />
+                     <parameter name="format" value="json" />
+                     <parameter name="httpMethod" value="delete" />
+                     <parameter name="responsePrefix" value="restapi-result" />
+                  </execute>
+               </outcome>
+            </switch>
+         </block>
+         <return status="success">
+            <parameter name="ack-final-indicator" value="Y" />
+            <parameter name="error-code" value="200" />
+            <parameter name="error-message" value="`$error-message`" />
+         </return>
+      </block>
+   </method>
 </service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg