Merge "Fix ss-netbox-dg"

Former-commit-id: 5db3fb421de30e4668d6325434c6aed690031a47

2 files changed, 422 insertions, 502 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
index 6261220c..3a86e268 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.json
@@ -1,1036 +1,972 @@
 [
     {
-        "id": "1ac00e46.c3e9e2",
+        "id": "aeddcb92.bde6a",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 114,
-        "y": 47,
-        "z": "143c1488.728ec3",
+        "x": 97,
+        "y": 62.57143306732178,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "52295e06.9cc6c"
+                "460b7122.4f837"
             ]
         ]
     },
     {
-        "id": "df5325d5.fd4748",
+        "id": "295d429e.f0a67e",
         "type": "method",
-        "name": "method self-serve-netbox-ip-assignment",
-        "xml": "<method rpc='self-serve-netbox-ip-assignment' mode='sync'>\n",
+        "name": "method self-serve-netbox-ip-assign",
+        "xml": "<method rpc='self-serve-netbox-ip-assign' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 249.7857208251953,
-        "y": 104.1269884109497,
-        "z": "143c1488.728ec3",
+        "x": 232.7857208251953,
+        "y": 119.69842147827148,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "63c730e0.c25018"
+                "bea678c6.71dd7"
             ]
         ]
     },
     {
-        "id": "63c730e0.c25018",
+        "id": "bea678c6.71dd7",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 143.32144165039062,
-        "y": 190.4286069869995,
-        "z": "143c1488.728ec3",
+        "x": 126.32144165039062,
+        "y": 206.0000400543213,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "5df07877.d41d48",
-                "317924e0.177cf4",
-                "66e86dab.782c14",
-                "fe9daa10.860a48",
-                "cd60dd04.3a49e"
+                "d5200d6.b499a7",
+                "dfe3495f.0a6cf8",
+                "bb3b73.97d8649",
+                "c356df77.cc7c28",
+                "f691073d.b6c728"
             ]
         ]
     },
     {
-        "id": "52295e06.9cc6c",
+        "id": "460b7122.4f837",
         "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "name": "GENERIC-RESOURCE-API 1.4.1-SNAPSHOT",
         "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
+        "version": "1.4.1-SNAPSHOT",
         "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}'>",
+        "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.4.1-SNAPSHOT'>",
         "outputs": 1,
-        "x": 386.8571472167969,
-        "y": 46.42856693267822,
-        "z": "143c1488.728ec3",
+        "x": 369.8571472167969,
+        "y": 62,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "df5325d5.fd4748"
+                "295d429e.f0a67e"
             ]
         ]
     },
     {
-        "id": "5df07877.d41d48",
+        "id": "d5200d6.b499a7",
         "type": "switchNode",
         "name": "switch: ss.capability-name",
         "xml": "<switch test='`$ss.capability-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 401.4999694824219,
-        "y": 194.25000858306885,
-        "z": "143c1488.728ec3",
+        "x": 384.4999694824219,
+        "y": 209.82144165039062,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "1172f991.e8e1ce"
+                "16de1328.9e165d"
             ]
         ]
     },
     {
-        "id": "1172f991.e8e1ce",
+        "id": "16de1328.9e165d",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "outputs": 1,
-        "x": 626.4999923706055,
-        "y": 194.75000715255737,
-        "z": "143c1488.728ec3",
+        "x": 609.4999923706055,
+        "y": 210.32144021987915,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "788ea450.d0af24"
+                "72fded58.33f2a4"
             ]
         ]
     },
     {
-        "id": "788ea450.d0af24",
+        "id": "72fded58.33f2a4",
         "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\t<parameter name=\"error-message\" value=\"ss.capability-name is null\" />\n",
         "comments": "",
-        "x": 786.4166641235352,
-        "y": 194.86110591888428,
-        "z": "143c1488.728ec3",
+        "x": 769.4166641235352,
+        "y": 210.43253898620605,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "317924e0.177cf4",
+        "id": "dfe3495f.0a6cf8",
         "type": "switchNode",
         "name": "switch: ss.capability-action",
         "xml": "<switch test='`$ss.capability-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 404.74996185302734,
-        "y": 270.25000381469727,
-        "z": "143c1488.728ec3",
+        "x": 387.74996185302734,
+        "y": 285.82143688201904,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "ef7a453e.505a28"
+                "a5187f.af9a5f8"
             ]
         ]
     },
     {
-        "id": "ef7a453e.505a28",
+        "id": "a5187f.af9a5f8",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 628.2499618530273,
-        "y": 270.50000381469727,
-        "z": "143c1488.728ec3",
+        "x": 611.2499618530273,
+        "y": 286.07143688201904,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "2cd2be60.fa73d2"
+                "70603bf9.fc52ac"
             ]
         ]
     },
     {
-        "id": "2cd2be60.fa73d2",
+        "id": "70603bf9.fc52ac",
         "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\t<parameter name=\"error-message\" value=\"ss.capability-action is null\" />\n",
         "comments": "",
-        "x": 788.166633605957,
-        "y": 270.61110258102417,
-        "z": "143c1488.728ec3",
+        "x": 771.166633605957,
+        "y": 286.18253564834595,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "dd9f2f74.302358",
+        "id": "2ff7ecc5.284a3c",
         "type": "outcome",
         "name": "unassign",
         "xml": "<outcome value='unassign'>",
         "comments": "",
         "outputs": 1,
-        "x": 908.8930053710938,
-        "y": 1550.9286060333252,
-        "z": "143c1488.728ec3",
+        "x": 891.8930053710938,
+        "y": 1566.500039100647,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "d2384164.43d4b8"
+                "3015a413.8908c4"
             ]
         ]
     },
     {
-        "id": "fe9daa10.860a48",
+        "id": "c356df77.cc7c28",
         "type": "call",
         "name": "call self-service-capability-param-resolution",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-service-capability-param-resolution' mode='sync' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 455.41680908203125,
-        "y": 345.250039100647,
-        "z": "143c1488.728ec3",
+        "x": 438.41680908203125,
+        "y": 360.82147216796875,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "6271ac3c.dbb524"
+                "260a2383.61ca04"
             ]
         ]
     },
     {
-        "id": "6271ac3c.dbb524",
+        "id": "260a2383.61ca04",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 759.6667060852051,
-        "y": 347.25004291534424,
-        "z": "143c1488.728ec3",
+        "x": 742.6667060852051,
+        "y": 362.821475982666,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "6983c90c.9f085"
+                "a9e7fd90.1e1948"
             ]
         ]
     },
     {
-        "id": "6983c90c.9f085",
+        "id": "a9e7fd90.1e1948",
         "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\t<parameter name=\"error-message\" value=\"`'Not all assignments are resolved' + $error-message`\" />\n",
         "comments": "",
-        "x": 918.4166870117188,
-        "y": 347.250039100647,
-        "z": "143c1488.728ec3",
+        "x": 901.4166870117188,
+        "y": 362.82147216796875,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "a1557c8b.0af52",
+        "id": "c106c1b3.fa5708",
         "type": "set",
         "name": "set tmp.ss.param.capability-name",
         "xml": "<set>\n<parameter name='tmp.ss.param.capability-name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.capability-name`' />\n",
         "comments": "",
-        "x": 918.5634307861328,
-        "y": 403.0317540168762,
-        "z": "143c1488.728ec3",
+        "x": 901.5634307861328,
+        "y": 418.603187084198,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "dcc3036b.be682",
+        "id": "cf602ff2.69d16",
         "type": "for",
         "name": "for pidx in param_length",
         "xml": "<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">",
         "comments": "",
         "outputs": 1,
-        "x": 628.7776565551758,
-        "y": 403.10322427749634,
-        "z": "143c1488.728ec3",
+        "x": 611.7776565551758,
+        "y": 418.6746573448181,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "ac1bc695.ba30f8",
-                "a1557c8b.0af52",
-                "a8c879d0.2e224"
+                "9a404501.e9a9f",
+                "575f86c4.d593b8",
+                "c106c1b3.fa5708"
             ]
         ]
     },
     {
-        "id": "ac1bc695.ba30f8",
+        "id": "575f86c4.d593b8",
         "type": "switchNode",
         "name": "switch: capability-name - ss vs param",
         "xml": "<switch test='`$tmp.ss.param.capability-name == $ss.capability-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 931.6388931274414,
-        "y": 484.3810067176819,
-        "z": "143c1488.728ec3",
+        "x": 914.6388931274414,
+        "y": 499.95243978500366,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "95d45cef.739a4"
+                "5ffdfe5e.2f2ba8"
             ]
         ]
     },
     {
-        "id": "95d45cef.739a4",
+        "id": "5ffdfe5e.2f2ba8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1170.388900756836,
-        "y": 484.1310067176819,
-        "z": "143c1488.728ec3",
+        "x": 1153.388900756836,
+        "y": 499.70243978500366,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "58a7e2ac.369edc"
+                "5c183d21.694a54"
             ]
         ]
     },
     {
-        "id": "ae0c0642.b8f398",
+        "id": "6474a2a3.971edc",
         "type": "switchNode",
         "name": "switch: resource-key[].name",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1357.778221130371,
-        "y": 804.4249711036682,
-        "z": "143c1488.728ec3",
+        "x": 1340.778221130371,
+        "y": 819.99640417099,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "30dba812.eebad",
-                "9ccc6ec3.307098",
-                "17e282ca.caa0c5",
-                "79d8a08e.f34778",
-                "a090c1a0.159c8"
+                "eae11399.61a66",
+                "d4df7117.d17f68",
+                "7bb69337.4e6394",
+                "5c5c662c.f08f1",
+                "90dc69e5.6405"
             ]
         ]
     },
     {
-        "id": "9ccc6ec3.307098",
+        "id": "d4df7117.d17f68",
         "type": "outcome",
         "name": "service-instance-id",
         "xml": "<outcome value='service-instance-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1629.1671295166016,
-        "y": 803.897189617157,
-        "z": "143c1488.728ec3",
+        "x": 1612.1671295166016,
+        "y": 819.4686226844788,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "c862bfff.9602c"
+                "8300040f.111c68"
             ]
         ]
     },
     {
-        "id": "c862bfff.9602c",
+        "id": "8300040f.111c68",
         "type": "set",
         "name": "set tmp.ss.service-instance-id",
         "xml": "<set>\n<parameter name='tmp.ss.service-instance-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1895.4171295166016,
-        "y": 803.647189617157,
-        "z": "143c1488.728ec3",
+        "x": 1878.4171295166016,
+        "y": 819.2186226844788,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "ae459d03.790da",
+        "id": "235c0ede.173f92",
         "type": "set",
         "name": "set service-data...param[].value = ip-address",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' \n\tvalue='`$self_serve_netbox_ip_assignement.ip-address`' />\n",
         "comments": "",
-        "x": 2387.3892211914062,
-        "y": 1346.746416091919,
-        "z": "143c1488.728ec3",
+        "x": 2168.960205078125,
+        "y": 1349.4608764648438,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "e576077c.d41a68",
-        "type": "for",
-        "name": "for pidx in param_length",
-        "xml": "<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 1363.7142944335938,
-        "y": 1345.6789722442627,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "b57441f1.40176"
-            ]
-        ]
-    },
-    {
-        "id": "b57441f1.40176",
-        "type": "switchNode",
-        "name": "switch: param[].name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1609.4920043945312,
-        "y": 1345.4289112091064,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "afe763c2.be4ad"
-            ]
-        ]
-    },
-    {
-        "id": "8b2de334.ba017",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2117.5001945495605,
-        "y": 1347.6076221466064,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "ae459d03.790da",
-                "2123959.27e4fea"
-            ]
-        ]
-    },
-    {
-        "id": "bd927868.04ca28",
+        "id": "deee58e3.ecff3",
         "type": "update",
         "name": "get-resource IPAM_IP_ASSIGNEMENT",
         "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from IPAM_IP_ASSIGNEMENT \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id' >",
         "comments": "",
         "outputs": 1,
-        "x": 1384.3770751953125,
-        "y": 1549.7500171661377,
-        "z": "143c1488.728ec3",
+        "x": 1367.3770751953125,
+        "y": 1565.3214502334595,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "97c050e3.e78ef8",
-                "fcaae989.8a065"
+                "21ac77e1.c9741",
+                "64c75b78.f36b24"
             ]
         ]
     },
     {
-        "id": "97c050e3.e78ef8",
+        "id": "21ac77e1.c9741",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1678.964412689209,
-        "y": 1550.7500503063202,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "e707327c.c14c1"
-            ]
-        ]
-    },
-    {
-        "id": "e707327c.c14c1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1849.1072213309153,
-        "y": 1551.1786281040736,
-        "z": "143c1488.728ec3",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fcaae989.8a065",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1675.6785583496094,
-        "y": 1598.4643630981445,
-        "z": "143c1488.728ec3",
+        "x": 1661.964412689209,
+        "y": 1566.321483373642,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "1905e389.47be1c"
+                "131e59c0.7aa77e"
             ]
         ]
     },
     {
-        "id": "d2384164.43d4b8",
+        "id": "3015a413.8908c4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1078.214370727539,
-        "y": 1551.3929615020752,
-        "z": "143c1488.728ec3",
+        "x": 1061.214370727539,
+        "y": 1566.964394569397,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "bd927868.04ca28",
-                "8b0e1626.d5a95"
+                "deee58e3.ecff3"
             ]
         ]
     },
     {
-        "id": "dd1d0acb.f3d9f",
+        "id": "f6c6e34.fe93ea",
         "type": "for",
         "name": "for kidx in resource-key_length",
         "xml": "<for index=\"kidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key_length`\">",
         "comments": "",
         "outputs": 1,
-        "x": 1074.639305114746,
-        "y": 802.2860550880432,
-        "z": "143c1488.728ec3",
+        "x": 1057.639305114746,
+        "y": 817.857488155365,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "ae0c0642.b8f398"
+                "6474a2a3.971edc"
             ]
         ]
     },
     {
-        "id": "cd60dd04.3a49e",
+        "id": "f691073d.b6c728",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 345.03570556640625,
-        "y": 401.22620487213135,
-        "z": "143c1488.728ec3",
+        "x": 328.03570556640625,
+        "y": 416.7976379394531,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "dcc3036b.be682",
-                "8f13f8ba.2b7f7"
+                "cf602ff2.69d16",
+                "7e0801d1.7a2c7"
             ]
         ]
     },
     {
-        "id": "66e86dab.782c14",
+        "id": "bb3b73.97d8649",
         "type": "execute",
         "name": "printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss.eipam.log' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 143.5833740234375,
-        "y": 1909.6664819717407,
-        "z": "143c1488.728ec3",
+        "x": 126.5833740234375,
+        "y": 1925.2379150390625,
+        "z": "6621aeef.bf45",
         "wires": [
             []
         ]
     },
     {
-        "id": "178de813.ea0878",
+        "id": "6bcbec21.cdc8a4",
         "type": "update",
         "name": "update IPAM_IP_ASSIGNEMENT to PENDING_DELETE...",
         "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE IPAM_IP_ASSIGNEMENT set ip_status = $tmp.status \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id\" >",
         "comments": "",
         "outputs": 1,
-        "x": 2207.2740478515625,
-        "y": 1641.4287281036377,
-        "z": "143c1488.728ec3",
+        "x": 2190.2740478515625,
+        "y": 1657.0001611709595,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "22ea54b4.9a4a5c"
+                "95bfe2aa.52a368"
             ]
         ]
     },
     {
-        "id": "c8aa945e.cb553",
+        "id": "b6dcca73.b383e8",
         "type": "set",
         "name": "set status = PENDING_DELETE",
         "xml": "<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n",
         "comments": "",
-        "x": 2117.1905517578125,
-        "y": 1599.7619800567627,
-        "z": "143c1488.728ec3",
+        "x": 2100.1905517578125,
+        "y": 1615.3334131240845,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "22ea54b4.9a4a5c",
+        "id": "95bfe2aa.52a368",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2514.9405059814453,
-        "y": 1642.0120515823364,
-        "z": "143c1488.728ec3",
+        "x": 2497.9405059814453,
+        "y": 1657.5834846496582,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "29d7a55a.db16a2"
+                "91f0feca.0b39d8"
             ]
         ]
     },
     {
-        "id": "29d7a55a.db16a2",
+        "id": "91f0feca.0b39d8",
         "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 updating NETBOX_IP_ASSIGNMENTS table to unassign ip with external_key=' + $tmp.ss.external-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n",
         "comments": "",
-        "x": 2693.9407958984375,
-        "y": 1641.8216724395752,
-        "z": "143c1488.728ec3",
+        "x": 2676.9407958984375,
+        "y": 1657.393105506897,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "e13d8645.38dff8",
+        "id": "cef88c60.c3ce7",
         "type": "execute",
         "name": "execute Netbox unassign IP addresses",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"unassignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2137.27392578125,
-        "y": 1687.678789138794,
-        "z": "143c1488.728ec3",
+        "x": 2120.27392578125,
+        "y": 1703.2502222061157,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "8a2f8559.485e"
+                "9a25867f.7917b",
+                "4c46f42f.389724"
             ]
         ]
     },
     {
-        "id": "8a2f8559.485e",
+        "id": "9a25867f.7917b",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2380.607192993164,
-        "y": 1687.6787385940552,
-        "z": "143c1488.728ec3",
+        "x": 2363.607192993164,
+        "y": 1703.250171661377,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "745a09ce.fc0c18"
+                "d8d6e44a.e2b038"
             ]
         ]
     },
     {
-        "id": "745a09ce.fc0c18",
+        "id": "d8d6e44a.e2b038",
         "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 in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`\" />\n",
         "comments": "",
-        "x": 2542.607219696045,
-        "y": 1687.488473892212,
-        "z": "143c1488.728ec3",
+        "x": 2525.607219696045,
+        "y": 1703.0599069595337,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "1905e389.47be1c",
+        "id": "7f0db226.60e56c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1857.8929595947266,
-        "y": 1599.1786079406738,
-        "z": "143c1488.728ec3",
+        "x": 1840.8929595947266,
+        "y": 1614.7500410079956,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "c8aa945e.cb553",
-                "178de813.ea0878",
-                "e13d8645.38dff8"
+                "b6dcca73.b383e8",
+                "6bcbec21.cdc8a4",
+                "cef88c60.c3ce7"
             ]
         ]
     },
     {
-        "id": "8f13f8ba.2b7f7",
+        "id": "7e0801d1.7a2c7",
         "type": "record",
         "name": "record",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"`'SS: pidx: ' + $pidx`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 580.84130859375,
-        "y": 458.170693397522,
-        "z": "143c1488.728ec3",
+        "x": 563.84130859375,
+        "y": 473.74212646484375,
+        "z": "6621aeef.bf45",
         "wires": [
             []
         ]
     },
     {
-        "id": "30dba812.eebad",
+        "id": "eae11399.61a66",
         "type": "outcome",
         "name": "vf-module-id",
         "xml": "<outcome value='vf-module-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1611.0001373291016,
-        "y": 850.1471285820007,
-        "z": "143c1488.728ec3",
+        "x": 1594.0001373291016,
+        "y": 865.7185616493225,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "c1e7f26f.85c74"
+                "92eb3aef.6fece8"
             ]
         ]
     },
     {
-        "id": "c1e7f26f.85c74",
+        "id": "92eb3aef.6fece8",
         "type": "set",
         "name": "set tmp.ss.vf-module-id",
         "xml": "<set>\n<parameter name='tmp.ss.vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1877.000259399414,
-        "y": 850.1471285820007,
-        "z": "143c1488.728ec3",
+        "x": 1860.000259399414,
+        "y": 865.7185616493225,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "8b0e1626.d5a95",
-        "type": "for",
-        "name": "for pidx in param_length",
-        "xml": "<for index=\"pidx\" start=\"0\" end=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`\">",
-        "comments": "",
-        "outputs": 1,
-        "x": 1345.6429443359375,
-        "y": 1789.9999961853027,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "81010aef.f49a18"
-            ]
-        ]
-    },
-    {
-        "id": "81010aef.f49a18",
-        "type": "switchNode",
-        "name": "switch: param[].name",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1593.6429443359375,
-        "y": 1789.7499961853027,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "e1dfefe2.393f88"
-            ]
-        ]
-    },
-    {
-        "id": "e1dfefe2.393f88",
-        "type": "outcome",
-        "name": "ip-address",
-        "xml": "<outcome value='ip-address'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1838.178695678711,
-        "y": 1789.9285697937012,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "e87a20cc.b590a8"
-            ]
-        ]
-    },
-    {
-        "id": "e87a20cc.b590a8",
+        "id": "6c93627f.1091d4",
         "type": "set",
         "name": "set resource-resolution-data.status = DELETED",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' \n\tvalue='DELETED' />\n",
         "comments": "",
-        "x": 2160.3572998046875,
-        "y": 1790.1429615020752,
-        "z": "143c1488.728ec3",
+        "x": 2630.4998779296875,
+        "y": 1758.5709228515625,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "17e282ca.caa0c5",
+        "id": "7bb69337.4e6394",
         "type": "outcome",
         "name": "prefix-id",
         "xml": "<outcome value='prefix-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1600.0558013916016,
-        "y": 894.3971590995789,
-        "z": "143c1488.728ec3",
+        "x": 1583.0558013916016,
+        "y": 909.9685921669006,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "d72c0767.d2203"
+                "ce6e3b64.bdad58"
             ]
         ]
     },
     {
-        "id": "d72c0767.d2203",
+        "id": "ce6e3b64.bdad58",
         "type": "set",
         "name": "set prefix-id",
         "xml": "<set>\n<parameter name='tmp.ss.prefix-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1846.5558013916016,
-        "y": 894.6471285820007,
-        "z": "143c1488.728ec3",
+        "x": 1829.5558013916016,
+        "y": 910.2185616493225,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "e8bdbae6.040f1",
+        "id": "f6d1639e.62ad88",
         "type": "execute",
         "name": "execute NetboxClient assignIpAddress",
         "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"assignIpAddress\">\n<parameter name=\"service_instance_id\" value=\"`$tmp.ss.service-instance-id`\" />\n<parameter name=\"vf_module_id\" value=\"`$tmp.ss.vf-module-id`\" />\n<parameter name=\"prefix_id\" value=\"`$tmp.ss.prefix-id`\" />\n<parameter name=\"resource_name\" value=\"`$tmp.ss.param.name`\" />\n<parameter name=\"external_key\" value=\"`$tmp.ss.external-key`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 1381.9525756835938,
-        "y": 1208.9170093536377,
-        "z": "143c1488.728ec3",
+        "x": 1364.9525756835938,
+        "y": 1224.4884424209595,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "6e70c100.8f1ee"
+                "63ffe78c.535b98",
+                "fd56af84.b7a68"
             ]
         ]
     },
     {
-        "id": "6e70c100.8f1ee",
+        "id": "63ffe78c.535b98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1698.9525756835938,
-        "y": 1210.9169483184814,
-        "z": "143c1488.728ec3",
+        "x": 1681.9525756835938,
+        "y": 1226.4883813858032,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "1439cf99.003e9"
+                "19c227a3.522448"
             ]
         ]
     },
     {
-        "id": "1439cf99.003e9",
+        "id": "19c227a3.522448",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1906.9525756835938,
-        "y": 1214.9169483184814,
-        "z": "143c1488.728ec3",
+        "x": 1889.9525756835938,
+        "y": 1230.4883813858032,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "2738f77e.bc5c7",
-                "663a6846.85cae8"
+                "fbac9633.970dc8",
+                "12ebaeec.b6b371"
             ]
         ]
     },
     {
-        "id": "2738f77e.bc5c7",
+        "id": "fbac9633.970dc8",
         "type": "set",
         "name": "set resource-resolution-data.status = FAILED",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' value='FAILED' />\n",
         "comments": "",
-        "x": 2223.95263671875,
-        "y": 1218.9169178009033,
-        "z": "143c1488.728ec3",
+        "x": 2206.95263671875,
+        "y": 1234.488350868225,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "663a6846.85cae8",
+        "id": "12ebaeec.b6b371",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2125.6190795898438,
-        "y": 1272.8058032989502,
-        "z": "143c1488.728ec3",
+        "x": 2104.33349609375,
+        "y": 1284.0916137695312,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "2123959.27e4fea",
+        "id": "dbf6bad6.fbad2",
         "type": "set",
         "name": "set resource-resolution-data.status = SUCCESS",
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' \n\tvalue='SUCCESS' />\n",
         "comments": "",
-        "x": 2408.750160217285,
-        "y": 1404.6076169013977,
-        "z": "143c1488.728ec3",
+        "x": 2186.0357666015625,
+        "y": 1400.17919921875,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "79d8a08e.f34778",
+        "id": "5c5c662c.f08f1",
         "type": "outcome",
         "name": "ip-address-id",
         "xml": "<outcome value='ip-address-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1613.9369506835938,
-        "y": 939.2542328834534,
-        "z": "143c1488.728ec3",
+        "x": 1596.9369506835938,
+        "y": 954.8256659507751,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "e3ef613a.32a62"
+                "163b9c18.cbc31c"
             ]
         ]
     },
     {
-        "id": "e3ef613a.32a62",
+        "id": "163b9c18.cbc31c",
         "type": "set",
         "name": "ip-address-id",
         "xml": "<set>\n<parameter name='tmp.ss.ip-address-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1848.9368286132812,
-        "y": 939.2542939186096,
-        "z": "143c1488.728ec3",
+        "x": 1831.9368286132812,
+        "y": 954.8257269859314,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "a090c1a0.159c8",
+        "id": "90dc69e5.6405",
         "type": "outcome",
         "name": "external_key",
         "xml": "<outcome value='external_key'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1601.5559692382812,
-        "y": 984.9685273170471,
-        "z": "143c1488.728ec3",
+        "x": 1584.5559692382812,
+        "y": 1000.5399603843689,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "5e668590.73215c"
+                "8dc251fb.daa1e8"
             ]
         ]
     },
     {
-        "id": "5e668590.73215c",
+        "id": "8dc251fb.daa1e8",
         "type": "set",
         "name": "set external-key",
         "xml": "<set>\n<parameter name='tmp.ss.external-key' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.resource-key[$kidx].value`' />\n",
         "comments": "",
-        "x": 1850.1273803710938,
-        "y": 984.9685883522034,
-        "z": "143c1488.728ec3",
+        "x": 1833.1273803710938,
+        "y": 1000.5400214195251,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "afe763c2.be4ad",
-        "type": "outcome",
-        "name": "tmp.ss.param.name",
-        "xml": "<outcome value='`$tmp.ss.param.name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1894.7621459960938,
-        "y": 1346.7146167755127,
-        "z": "143c1488.728ec3",
-        "wires": [
-            [
-                "8b2de334.ba017"
-            ]
-        ]
-    },
-    {
-        "id": "a8c879d0.2e224",
+        "id": "9a404501.e9a9f",
         "type": "set",
         "name": "set tmp.ss.param.name",
         "xml": "<set>\n<parameter name='tmp.ss.param.name' \n\tvalue='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`' />\n",
         "comments": "",
-        "x": 890.3493728637695,
-        "y": 443.2222390174866,
-        "z": "143c1488.728ec3",
+        "x": 873.3493728637695,
+        "y": 458.79367208480835,
+        "z": "6621aeef.bf45",
         "wires": []
     },
     {
-        "id": "58a7e2ac.369edc",
+        "id": "5c183d21.694a54",
         "type": "switchNode",
         "name": "switch: resource-resolution-data.status",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 430.2855224609375,
-        "y": 779.1906518936157,
-        "z": "143c1488.728ec3",
+        "x": 413.2855224609375,
+        "y": 794.7620849609375,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "9a3a9127.28a32",
-                "1a31fbda.d127d4"
+                "3e98782d.40c0e8",
+                "511a57cd.b0751"
             ]
         ]
     },
     {
-        "id": "9a3a9127.28a32",
+        "id": "3e98782d.40c0e8",
         "type": "not-found",
         "name": "FAILED",
         "xml": "<outcome value='FAILED'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 661.7143249511719,
-        "y": 775.1906976699829,
-        "z": "143c1488.728ec3",
+        "x": 644.7143249511719,
+        "y": 790.7621307373047,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "b5c2d57.1e7f9a8"
+                "2b59421f.30834e"
             ]
         ]
     },
     {
-        "id": "1a31fbda.d127d4",
+        "id": "511a57cd.b0751",
         "type": "success",
         "name": "PENDING",
         "xml": "<outcome value='PENDING'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 668.4285011291504,
-        "y": 826.9050257205963,
-        "z": "143c1488.728ec3",
+        "x": 651.4285011291504,
+        "y": 842.4764587879181,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "b5c2d57.1e7f9a8"
+                "2b59421f.30834e"
             ]
         ]
     },
     {
-        "id": "b5c2d57.1e7f9a8",
+        "id": "2b59421f.30834e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 823.142822265625,
-        "y": 799.190712928772,
-        "z": "143c1488.728ec3",
+        "x": 806.142822265625,
+        "y": 814.7621459960938,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "dd1d0acb.f3d9f",
-                "1ab3438e.44fb7c"
+                "f6c6e34.fe93ea",
+                "b3f43dd2.42288"
             ]
         ]
     },
     {
-        "id": "efe3d3a6.f63418",
+        "id": "cfd59a42.40ec28",
         "type": "outcome",
         "name": "assign",
         "xml": "<outcome value='assign'>",
         "comments": "",
         "outputs": 1,
-        "x": 880.9999389648438,
-        "y": 1207.0002613067627,
-        "z": "143c1488.728ec3",
+        "x": 863.9999389648438,
+        "y": 1222.5716943740845,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "f69c94df.b1d828"
+                "c384a118.8056f"
             ]
         ]
     },
     {
-        "id": "1ab3438e.44fb7c",
+        "id": "b3f43dd2.42288",
         "type": "switchNode",
         "name": "switch: ss.capability-action",
         "xml": "<switch test='`$ss.capability-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 644.9999389648438,
-        "y": 1205.0002613067627,
-        "z": "143c1488.728ec3",
+        "x": 627.9999389648438,
+        "y": 1220.5716943740845,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "efe3d3a6.f63418",
-                "dd9f2f74.302358"
+                "cfd59a42.40ec28",
+                "2ff7ecc5.284a3c"
             ]
         ]
     },
     {
-        "id": "f69c94df.b1d828",
+        "id": "c384a118.8056f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1056.4285888671875,
-        "y": 1207.857500076294,
-        "z": "143c1488.728ec3",
+        "x": 1039.4285888671875,
+        "y": 1223.4289331436157,
+        "z": "6621aeef.bf45",
+        "wires": [
+            [
+                "f6d1639e.62ad88"
+            ]
+        ]
+    },
+    {
+        "id": "64c75b78.f36b24",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1658.6785583496094,
+        "y": 1614.0357961654663,
+        "z": "6621aeef.bf45",
+        "wires": [
+            [
+                "7f0db226.60e56c"
+            ]
+        ]
+    },
+    {
+        "id": "fd56af84.b7a68",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1689.9999999999998,
+        "y": 1289.9999999999998,
+        "z": "6621aeef.bf45",
+        "wires": [
+            [
+                "7c8df38.541b98c"
+            ]
+        ]
+    },
+    {
+        "id": "131e59c0.7aa77e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1832.1072213309153,
+        "y": 1566.7500611713954,
+        "z": "6621aeef.bf45",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7c8df38.541b98c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1884.28564453125,
+        "y": 1370.0001220703125,
+        "z": "6621aeef.bf45",
+        "wires": [
+            [
+                "dbf6bad6.fbad2",
+                "235c0ede.173f92"
+            ]
+        ]
+    },
+    {
+        "id": "4c46f42f.389724",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2368.5718994140625,
+        "y": 1757.142822265625,
+        "z": "6621aeef.bf45",
         "wires": [
             [
-                "e8bdbae6.040f1",
-                "e576077c.d41a68"
+                "6c93627f.1091d4"
             ]
         ]
     }
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
index 167ab43e..7ef78f6c 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-netbox-ip-assign.xml
@@ -1,7 +1,7 @@
 <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='self-serve-netbox-ip-assignment' mode='sync'>
