1 files changed, 228 insertions, 261 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
index 84599e1f..0534be5f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-activate.json
@@ -1,676 +1,643 @@
 [
   {
-    "id": "c57da515.f74988",
+    "id": "50195fc6.898bb",
     "type": "comment",
     "name": "sdwan-vnf-topology-operation-device-activate",
     "info": "",
     "comments": "",
-    "x": 571.344856262207,
-    "y": 61,
-    "z": "48050f50.e2132",
+    "x": 550.00390625,
+    "y": 71.00390625,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "e16a751b.7b48a8",
+    "id": "85d78052.fe7cc",
     "type": "service-logic",
-    "name": "GENERIC-RESOURCE-API 1.2.1-SNAPSHOT",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
-    "version": "1.2.1-SNAPSHOT",
+    "version": "${project.version}",
     "comments": "",
-    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='1.2.1-SNAPSHOT'>",
+    "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": 251.2857666015625,
-    "y": 132.0002670288086,
-    "z": "48050f50.e2132",
+    "x": 229.94481658935547,
+    "y": 142.0041732788086,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "e3b9d3fc.f582d"
+        "323cadd3.27c0d2"
       ]
     ]
   },
   {
-    "id": "22a66427.5103ec",
+    "id": "aaa38f17.f307a",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 172.00006103515625,
-    "y": 69.76215744018555,
-    "z": "48050f50.e2132",
+    "x": 150.65911102294922,
+    "y": 79.76606369018555,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "e16a751b.7b48a8"
+        "85d78052.fe7cc"
       ]
     ]
   },
   {
-    "id": "5e9c748a.d0c93c",
+    "id": "220347f8.1484e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 246.66673278808594,
-    "y": 411.42884254455566,
-    "z": "48050f50.e2132",
+    "x": 225.3257827758789,
+    "y": 421.43274879455566,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "164a289d.b889e7",
-        "c60faf33.f797b",
-        "138d258a.ddadba",
-        "2a9fc936.08f4c6",
-        "b4b11b51.f47008",
-        "88ab4e5f.36358",
-        "15d0a117.420b6f",
-        "34088ab3.22cba6",
-        "96fd10aa.3117f",
-        "3c7b9f2b.d2464",
-        "4d7e6631.03a558",
-        "58df9113.78ab9",
-        "971b776.085e288",
-        "64ab23e7.432f0c"
+        "e6b80f71.25bd4",
+        "41d21371.3482cc",
+        "ede17b3a.f75148",
+        "d7029e79.59672",
+        "6ae18188.f2044",
+        "f628964.b562168",
+        "120defaf.28edc",
+        "46c583fa.d0b40c",
+        "139f4e2.66d6eb2",
+        "a27fb783.ef2f48",
+        "bcf0047f.528cc8",
+        "981acfda.e23ab",
+        "86570f1a.fe5e8",
+        "fba2af80.f96de"
       ]
     ]
   },
   {
-    "id": "c60faf33.f797b",
+    "id": "41d21371.3482cc",
     "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": 646.3334732055664,
-    "y": 1056.0956745147705,
-    "z": "48050f50.e2132",
+    "x": 624.9925231933594,
+    "y": 1066.0995807647705,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "164a289d.b889e7",
+    "id": "e6b80f71.25bd4",
     "type": "set",
     "name": "set vnf-level-oper-status to Active",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='Active' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
     "comments": "",
-    "x": 727.813533782959,
-    "y": 863.4328231811523,
-    "z": "48050f50.e2132",
+    "x": 706.472583770752,
+    "y": 873.4367294311523,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "b4b11b51.f47008",
+    "id": "6ae18188.f2044",
     "type": "set",
     "name": "copy input data to service data",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\n",
+    "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\n",
     "comments": "",
-    "x": 705.6667251586914,
-    "y": 919.4289989471436,
-    "z": "48050f50.e2132",
+    "x": 684.3257751464844,
+    "y": 929.4329051971436,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "49141d65.bdcea4",
+    "id": "4cad5392.24fc9c",
     "type": "comment",
     "name": "make sure this VNF doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1443.8572311401367,
-    "y": 634.9527101516724,
-    "z": "48050f50.e2132",
+    "x": 1422.5162811279297,
+    "y": 644.9566164016724,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "3c7b9f2b.d2464",
+    "id": "a27fb783.ef2f48",
     "type": "save",
     "name": "save deviceInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='device-id' value='$deviceResp[0].id' />\n<parameter name='operational-status' value='Active' />",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.id = $vnf-topology-operation-input.vnf-information.vnf-id' >\n<parameter name='id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='device-id' value='`$deviceResp.success[0].id`' />\n<parameter name='operational-status' value='Active' />",
     "comments": "",
     "outputs": 1,
-    "x": 730.0002212524414,
-    "y": 969.3179988861084,
-    "z": "48050f50.e2132",
+    "x": 708.6592712402344,
+    "y": 979.3219051361084,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]
   },
   {
-    "id": "e3b9d3fc.f582d",
+    "id": "323cadd3.27c0d2",
     "type": "method",
     "name": "method sdwan-vnf-topology-operation-device-activate",
     "xml": "<method rpc='sdwan-vnf-topology-operation-device-activate' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 263.00006103515625,
-    "y": 226.3484992980957,
-    "z": "48050f50.e2132",
+    "x": 241.65911102294922,
+    "y": 236.3524055480957,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "5e9c748a.d0c93c"
+        "220347f8.1484e8"
       ]
     ]
   },
   {
-    "id": "138d258a.ddadba",
+    "id": "ede17b3a.f75148",
     "type": "set",
     "name": "set vnfId and vnf-object-path",
     "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",
     "comments": "",
-    "x": 709.0001754760742,
-    "y": 812.348635673523,
-    "z": "48050f50.e2132",
+    "x": 687.6592254638672,
+    "y": 822.352541923523,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "64ab23e7.432f0c",
+    "id": "fba2af80.f96de",
     "type": "execute",
     "name": "execute RestApiCallNode Create Devcie Instance",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"deviceResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n\n\n<!--execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-wan-port.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v1/sdwan/net/transport-network-ports'`\" />\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=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"wanPortResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" /-->",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sdwan-device.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/campus/v3/devices'`\" />\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=\"put\"/>\n<parameter name=\"responsePrefix\" value=\"deviceResp\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 784.4446868896484,
-    "y": 639.1265163421631,
-    "z": "48050f50.e2132",
+    "x": 763.1037368774414,
+    "y": 649.1304225921631,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "fe651cbe.71dae",
-        "4a034411.478adc"
+        "1a1378b0.178537",
+        "d8dd7f14.0ab02"
       ]
     ]
   },
   {
-    "id": "971b776.085e288",
+    "id": "86570f1a.fe5e8",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 738.4446105957031,
-    "y": 509.1263904571533,
-    "z": "48050f50.e2132",
+    "x": 717.1036605834961,
+    "y": 519.1302967071533,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "f5a9152f.d977a8",
-        "12711b8c.b16b14"
+        "946c47ae.42bcf8",
+        "ddd15567.8fafd8"
       ]
     ]
   },
   {
-    "id": "f5a9152f.d977a8",
+    "id": "946c47ae.42bcf8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 970.4446105957031,
-    "y": 489.1263904571533,
-    "z": "48050f50.e2132",
+    "x": 949.1036605834961,
+    "y": 499.1302967071533,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "3cccbb3c.73ecb4"
+        "8008bf96.00803"
       ]
     ]
   },
   {
-    "id": "12711b8c.b16b14",
+    "id": "ddd15567.8fafd8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 962.6946105957031,
-    "y": 530.7692737579346,
-    "z": "48050f50.e2132",
+    "x": 941.3536605834961,
+    "y": 540.7731800079346,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "3e406e18.5253e2"
+        "87a9f03d.7da59"
       ]
     ]
   },
   {
-    "id": "3cccbb3c.73ecb4",
+    "id": "8008bf96.00803",
     "type": "set",
     "name": "set token-id",
     "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='`$token-result.data.token_id`' />\n",
     "comments": "",
-    "x": 1107.4446105957031,
-    "y": 489.1263904571533,
-    "z": "48050f50.e2132",
+    "x": 1086.103660583496,
+    "y": 499.1302967071533,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "3e406e18.5253e2",
+    "id": "87a9f03d.7da59",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1088.7781066894531,
-    "y": 531.0153064727783,
-    "z": "48050f50.e2132",
+    "x": 1067.437156677246,
+    "y": 541.0192127227783,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]
   },
   {
-    "id": "647f2905.b3b168",
+    "id": "e45b42b8.e6dbb",
     "type": "comment",
     "name": "Do Nothing",
     "info": "",
     "comments": "",
-    "x": 1350.333652496338,
-    "y": 331.9041233062744,
-    "z": "48050f50.e2132",
+    "x": 1328.9927024841309,
+    "y": 341.9080295562744,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "a8bad102.6b5e9",
+    "id": "928cde96.7898d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1211.1111526489258,
-    "y": 609.0153045654297,
-    "z": "48050f50.e2132",
+    "x": 1189.7702026367188,
+    "y": 619.0192108154297,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]
   },
   {
-    "id": "e9b5eb58.3f04d8",
+    "id": "d1dae5c1.63a508",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Activate Device rest api\" />\n",
     "comments": "",
-    "x": 1212.5557327270508,
-    "y": 659.570837020874,
-    "z": "48050f50.e2132",
+    "x": 1191.2147827148438,
+    "y": 669.574743270874,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "4a034411.478adc",
+    "id": "d8dd7f14.0ab02",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1059.555576324463,
-    "y": 662.5707912445068,
-    "z": "48050f50.e2132",
+    "x": 1038.2146263122559,
+    "y": 672.5746974945068,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "e9b5eb58.3f04d8"
+        "d1dae5c1.63a508"
       ]
     ]
   },
   {
-    "id": "fe651cbe.71dae",
+    "id": "1a1378b0.178537",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1059.0000915527344,
-    "y": 606.2375030517578,
-    "z": "48050f50.e2132",
+    "x": 1037.6591415405273,
+    "y": 616.2414093017578,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "a8bad102.6b5e9"
+        "928cde96.7898d"
       ]
     ]
   },
   {
-    "id": "88ab4e5f.36358",
+    "id": "f628964.b562168",
     "type": "set",
     "name": "set deviceId to service data",
-    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"deviceId\" />\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$deviceResp[0].id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n",
+    "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"deviceId\" />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$deviceResp.success[0].id`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n",
     "comments": "",
-    "x": 715.0003280639648,
-    "y": 764.3488826751709,
-    "z": "48050f50.e2132",
+    "x": 693.6593780517578,
+    "y": 774.3527889251709,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "7e5552be.6be08c",
-    "type": "comment",
-    "name": "URL needs to confirm.",
-    "info": "",
-    "comments": "",
-    "x": 763.0001525878906,
-    "y": 581.3486194610596,
-    "z": "48050f50.e2132",
-    "wires": []
-  },
-  {
-    "id": "62f12a96.37bf64",
+    "id": "7d88138b.724c0c",
     "type": "comment",
     "name": "AAI resource need to update",
     "info": "",
     "comments": "",
-    "x": 1041.0001754760742,
-    "y": 923.348635673523,
-    "z": "48050f50.e2132",
+    "x": 1019.6592254638672,
+    "y": 933.352541923523,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "58df9113.78ab9",
+    "id": "981acfda.e23ab",
     "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 = SDWAN-Controller AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
+    "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 = SDWANController AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 733.0002746582031,
-    "y": 413.34861183166504,
-    "z": "48050f50.e2132",
+    "x": 711.6593246459961,
+    "y": 423.35251808166504,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "a6d8f866.73e908",
-        "7fc0e78d.a01498",
-        "1501ba2b.428996"
+        "d90f92f1.56733",
+        "58ca0b39.c48274",
+        "871628e8.c20ff8"
       ]
     ]
   },
   {
-    "id": "a6d8f866.73e908",
+    "id": "d90f92f1.56733",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 974.0003318786621,
-    "y": 338.3485860824585,
-    "z": "48050f50.e2132",
+    "x": 952.6593818664551,
+    "y": 348.3524923324585,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "133ac586.e3a64a"
+        "9c017cb1.5ef39"
       ]
     ]
   },
   {
-    "id": "133ac586.e3a64a",
+    "id": "9c017cb1.5ef39",
     "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.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",
     "comments": "",
-    "x": 1223.5003852844238,
-    "y": 294.348575592041,
-    "z": "48050f50.e2132",
+    "x": 1129.159423828125,
+    "y": 339.35248136520386,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "7fc0e78d.a01498",
+    "id": "58ca0b39.c48274",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 965.4911689758301,
-    "y": 386.92263412475586,
-    "z": "48050f50.e2132",
+    "x": 944.150218963623,
+    "y": 396.92654037475586,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "6099fe20.b764e"
+        "48a5b30d.99482c"
       ]
     ]
   },
   {
-    "id": "6099fe20.b764e",
+    "id": "48a5b30d.99482c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1139.0625801086426,
-    "y": 375.20837020874023,
-    "z": "48050f50.e2132",
+    "x": 1117.7216300964355,
+    "y": 385.21227645874023,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "1501ba2b.428996",
+    "id": "871628e8.c20ff8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 957.8241767883301,
-    "y": 428.2559471130371,
-    "z": "48050f50.e2132",
+    "x": 936.483226776123,
+    "y": 438.2598533630371,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "49a6b499.06dbac"
+        "59c1c9f6.0040b8"
       ]
     ]
   },
   {
-    "id": "49a6b499.06dbac",
+    "id": "59c1c9f6.0040b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",
     "comments": "",
-    "x": 1145.5967330932617,
-    "y": 423.69513988494873,
-    "z": "48050f50.e2132",
-    "wires": []
-  },
-  {
-    "id": "b2aff25d.5a4e",
-    "type": "comment",
-    "name": "review and test req",
-    "info": "",
-    "comments": "",
-    "x": 741.0002212524414,
-    "y": 729.3487091064453,
-    "z": "48050f50.e2132",
-    "wires": []
-  },
-  {
-    "id": "61725e4c.10868",
-    "type": "comment",
-    "name": "tmp.thirdparty-sdnc-id to be hardcoded here?",
-    "info": "",
-    "comments": "",
-    "x": 731.0042877197266,
-    "y": 369.3525629043579,
-    "z": "48050f50.e2132",
+    "x": 1124.2557830810547,
+    "y": 433.69904613494873,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "4d7e6631.03a558",
+    "id": "bcf0047f.528cc8",
     "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-instance-id \n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"device\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/devices/device/' + $vnf-topology-operation-input.vnf-information.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 704.0003967285156,
-    "y": 1016.0955476760864,
-    "z": "48050f50.e2132",
+    "x": 682.6594467163086,
+    "y": 1026.0994539260864,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]
   },
   {
-    "id": "2a9fc936.08f4c6",
+    "id": "d7029e79.59672",
     "type": "record",
     "name": "record",
     "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"Provided alloted resource length\"/>\n<parameter name=\"field3\" value=\"'parameters length'\"/>\n<parameter name=\"field4\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`'/>\n\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 678.0000762939453,
-    "y": 291.0151786804199,
-    "z": "48050f50.e2132",
+    "x": 656.6591262817383,
+    "y": 301.0190849304199,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]
   },
   {
-    "id": "15d0a117.420b6f",
+    "id": "120defaf.28edc",
     "type": "for",
     "name": "for vidx..service-data.vnfs.vnf_length[]",
     "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 766.031364440918,
-    "y": 177.0312786102295,
-    "z": "48050f50.e2132",
+    "x": 744.6904144287109,
+    "y": 187.0351848602295,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "1b896cda.b979e3"
+        "2fb6d9ed.49aab6"
       ]
     ]
   },
   {
-    "id": "1b896cda.b979e3",
+    "id": "2fb6d9ed.49aab6",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1014.3809585571289,
-    "y": 177.57134628295898,
-    "z": "48050f50.e2132",
+    "x": 993.0400085449219,
+    "y": 187.57525253295898,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "a706d238.291a"
+        "974bf0fe.dc4fc"
       ]
     ]
   },
   {
-    "id": "a706d238.291a",
+    "id": "974bf0fe.dc4fc",
     "type": "switchNode",
     "name": "switch vnfid found",
     "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1168.4605560302734,
-    "y": 177.28142833709717,
-    "z": "48050f50.e2132",
+    "x": 1147.1196060180664,
+    "y": 187.28533458709717,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "5082e995.a70f58"
+        "82b55f94.090c5"
       ]
     ]
   },
   {
-    "id": "ea1b1425.d6abb8",
+    "id": "e03d76d9.cc3a98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1462.0580673217773,
-    "y": 178.5817413330078,
-    "z": "48050f50.e2132",
+    "x": 1440.7171173095703,
+    "y": 188.5856475830078,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "65194b17.7753d4",
-        "65c6f7a.c67d608",
-        "47f60422.f643ac"
+        "dd0e8d25.544ad",
+        "d5fff7a1.3b1048",
+        "1fe66a57.7e4926"
       ]
     ]
   },
   {
-    "id": "5082e995.a70f58",
+    "id": "82b55f94.090c5",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1323.4125480651855,
-    "y": 178.1741075515747,
-    "z": "48050f50.e2132",
+    "x": 1302.0715980529785,
+    "y": 188.1780138015747,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "ea1b1425.d6abb8"
+        "e03d76d9.cc3a98"
       ]
     ]
   },
   {
-    "id": "65c6f7a.c67d608",
+    "id": "d5fff7a1.3b1048",
     "type": "set",
     "name": "set vnf-request-input.",
     "xml": "<set>\n<parameter name='vnf-request-input.' value='`$ctx.vnf-data.vnf-data.vnf-request-input.`' />\n\n",
     "comments": "",
-    "x": 1703.3909225463867,
-    "y": 134.58180141448975,
-    "z": "48050f50.e2132",
+    "x": 1682.0499725341797,
+    "y": 144.58570766448975,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "65194b17.7753d4",
+    "id": "dd0e8d25.544ad",
     "type": "set",
     "name": "set tmp.vidx and ctx.vnf-data",
     "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
     "comments": "",
-    "x": 1730.9446334838867,
-    "y": 87.92416572570801,
-    "z": "48050f50.e2132",
+    "x": 1709.6036834716797,
+    "y": 97.92807197570801,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "47f60422.f643ac",
+    "id": "1fe66a57.7e4926",
     "type": "call",
     "name": "call sdwan-get-device-param",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-device-param' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1708.0313720703125,
-    "y": 197.03127193450928,
-    "z": "48050f50.e2132",
+    "x": 1686.6904220581055,
+    "y": 207.03517818450928,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]
   },
   {
-    "id": "34088ab3.22cba6",
+    "id": "46c583fa.d0b40c",
     "type": "switchNode",
     "name": "switch tmp.vidx ",
     "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 697.03125,
-    "y": 238.03125,
-    "z": "48050f50.e2132",
+    "x": 675.690299987793,
+    "y": 248.03515625,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "f352fc21.fd854"
+        "47e07fa8.46bc3"
       ]
     ]
   },
   {
-    "id": "f352fc21.fd854",
+    "id": "47e07fa8.46bc3",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 844.4598922729492,
-    "y": 237.60266017913818,
-    "z": "48050f50.e2132",
+    "x": 823.1189422607422,
+    "y": 247.60656642913818,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       [
-        "d74e2e0c.835e1"
+        "b8303d6e.293f7"
       ]
     ]
   },
   {
-    "id": "d74e2e0c.835e1",
+    "id": "b8303d6e.293f7",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
     "comments": "",
-    "x": 993.8886184692383,
-    "y": 238.74557781219482,
-    "z": "48050f50.e2132",
+    "x": 972.5476684570312,
+    "y": 248.74948406219482,
+    "z": "c21457e5.a6cbc8",
     "wires": []
   },
   {
-    "id": "96fd10aa.3117f",
+    "id": "139f4e2.66d6eb2",
     "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": 692.03125,
-    "y": 334.03125,
-    "z": "48050f50.e2132",
+    "x": 670.690299987793,
+    "y": 344.03515625,
+    "z": "c21457e5.a6cbc8",
     "wires": [
       []
     ]