integration test issues fix for sdwan and sotn

Change-Id: I406550404f0cfb661d6e480cf1df48d39fad06e7
Issue-ID: SDNC-357
Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com>

Former-commit-id: 3e4fa46160a5d6d52bb7eccf08dbb790d96a4682

1 files changed, 223 insertions, 223 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
index b25adaf1..36a7cfdc 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_sdwan-vnf-topology-operation-device-create.json
@@ -1,6 +1,6 @@
 [
   {
-    "id": "9cb483d7.ff8df",
+    "id": "fd0440a.ecd51c",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -8,634 +8,634 @@
     "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": 183.78570556640625,
-    "y": 145.0002658367157,
-    "z": "f234e69c.c27828",
+    "x": 196,
+    "y": 82.23810958862305,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "82081d1c.b4352"
+        "127bb9c5.150526"
       ]
     ]
   },
   {
-    "id": "a3a5e35d.08a8b",
+    "id": "e5b0a995.906238",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 104.5,
-    "y": 82.76215624809265,
-    "z": "f234e69c.c27828",
+    "x": 116.71429443359375,
+    "y": 20,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "9cb483d7.ff8df"
+        "fd0440a.ecd51c"
       ]
     ]
   },
   {
-    "id": "194cf25c.9d64be",
+    "id": "23553cdf.889914",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 185.16666412353516,
-    "y": 406.4288260936737,
-    "z": "f234e69c.c27828",
+    "x": 197.3809585571289,
+    "y": 343.66666984558105,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "12b7db37.f7ff25",
-        "94ec7644.8f3208",
-        "d463d74.bf70428",
-        "ade80aa2.c72f18",
-        "d76d180.81a43e8",
-        "d4716c92.1b3cb",
-        "1202a9f6.764af6",
-        "50fb4440.68b56c",
-        "35434662.4bcfda",
-        "b21ec7e.52c2938",
-        "93472449.69d418",
-        "9bf97976.fa1928"
+        "bf0f7a26.a11068",
+        "f71d7490.89bd28",
+        "ed1f7a5f.52aa38",
+        "20a30a30.b04286",
+        "1a809147.c1ebef",
+        "53d08385.3ed46c",
+        "d658c8ee.f13848",
+        "8e20e633.b9b588",
+        "61dc4d5e.3ba864",
+        "43e73a53.fc83c4",
+        "ff98826e.6bc6d",
+        "60a78e84.5e55"
       ]
     ]
   },
   {
-    "id": "94ec7644.8f3208",
+    "id": "f71d7490.89bd28",
     "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": 565.8336067199707,
-    "y": 1028.0958859920502,
-    "z": "f234e69c.c27828",
+    "x": 578.0479011535645,
+    "y": 965.3337297439575,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "12b7db37.f7ff25",
+    "id": "bf0f7a26.a11068",
     "type": "set",
     "name": "set vnf-level-oper-status to Created",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='Created' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].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[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
     "comments": "",
-    "x": 655.3136177062988,
-    "y": 760.4329907894135,
-    "z": "f234e69c.c27828",
+    "x": 667.5279121398926,
+    "y": 697.6708345413208,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "ade80aa2.c72f18",
+    "id": "20a30a30.b04286",
     "type": "set",
     "name": "copy input data to service data",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' value='`$vnf-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' value='`$vnf-topology-operation-input.request-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' value='`$vnf-topology-operation-input.service-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' value='`$vnf-topology-operation-input.vnf-information.`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />",
     "comments": "",
-    "x": 633.1668090820312,
-    "y": 816.4291665554047,
-    "z": "f234e69c.c27828",
+    "x": 645.381103515625,
+    "y": 753.667010307312,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "bf289ee9.17eee",
+    "id": "ef25e38.ee9742",
     "type": "save",
     "name": "save deviceInstance configuration in AAI",
-    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.devcie-id = $prop.vnf-id' >\n<parameter name='devcie-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vnf-id' >\n<parameter name='device-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1111.5007019042969,
-    "y": 833.3184735774994,
-    "z": "f234e69c.c27828",
+    "x": 1123.7149963378906,
+    "y": 770.5563173294067,
+    "z": "842fbc05.cce04",
     "wires": [
       []
     ]
   },
   {
-    "id": "82081d1c.b4352",
+    "id": "127bb9c5.150526",
     "type": "method",
     "name": "method sdwan-vnf-topology-operation-device-create",
     "xml": "<method rpc='sdwan-vnf-topology-operation-device-create' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 195.5,
-    "y": 239.3484981060028,
-    "z": "f234e69c.c27828",
+    "x": 207.71429443359375,
+    "y": 176.58634185791016,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "194cf25c.9d64be"
+        "23553cdf.889914"
       ]
     ]
   },
   {
-    "id": "d463d74.bf70428",
+    "id": "ed1f7a5f.52aa38",
     "type": "set",
     "name": "set vnfId and vnf-object-path",
     "xml": "<set>\n<parameter name='vnfId' value='`$prop.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/'  + $prop.vnf-id  + '/vnf-data/'` \" />",
     "comments": "",
-    "x": 636.5002593994141,
-    "y": 709.3488032817841,
-    "z": "f234e69c.c27828",
+    "x": 648.7145538330078,
+    "y": 646.5866470336914,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "b128ad93.6f9ac",
+    "id": "abbdb9a7.a00168",
     "type": "set",
     "name": "set deviceId to service data",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id' value='`$prop.vnf-id`' />\n",
     "comments": "",
-    "x": 642.5004119873047,
-    "y": 661.349050283432,
-    "z": "f234e69c.c27828",
+    "x": 654.7147064208984,
+    "y": 598.5868940353394,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "de11064d.94a5d8",
+    "id": "c106be0b.38899",
     "type": "comment",
     "name": "AAI resource need to update",
     "info": "",
     "comments": "",
-    "x": 957.5003051757812,
-    "y": 787.3489129543304,
-    "z": "f234e69c.c27828",
+    "x": 969.714599609375,
+    "y": 724.5867567062378,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "4f128f3f.350cf",
+    "id": "63a58c6c.370174",
     "type": "execute",
     "name": "execute generate-vnf-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vnf-id\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1141.5006866455078,
-    "y": 174.3486087322235,
-    "z": "f234e69c.c27828",
+    "x": 1153.7149810791016,
+    "y": 111.58645248413086,
+    "z": "842fbc05.cce04",
     "wires": [
       []
     ]
   },
   {
-    "id": "9bf97976.fa1928",
+    "id": "60a78e84.5e55",
     "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/' + $prop.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=\"`$prop.vnf-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.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/' + $prop.vnf-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"device.device-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.vnf-id`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 623.500560760498,
-    "y": 983.0957877635956,
-    "z": "f234e69c.c27828",
+    "x": 635.7148551940918,
+    "y": 920.3336315155029,
+    "z": "842fbc05.cce04",
     "wires": [
       []
     ]
   },
   {
-    "id": "d76d180.81a43e8",
+    "id": "1a809147.c1ebef",
     "type": "switchNode",
     "name": "switch vnf-id",
     "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 605.5001068115234,
-    "y": 278.0000274181366,
-    "z": "f234e69c.c27828",
+    "x": 617.7144012451172,
+    "y": 215.23787117004395,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "621f97e2.b689f8",
-        "786ad46d.cda56c"
+        "ecde6b48.bbfc48",
+        "1019aeef.5808d1"
       ]
     ]
   },
   {
-    "id": "621f97e2.b689f8",
+    "id": "ecde6b48.bbfc48",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 746.5001106262207,
-    "y": 253.00001883506775,
-    "z": "f234e69c.c27828",
+    "x": 758.7144050598145,
+    "y": 190.2378625869751,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "ef09f155.972b9"
+        "81003234.70dcc"
       ]
     ]
   },
   {
-    "id": "ef09f155.972b9",
+    "id": "81003234.70dcc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 894.5002136230469,
-    "y": 189.00001120567322,
-    "z": "f234e69c.c27828",
+    "x": 906.7145080566406,
+    "y": 126.23785495758057,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "4f128f3f.350cf",
-        "e345eb47.17b7c8",
-        "82623d50.b5d47"
+        "63a58c6c.370174",
+        "69aa8a5d.0ac9a4",
+        "6eb09a3f.09bc74"
       ]
     ]
   },
   {
-    "id": "786ad46d.cda56c",
+    "id": "1019aeef.5808d1",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 743.0312881469727,
-    "y": 313.03125643730164,
-    "z": "f234e69c.c27828",
+    "x": 755.2455825805664,
+    "y": 250.26910018920898,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "b8aff249.035f2"
+        "b2303be.abcc1c8"
       ]
     ]
   },
   {
-    "id": "8bf27ffe.7192e",
+    "id": "fe4dccde.57bcf",
     "type": "set",
     "name": "set prop.vnf-id",
     "xml": "<set>\n<parameter name='prop.vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",
     "comments": "",
-    "x": 1082.0320434570312,
-    "y": 392.03162956237793,
-    "z": "f234e69c.c27828",
+    "x": 1094.246337890625,
+    "y": 329.2694733142853,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "b8aff249.035f2",
+    "id": "b2303be.abcc1c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 894.0317077636719,
-    "y": 345.03137850761414,
-    "z": "f234e69c.c27828",
+    "x": 906.2460021972656,
+    "y": 282.2692222595215,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "8bf27ffe.7192e",
-        "82623d50.b5d47",
-        "ac207b07.0b4de8"
+        "fe4dccde.57bcf",
+        "6eb09a3f.09bc74",
+        "d5a722bf.9d266"
       ]
     ]
   },
   {
-    "id": "d4716c92.1b3cb",
+    "id": "53d08385.3ed46c",
     "type": "set",
     "name": "set prop.sdncCreate=false",
     "xml": "<set>\n<parameter name='prop.sdncCreate' value='false' />\n",
     "comments": "",
-    "x": 680.0313568115234,
-    "y": 169.03125071525574,
-    "z": "f234e69c.c27828",
+    "x": 692.2456512451172,
+    "y": 106.26909446716309,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "1202a9f6.764af6",
+    "id": "d658c8ee.f13848",
     "type": "switchNode",
     "name": "switch prop.sdncCreate",
     "xml": "<switch test='`$prop.sdncCreate`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 602.5316925048828,
-    "y": 863.031670331955,
-    "z": "f234e69c.c27828",
+    "x": 614.7459869384766,
+    "y": 800.2695140838623,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "a65c4106.c8fe7",
-        "b49509b2.10c3c8"
+        "be0155ce.278c18",
+        "f63d8c0c.a2846"
       ]
     ]
   },
   {
-    "id": "a65c4106.c8fe7",
+    "id": "be0155ce.278c18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 848.5314636230469,
-    "y": 833.5314071178436,
-    "z": "f234e69c.c27828",
+    "x": 860.7457580566406,
+    "y": 770.769250869751,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "bf289ee9.17eee"
+        "ef25e38.ee9742"
       ]
     ]
   },
   {
-    "id": "b49509b2.10c3c8",
+    "id": "f63d8c0c.a2846",
     "type": "outcomeTrue",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 850.0314483642578,
-    "y": 888.5314214229584,
-    "z": "f234e69c.c27828",
+    "x": 862.2457427978516,
+    "y": 825.7692651748657,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "593b4cfd.497904"
+        "2097a67.fbc2c5a"
       ]
     ]
   },
   {
-    "id": "e345eb47.17b7c8",
+    "id": "69aa8a5d.0ac9a4",
     "type": "set",
     "name": "set prop.updateAAIsdncCreate",
     "xml": "<set>\n<parameter name='prop.sdncCreate' value='true' />\n",
     "comments": "",
-    "x": 1159.0317764282227,
-    "y": 134.03133463859558,
-    "z": "f234e69c.c27828",
+    "x": 1171.2460708618164,
+    "y": 71.26917839050293,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "50fb4440.68b56c",
+    "id": "8e20e633.b9b588",
     "type": "for",
     "name": "for loop idx - VNF input parameters",
     "xml": "<for index=\"idx\" start=\"0\" end=\"`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param_length`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 668.0314331054688,
-    "y": 463.0312850475311,
-    "z": "f234e69c.c27828",
+    "x": 680.2457275390625,
+    "y": 400.2691287994385,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "d8830e39.7254c"
+        "6a3b248.f431cdc"
       ]
     ]
   },
   {
-    "id": "d8830e39.7254c",
+    "id": "6a3b248.f431cdc",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 882.8097763061523,
-    "y": 460.58686900138855,
-    "z": "f234e69c.c27828",
+    "x": 895.0240707397461,
+    "y": 397.8247127532959,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "6cb4a749.692908",
-        "24244ebf.8f5572"
+        "c1af467b.da6408",
+        "b9f2cae.04bc638"
       ]
     ]
   },
   {
-    "id": "24244ebf.8f5572",
+    "id": "b9f2cae.04bc638",
     "type": "set",
     "name": "set parameterName",
     "xml": "<set>\n<parameter name=\"`vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`\" value='`$param-prefix[$param-prefix_length -1]`'/>\n",
     "comments": "",
-    "x": 1048.5104064941406,
-    "y": 475.3351237773895,
-    "z": "f234e69c.c27828",
+    "x": 1060.7247009277344,
+    "y": 412.5729675292969,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "6cb4a749.692908",
+    "id": "c1af467b.da6408",
     "type": "execute",
     "name": "execute split parameterName",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.param[$idx].name`'/>\n<parameter name=\"regex\" value=\"_\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1079.0659790039062,
-    "y": 438.3350074291229,
-    "z": "f234e69c.c27828",
+    "x": 1091.2802734375,
+    "y": 375.5728511810303,
+    "z": "842fbc05.cce04",
     "wires": [
       []
     ]
   },
   {
-    "id": "35434662.4bcfda",
+    "id": "61dc4d5e.3ba864",
     "type": "set",
     "name": "set vnf-request-input.",
     "xml": "<set>\n<parameter name='vnf-request-input.' value='`$vnf-topology-operation-input.vnf-request-input.`' />\n",
     "comments": "",
-    "x": 630.0310516357422,
-    "y": 537.3559997081757,
-    "z": "f234e69c.c27828",
+    "x": 642.2453460693359,
+    "y": 474.593843460083,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "b21ec7e.52c2938",
+    "id": "43e73a53.fc83c4",
     "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": 655.0314331054688,
-    "y": 569.3561599254608,
-    "z": "f234e69c.c27828",
+    "x": 667.2457275390625,
+    "y": 506.59400367736816,
+    "z": "842fbc05.cce04",
     "wires": [
       []
     ]
   },
   {
-    "id": "bcf057ee.ac0fd8",
+    "id": "98f6587a.b563b8",
     "type": "comment",
     "name": "if SO provide vnf-id use that else create new",
     "info": "",
     "comments": "",
-    "x": 697.0312805175781,
-    "y": 223.0312602519989,
-    "z": "f234e69c.c27828",
+    "x": 709.2455749511719,
+    "y": 160.26910400390625,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "82623d50.b5d47",
+    "id": "6eb09a3f.09bc74",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1102.5317840576172,
-    "y": 271.0313537120819,
-    "z": "f234e69c.c27828",
+    "x": 1114.746078491211,
+    "y": 208.26919746398926,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "d5e68c18.6d168",
-        "2bfd5f0a.c7681"
+        "10311b8f.214a74",
+        "d0785948.131e88"
       ]
     ]
   },
   {
-    "id": "d5e68c18.6d168",
+    "id": "10311b8f.214a74",
     "type": "switchNode",
     "name": "switch service-data.vnfs.vnf_length",
     "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1346.5316734313965,
-    "y": 228.0313470363617,
-    "z": "f234e69c.c27828",
+    "x": 1358.7459678649902,
+    "y": 165.26919078826904,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "f59d1f3f.83f78",
-        "475c8f31.8dce6"
+        "e8ee65b6.e0bb98",
+        "8e4d05a7.18d778"
       ]
     ]
   },
   {
-    "id": "f59d1f3f.83f78",
+    "id": "e8ee65b6.e0bb98",
     "type": "other",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1560.2460556030273,
-    "y": 211.1741178035736,
-    "z": "f234e69c.c27828",
+    "x": 1572.460350036621,
+    "y": 148.41196155548096,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "b1cc315c.65ade"
+        "2bb1c8ad.9ae4c8"
       ]
     ]
   },
   {
-    "id": "b1cc315c.65ade",
+    "id": "2bb1c8ad.9ae4c8",
     "type": "set",
     "name": "set vnf-index=0",
     "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
     "comments": "",
-    "x": 1708.5317039489746,
-    "y": 208.17417216300964,
-    "z": "f234e69c.c27828",
+    "x": 1720.7459983825684,
+    "y": 145.412015914917,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "475c8f31.8dce6",
+    "id": "8e4d05a7.18d778",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1563.6745529174805,
-    "y": 256.45990920066833,
-    "z": "f234e69c.c27828",
+    "x": 1575.8888473510742,
+    "y": 193.69775295257568,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "f950bc3f.5973b"
+        "20358c1.fc83f74"
       ]
     ]
   },
   {
-    "id": "f950bc3f.5973b",
+    "id": "20358c1.fc83f74",
     "type": "set",
     "name": "set vnf-index = vnf_length",
     "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
     "comments": "",
-    "x": 1747.5322952270508,
-    "y": 256.74567770957947,
-    "z": "f234e69c.c27828",
+    "x": 1759.7465896606445,
+    "y": 193.98352146148682,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "2bfd5f0a.c7681",
+    "id": "d0785948.131e88",
     "type": "set",
     "name": "set new vnf_length",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$vnf-index + 1`' />\n",
     "comments": "",
-    "x": 1293.5318145751953,
-    "y": 276.0313377380371,
-    "z": "f234e69c.c27828",
+    "x": 1305.746109008789,
+    "y": 213.26918148994446,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "593b4cfd.497904",
+    "id": "2097a67.fbc2c5a",
     "type": "save",
     "name": "update deviceInstance configuration in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='device' \n      key='device.device-id = $prop.vnf-id' >\n<parameter name='device-id' value='`$prop.vnf-id`' />\n<parameter name='esn' value='`$prop.device.esn`' />\n<parameter name='device-name' value='`$prop.device.name`' />\n<parameter name='description' value='`$prop.device.description`' />\n<parameter name='vendor' value='`$prop.device.vendor`' />\n<parameter name='class' value='`$prop.device.class`' />\n<parameter name='type' value='`$prop.device.deviceModel`' />\n<parameter name='version' value='`$prop.device.version`' />\n<parameter name='system-ip' value='`$prop.device.systemIp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n<parameter name='selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $prop.vnf-id  + '/vnf-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 1103.5312805175781,
-    "y": 891.0312745571136,
-    "z": "f234e69c.c27828",
+    "x": 1115.7455749511719,
+    "y": 828.269118309021,
+    "z": "842fbc05.cce04",
     "wires": [
       []
     ]
   },
   {
-    "id": "ac207b07.0b4de8",
+    "id": "d5a722bf.9d266",
     "type": "for",
     "name": "for each existing VNF",
     "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1109.5313186645508,
-    "y": 343.03128695487976,
-    "z": "f234e69c.c27828",
+    "x": 1121.7456130981445,
+    "y": 280.2691307067871,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "d4f21952.f2dd68"
+        "aceae556.187d88"
       ]
     ]
   },
   {
-    "id": "4fb64c02.89a0b4",
+    "id": "7b2ea8f.f293e58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1646.1031284332275,
-    "y": 391.17424178123474,
-    "z": "f234e69c.c27828",
+    "x": 1658.3174228668213,
+    "y": 328.4120855331421,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "1752f719.1e90a9"
+        "6db207f2.3f0a88"
       ]
     ]
   },
   {
-    "id": "1752f719.1e90a9",
+    "id": "6db207f2.3f0a88",
     "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 id ' + $service-data.vnfs.vnf[$idx].vnf-id\n      + ' already exists, and has order status ' + $service-data.vnfs.vnf[$idx].vnf-data.vnf-level-oper-status.order-status`\" />\n",
     "comments": "",
-    "x": 1784.6744861602783,
-    "y": 391.17420268058777,
-    "z": "f234e69c.c27828",
+    "x": 1796.888780593872,
+    "y": 328.4120464324951,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "1b529b77.5e22e5",
+    "id": "f8ea0727.32b188",
     "type": "comment",
     "name": "make sure this vnf-id doesn't exist already",
     "info": "",
     "comments": "",
-    "x": 1739.959602355957,
-    "y": 520.174124956131,
-    "z": "f234e69c.c27828",
+    "x": 1752.1738967895508,
+    "y": 457.41196870803833,
+    "z": "842fbc05.cce04",
     "wires": []
   },
   {
-    "id": "d4f21952.f2dd68",
+    "id": "aceae556.187d88",
     "type": "switchNode",
     "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id",
     "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1448.5313262939453,
-    "y": 344.0312898159027,
-    "z": "f234e69c.c27828",
+    "x": 1460.745620727539,
+    "y": 281.26913356781006,
+    "z": "842fbc05.cce04",
     "wires": [
       [
-        "4fb64c02.89a0b4"
+        "7b2ea8f.f293e58"
       ]
     ]
   },
   {
-    "id": "93472449.69d418",
+    "id": "ff98826e.6bc6d",
     "type": "set",
     "name": "set sdncCreate to service data",
     "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length].name' value=\"sdncCreate\" />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param[$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length].value' value='`$prop.sdncCreate`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.param_length + 1`' />\n",
     "comments": "",
-    "x": 616.5313682556152,
-    "y": 924.0312774181366,
-    "z": "f234e69c.c27828",
+    "x": 628.745662689209,
+    "y": 861.269121170044,
+    "z": "842fbc05.cce04",
     "wires": []
   }
 ]