+    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.4.1-SNAPSHOT'>
+    <method rpc='self-serve-netbox-ip-assign' mode='sync'>
         <block atomic="true">
             <switch test='`$ss.capability-name`'>
                 <outcome value=''>
@@ -94,23 +94,19 @@
                                                                 </return>
                                                             </block>
                                                         </outcome>
-                                                    </execute>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='`$tmp.ss.param.name`'>
-                                                                <block>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
 	value='`$self_serve_netbox_ip_assignement.ip-address`' />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
 	value='SUCCESS' />
-                                                                    </set>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
                                                 </block>
                                             </outcome>
                                             <outcome value='unassign'>
@@ -149,20 +145,16 @@
                                                                             <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
                                                                         </return>
                                                                     </outcome>
+                                                                    <outcome value='success'>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                        </set>
+                                                                    </outcome>
                                                                 </execute>
                                                             </block>
                                                         </outcome>
                                                     </get-resource>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='ip-address'>
-                                                                <set>
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                                                </set>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
                                                 </block>
                                             </outcome>
                                         </switch>
@@ -219,23 +211,19 @@
                                                                 </return>
                                                             </block>
                                                         </outcome>
-                                                    </execute>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='`$tmp.ss.param.name`'>
-                                                                <block>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
+                                                        <outcome value='success'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].value' 
 	value='`$self_serve_netbox_ip_assignement.ip-address`' />
-                                                                    </set>
-                                                                    <set>
-                                                                        <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+                                                                </set>
+                                                                <set>
+                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
 	value='SUCCESS' />
-                                                                    </set>
-                                                                </block>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
+                                                                </set>
+                                                            </block>
+                                                        </outcome>
+                                                    </execute>
                                                 </block>
                                             </outcome>
                                             <outcome value='unassign'>
@@ -274,20 +262,16 @@
                                                                             <parameter name="error-message" value="`'Error in NetboxClient#unassignIPAddress with external-key='+ $tmp.ss.external-key`" />
                                                                         </return>
                                                                     </outcome>
+                                                                    <outcome value='success'>
+                                                                        <set>
+                                                                            <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
+	value='DELETED' />
+                                                                        </set>
+                                                                    </outcome>
                                                                 </execute>
                                                             </block>
                                                         </outcome>
                                                     </get-resource>
-                                                    <for index="pidx" start="0" end="`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param_length`">
-                                                        <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].name`'>
-                                                            <outcome value='ip-address'>
-                                                                <set>
-                                                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-parameters.param[$pidx].resource-resolution-data.status' 
-	value='DELETED' />
-                                                                </set>
-                                                            </outcome>
-                                                        </switch>
-                                                    </for>
                                                 </block>
                                             </outcome>
                                         </switch>