Update self-service-netbox-ip-assignment DG

- added the external_key support
- fixes plugin returned value and mapping to the
proper param in the MDSAL context.
- couple of typos

Change-Id: I6f305829e538284d7e4008352273fd82c77f4142
Issue-ID: CCSDK-339
Issue-ID: CCSDK-340
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

Former-commit-id: 0fe5cab7a4822073c02751756f08ab64c881e528

1 files changed, 385 insertions, 345 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json
index 98ffc8a7..fb57cbe8 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-netbox-ip-assignment.json
@@ -1,55 +1,55 @@
 [
   {
-    "id": "d82ababf.4deaf",
+    "id": "2530b9b4.e6f64e",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 112,
-    "y": 59,
-    "z": "158dead5.f2086d",
+    "x": 122,
+    "y": 66,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "514957da.088018"
+        "f24329c.83c4e58"
       ]
     ]
   },
   {
-    "id": "5c4ab99.de900c8",
+    "id": "97a5934b.60b828",
     "type": "method",
     "name": "method self-serve-netbox-ip-assignment",
     "xml": "<method rpc='self-serve-netbox-ip-assignment' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 247.7857208251953,
-    "y": 116.1269884109497,
-    "z": "158dead5.f2086d",
+    "x": 257.7857208251953,
+    "y": 123.1269884109497,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "ad092d5.0a569d"
+        "439274d0.e50354"
       ]
     ]
   },
   {
-    "id": "ad092d5.0a569d",
+    "id": "439274d0.e50354",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 141.32144165039062,
-    "y": 202.4286069869995,
-    "z": "158dead5.f2086d",
+    "x": 151.32144165039062,
+    "y": 209.4286069869995,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "b3535f37.0a7d5",
-        "cf52bd4f.68ddb",
-        "acedbb53.5c913"
+        "4408534b.4e62fc",
+        "795381cc.ae76e8",
+        "9e36d81b.e4d19"
       ]
     ]
   },
   {
-    "id": "514957da.088018",
+    "id": "f24329c.83c4e58",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -57,872 +57,912 @@
     "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": 384.8571472167969,
-    "y": 58.42856693267822,
-    "z": "158dead5.f2086d",
+    "x": 394.8571472167969,
+    "y": 65.42856693267822,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "5c4ab99.de900c8"
+        "97a5934b.60b828"
       ]
     ]
   },
   {
-    "id": "b3535f37.0a7d5",
+    "id": "4408534b.4e62fc",
     "type": "switchNode",
     "name": "switch: ss.capability-name",
     "xml": "<switch test='`$ss.capability-name`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 375.75000762939453,
-    "y": 203.75000476837158,
-    "z": "158dead5.f2086d",
+    "x": 385.75000762939453,
+    "y": 210.75000476837158,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "4c0e104c.c8992"
+        "e3e743cf.b5708"
       ]
     ]
   },
   {
-    "id": "4c0e104c.c8992",
+    "id": "e3e743cf.b5708",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "outputs": 1,
-    "x": 600.7500305175781,
-    "y": 204.2500033378601,
-    "z": "158dead5.f2086d",
+    "x": 610.7500305175781,
+    "y": 211.2500033378601,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "3e59422c.56b57e"
+        "45c19f4e.02e1e"
       ]
     ]
   },
   {
-    "id": "3e59422c.56b57e",
+    "id": "45c19f4e.02e1e",
     "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": 760.6667022705078,
-    "y": 204.361102104187,
-    "z": "158dead5.f2086d",
+    "x": 770.6667022705078,
+    "y": 211.361102104187,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "cf52bd4f.68ddb",
+    "id": "795381cc.ae76e8",
     "type": "switchNode",
     "name": "switch: ss.capability-action",
     "xml": "<switch test='`$ss.capability-action`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 377.00002670288086,
-    "y": 253.75000524520874,
-    "z": "158dead5.f2086d",
+    "x": 387.00002670288086,
+    "y": 260.75000524520874,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "5c7f0bf6.ffeef4",
-        "8699e334.7ba04",
-        "aeaaa4c.eb96958"
+        "9d04bb67.f3d528",
+        "969e4445.b0611",
+        "d6457743.c33b1"
       ]
     ]
   },
   {
-    "id": "5c7f0bf6.ffeef4",
+    "id": "9d04bb67.f3d528",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 600.5000228881836,
-    "y": 254.00000524520874,
-    "z": "158dead5.f2086d",
+    "x": 610.5000228881836,
+    "y": 261.00000524520874,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "e43d474e.c67e6"
+        "7ed3650.ebf061c"
       ]
     ]
   },
   {
-    "id": "e43d474e.c67e6",
+    "id": "7ed3650.ebf061c",
     "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": 760.4166946411133,
-    "y": 254.11110401153564,
-    "z": "158dead5.f2086d",
+    "x": 770.4166946411133,
+    "y": 261.11110401153564,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "8699e334.7ba04",
+    "id": "969e4445.b0611",
     "type": "outcome",
     "name": "assign",
     "xml": "<outcome value='assign'>",
     "comments": "",
     "outputs": 1,
-    "x": 599.2500190734863,
-    "y": 309.00000858306885,
-    "z": "158dead5.f2086d",
+    "x": 609.2500190734863,
+    "y": 316.00000858306885,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "aec36890.ff2fb"
+        "f154be48.ae57c"
       ]
     ]
   },
   {
-    "id": "aeaaa4c.eb96958",
+    "id": "d6457743.c33b1",
     "type": "outcome",
     "name": "unassign",
     "xml": "<outcome value='unassign'>",
     "comments": "",
     "outputs": 1,
-    "x": 599.1786499023438,
-    "y": 1120.642822265625,
-    "z": "158dead5.f2086d",
+    "x": 609.1786499023438,
+    "y": 1127.642822265625,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "56d47025.86d16"
+        "6adef88c.08d9f8"
       ]
     ]
   },
   {
-    "id": "f70a5fa0.d247d",
+    "id": "ddde01a5.7d761",
     "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": 1090.6666870117188,
-    "y": 309.2500123977661,
-    "z": "158dead5.f2086d",
+    "x": 1099.416748046875,
+    "y": 316.25,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "14ec23cb.75b09c"
+        "289ac02f.fef728"
       ]
     ]
   },
   {
-    "id": "14ec23cb.75b09c",
+    "id": "289ac02f.fef728",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1340.6666679382324,
-    "y": 309.25000858306885,
-    "z": "158dead5.f2086d",
+    "x": 1350.6666679382324,
+    "y": 316.25000858306885,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "7c50a969.b62318"
+        "37e2330e.5ce094"
       ]
     ]
   },
   {
-    "id": "7c50a969.b62318",
+    "id": "37e2330e.5ce094",
     "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": 1499.416648864746,
-    "y": 309.2500047683716,
-    "z": "158dead5.f2086d",
+    "x": 1509.416648864746,
+    "y": 316.2500047683716,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "1843f01b.23ada8",
+    "id": "193f213d.d80e7f",
     "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": 1504.5634536743164,
-    "y": 365.03172874450684,
-    "z": "158dead5.f2086d",
+    "x": 1514.5634536743164,
+    "y": 372.03172874450684,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "a2dda04a.43ae58",
+    "id": "667d4699.51911",
     "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": 1214.7776794433594,
-    "y": 365.10319900512695,
-    "z": "158dead5.f2086d",
+    "x": 1224.7776794433594,
+    "y": 372.10319900512695,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "943c092c.4b3b3",
-        "1843f01b.23ada8"
+        "e03f298c.89ef68",
+        "193f213d.d80e7f",
+        "4678ae91.df7428"
       ]
     ]
   },
   {
-    "id": "943c092c.4b3b3",
+    "id": "e03f298c.89ef68",
     "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": 1516.5276794433594,
-    "y": 408.6032028198242,
-    "z": "158dead5.f2086d",
+    "x": 1527.638916015625,
+    "y": 453.3809814453125,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "740fdfdc.63143"
+        "ad87e8f8.f29d8"
       ]
     ]
   },
   {
-    "id": "740fdfdc.63143",
+    "id": "ad87e8f8.f29d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1755.277687072754,
-    "y": 408.3532028198242,
-    "z": "158dead5.f2086d",
+    "x": 1766.3889236450195,
+    "y": 453.1309814453125,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "ff105b45.f52f4"
+        "3fea9750.333958"
       ]
     ]
   },
   {
-    "id": "32fe15e5.a7bf9a",
+    "id": "4b58ccb.9c3cd34",
     "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": 1520.5081405639648,
-    "y": 498.1706771850586,
-    "z": "158dead5.f2086d",
+    "x": 1526.0637130737305,
+    "y": 542.9484596252441,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "318167f.d597118",
-        "f4971b35.f262",
-        "dfc56a05.e2c65",
-        "c64f6887.de64e"
+        "5c012e9d.3803c",
+        "d37d3547.691c58",
+        "180cc75.008d139",
+        "385a53b.66671ac",
+        "6407a5bc.0cc834"
       ]
     ]
   },
   {
-    "id": "dfc56a05.e2c65",
+    "id": "d37d3547.691c58",
     "type": "outcome",
     "name": "service-instance-id",
     "xml": "<outcome value='service-instance-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1791.8970489501953,
-    "y": 497.64289569854736,
-    "z": "158dead5.f2086d",
+    "x": 1797.452621459961,
+    "y": 542.4206781387329,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "d9a882de.1d6658"
+        "52db4f21.43a918"
       ]
     ]
   },
   {
-    "id": "d9a882de.1d6658",
+    "id": "52db4f21.43a918",
     "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": 2058.1470489501953,
-    "y": 497.39289569854736,
-    "z": "158dead5.f2086d",
+    "x": 2063.702621459961,
+    "y": 542.1706781387329,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "318167f.d597118",
-    "type": "outcome",
-    "name": "client-key",
-    "xml": "<outcome value='client-key'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1767.4804229736328,
-    "y": 633.7817506790161,
-    "z": "158dead5.f2086d",
-    "wires": [
-      [
-        "bb45bf6b.de9f78"
-      ]
-    ]
-  },
-  {
-    "id": "bb45bf6b.de9f78",
+    "id": "daf7a5b3.f6dd1",
     "type": "set",
-    "name": "set tmp.ss.client-key",
-    "xml": "<set>\n<parameter name='tmp.ss.client-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": 2036.4804229736328,
-    "y": 633.7817506790161,
-    "z": "158dead5.f2086d",
-    "wires": []
-  },
-  {
-    "id": "f7c84a6b.9d9108",
-    "type": "set",
-    "name": "set service-data...param[].value = ip-prefix",
+    "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": 2028.500015258789,
-    "y": 907,
-    "z": "158dead5.f2086d",
+    "x": 2035.96044921875,
+    "y": 980.0316772460938,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "73427b92.9bde0c",
+    "id": "680b90a.12cf17",
     "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": 1033.7142333984375,
-    "y": 906.8214111328125,
-    "z": "158dead5.f2086d",
+    "x": 1042.28564453125,
+    "y": 980.9642944335938,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "3466ae83.83e262"
+        "62315add.1e0734"
       ]
     ]
   },
   {
-    "id": "3466ae83.83e262",
+    "id": "62315add.1e0734",
     "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": 1281.7142333984375,
-    "y": 906.5714111328125,
-    "z": "158dead5.f2086d",
-    "wires": [
-      [
-        "870cd21d.8e341"
-      ]
-    ]
-  },
-  {
-    "id": "870cd21d.8e341",
-    "type": "outcome",
-    "name": "ip-address",
-    "xml": "<outcome value='ip-address'>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1526.249984741211,
-    "y": 906.7499847412109,
-    "z": "158dead5.f2086d",
+    "x": 1288.0633544921875,
+    "y": 980.7142333984375,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "52f0e6b1.b33288"
+        "2bb8b8e0.b3d528"
       ]
     ]
   },
   {
-    "id": "52f0e6b1.b33288",
+    "id": "e46bc99.e09a7b8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1757.5000114440918,
-    "y": 906.75,
-    "z": "158dead5.f2086d",
+    "x": 1766.0714225769043,
+    "y": 980.8928833007812,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "f7c84a6b.9d9108",
-        "3f62b174.894c0e"
+        "daf7a5b3.f6dd1",
+        "c2ef384b.46015"
       ]
     ]
   },
   {
-    "id": "b7977f7d.8ce65",
+    "id": "789789b0.192b1",
     "type": "update",
     "name": "get-resource NETBOX_IP_ASSIGNMENTS",
-    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from NETBOX_IP_ASSIGNMENTS \n\t\tWHERE service_instance_id = $tmp.ss.service-instance-id\n\t\tAND client_key = $tmp.ss.client-key'>",
+    "xml": "<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'\n\tkey='SELECT * from NETBOX_IP_ASSIGNMENTS \n\t\tWHERE external_key = $tmp.ss.external-key\n\t\tAND service_instance_id = $tmp.ss.service-instance-id\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1077.6785888671875,
-    "y": 1120.892822265625,
-    "z": "158dead5.f2086d",
+    "x": 1084.6627197265625,
+    "y": 1126.4642333984375,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "f72ccdef.62b18",
-        "8dd46bd6.87c01"
+        "263460f3.585f6",
+        "e0cf0d4e.662af8"
       ]
     ]
   },
   {
-    "id": "f72ccdef.62b18",
+    "id": "263460f3.585f6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1369.250057220459,
-    "y": 1120.46426653862,
-    "z": "158dead5.f2086d",
+    "x": 1379.250057220459,
+    "y": 1127.46426653862,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "7de1e772.abc858"
+        "827adc75.f19d3"
       ]
     ]
   },
   {
-    "id": "7de1e772.abc858",
+    "id": "827adc75.f19d3",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1539.3928658621653,
-    "y": 1120.8928443363734,
-    "z": "158dead5.f2086d",
+    "x": 1549.3928658621653,
+    "y": 1127.8928443363734,
+    "z": "a50b508.c70bcb",
     "wires": [
       []
     ]
   },
   {
-    "id": "8dd46bd6.87c01",
+    "id": "e0cf0d4e.662af8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1365.9642028808594,
-    "y": 1168.1785793304443,
-    "z": "158dead5.f2086d",
+    "x": 1375.9642028808594,
+    "y": 1175.1785793304443,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "87ae6929.f38048"
+        "74c412e0.e4563c"
       ]
     ]
   },
   {
-    "id": "56d47025.86d16",
+    "id": "6adef88c.08d9f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 768.5000152587891,
-    "y": 1121.107177734375,
-    "z": "158dead5.f2086d",
+    "x": 778.5000152587891,
+    "y": 1128.107177734375,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "c62e6e8f.bfa43",
-        "b7977f7d.8ce65",
-        "684ada9c.20cdbc"
+        "97394cd8.c006c",
+        "789789b0.192b1",
+        "8a29b237.3a1ab8"
       ]
     ]
   },
   {
-    "id": "aec36890.ff2fb",
+    "id": "f154be48.ae57c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 772.0000305175781,
-    "y": 309.25000953674316,
-    "z": "158dead5.f2086d",
+    "x": 782.0000305175781,
+    "y": 316.25000953674316,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "f70a5fa0.d247d",
-        "c62e6e8f.bfa43",
-        "73427b92.9bde0c"
+        "ddde01a5.7d761",
+        "97394cd8.c006c",
+        "680b90a.12cf17",
+        "bfdda910.78af88"
       ]
     ]
   },
   {
-    "id": "ff105b45.f52f4",
+    "id": "3fea9750.333958",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 1893.6745948791504,
-    "y": 407.670615196228,
-    "z": "158dead5.f2086d",
+    "x": 1904.785831451416,
+    "y": 452.4483938217163,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "999294fe.a69638",
+    "id": "2cc58bea.09d2f4",
     "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": 1241.3692169189453,
-    "y": 498.03178787231445,
-    "z": "158dead5.f2086d",
+    "x": 1246.924789428711,
+    "y": 542.8095703125,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "32fe15e5.a7bf9a"
+        "4b58ccb.9c3cd34"
       ]
     ]
   },
   {
-    "id": "c62e6e8f.bfa43",
+    "id": "97394cd8.c006c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 980.0357055664062,
-    "y": 365.2261657714844,
-    "z": "158dead5.f2086d",
+    "x": 990.0357055664062,
+    "y": 372.2261657714844,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "a2dda04a.43ae58",
-        "999294fe.a69638",
-        "72366483.e4dd0c",
-        "93e0546d.de75b"
+        "667d4699.51911",
+        "2cc58bea.09d2f4",
+        "c6e8fa3c.1df4d8"
       ]
     ]
   },
   {
-    "id": "acedbb53.5c913",
+    "id": "9e36d81b.e4d19",
     "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": 333.25000762939453,
-    "y": 419.0000066757202,
-    "z": "158dead5.f2086d",
+    "x": 343.25000762939453,
+    "y": 426.0000066757202,
+    "z": "a50b508.c70bcb",
     "wires": [
       []
     ]
   },
   {
-    "id": "4e153620.e3c8d",
+    "id": "b4c5f803.8e5ff8",
     "type": "update",
     "name": "update NETBOX_IP_ASSIGNMENTS to PENDING_DELETE...",
-    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE NETBOX_IP_ASSIGNMENTS set ip_status = $tmp.status \n\t\tWHERE service_instance_id = $tmp.ss.service-instance-id \n\t\tAND client_key = $tmp.ss.client-key\" >",
+    "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource\" resource=\"SQL\"\n\tkey=\"UPDATE NETBOX_IP_ASSIGNMENTS 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": 1899.2262420654297,
-    "y": 1212.3929681777954,
-    "z": "158dead5.f2086d",
+    "x": 1907.5596923828125,
+    "y": 1218.1429443359375,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "3ca10d66.8e421a"
+        "804b2812.ef90a8"
       ]
     ]
   },
   {
-    "id": "59682f69.8b602",
+    "id": "331e2fe5.e9d148",
     "type": "set",
     "name": "set status = PENDING_DELETE",
     "xml": "<set>\n<parameter name='tmp.status' value=\"PENDING_DELETE\" />\n",
     "comments": "",
-    "x": 1808.7262344360352,
-    "y": 1169.476219177246,
-    "z": "158dead5.f2086d",
+    "x": 1817.4761962890625,
+    "y": 1176.4761962890625,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "3ca10d66.8e421a",
+    "id": "804b2812.ef90a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2205.2261505126953,
-    "y": 1211.7262678146362,
-    "z": "158dead5.f2086d",
+    "x": 2215.2261505126953,
+    "y": 1218.7262678146362,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "a79b0cd6.ba9dc"
+        "5b0ce03c.02484"
       ]
     ]
   },
   {
-    "id": "a79b0cd6.ba9dc",
+    "id": "5b0ce03c.02484",
     "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 EIPAM_IP_ASSIGNMENTS table to unassign ip with client_key=' + $tmp.ss.client-key + ' and service_instance_id=' + $tmp.ss.service-instance-id`\" />\n",
     "comments": "",
-    "x": 2384.2264404296875,
-    "y": 1211.535888671875,
-    "z": "158dead5.f2086d",
+    "x": 2394.2264404296875,
+    "y": 1218.535888671875,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "1aee94d6.e70a7b",
+    "id": "c884502.10a993",
     "type": "execute",
-    "name": "execute EIPAM unassign IP addresses",
-    "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"unassignIpAddress\">",
+    "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": 1834.2262115478516,
-    "y": 1257.393012046814,
-    "z": "158dead5.f2086d",
+    "x": 1837.5595703125,
+    "y": 1264.3930053710938,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "fdf0362f.fd4f4"
+        "938555fd.2c9f4"
       ]
     ]
   },
   {
-    "id": "fdf0362f.fd4f4",
+    "id": "938555fd.2c9f4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2070.892837524414,
-    "y": 1257.392954826355,
-    "z": "158dead5.f2086d",
+    "x": 2080.892837524414,
+    "y": 1264.392954826355,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "6b5c8b96.1eb51c"
+        "73bb5af.611c4a4"
       ]
     ]
   },
   {
-    "id": "6b5c8b96.1eb51c",
+    "id": "73bb5af.611c4a4",
     "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 EIPAMPlugin.unassignIPAddress with client-key='+ $tmp.ss.client-key`\" />\n",
     "comments": "",
-    "x": 2232.892864227295,
-    "y": 1257.2026901245117,
-    "z": "158dead5.f2086d",
+    "x": 2242.892864227295,
+    "y": 1264.2026901245117,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "87ae6929.f38048",
+    "id": "74c412e0.e4563c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1548.1786041259766,
-    "y": 1168.8928241729736,
-    "z": "158dead5.f2086d",
+    "x": 1558.1786041259766,
+    "y": 1175.8928241729736,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "59682f69.8b602",
-        "4e153620.e3c8d",
-        "1aee94d6.e70a7b"
+        "331e2fe5.e9d148",
+        "b4c5f803.8e5ff8",
+        "c884502.10a993"
       ]
     ]
   },
   {
-    "id": "72366483.e4dd0c",
+    "id": "c6e8fa3c.1df4d8",
     "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": 1166.2857360839844,
-    "y": 443.6428413391113,
-    "z": "158dead5.f2086d",
+    "x": 1171.84130859375,
+    "y": 488.4206237792969,
+    "z": "a50b508.c70bcb",
     "wires": [
       []
     ]
   },
   {
-    "id": "f4971b35.f262",
+    "id": "5c012e9d.3803c",
     "type": "outcome",
     "name": "vf-module-id",
     "xml": "<outcome value='vf-module-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773.7300567626953,
-    "y": 543.8928346633911,
-    "z": "158dead5.f2086d",
+    "x": 1779.285629272461,
+    "y": 588.6706171035767,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "e7bc24a5.2b1688"
+        "b3c8659d.3706c"
       ]
     ]
   },
   {
-    "id": "e7bc24a5.2b1688",
+    "id": "b3c8659d.3706c",
     "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": 2039.7301788330078,
-    "y": 543.8928346633911,
-    "z": "158dead5.f2086d",
+    "x": 2045.2857513427734,
+    "y": 588.6706171035767,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "684ada9c.20cdbc",
+    "id": "8a29b237.3a1ab8",
     "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": 1035.9285888671875,
-    "y": 1359.7142124176025,
-    "z": "158dead5.f2086d",
+    "x": 1045.9285888671875,
+    "y": 1366.7142124176025,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "c9290a31.bc6ba"
+        "e55f8062.b15058"
       ]
     ]
   },
   {
-    "id": "c9290a31.bc6ba",
+    "id": "e55f8062.b15058",
     "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": 1283.9285888671875,
-    "y": 1359.4642124176025,
-    "z": "158dead5.f2086d",
+    "x": 1293.9285888671875,
+    "y": 1366.4642124176025,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "b44fcfdb.b21448"
+        "783ce22f.9c0904"
       ]
     ]
   },
   {
-    "id": "b44fcfdb.b21448",
+    "id": "783ce22f.9c0904",
     "type": "outcome",
     "name": "ip-address",
     "xml": "<outcome value='ip-address'>",
     "comments": "",
     "outputs": 1,
-    "x": 1528.464340209961,
-    "y": 1359.642786026001,
-    "z": "158dead5.f2086d",
+    "x": 1538.464340209961,
+    "y": 1366.642786026001,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "885816c2.0cf518"
+        "85da44f2.9478b8"
       ]
     ]
   },
   {
-    "id": "885816c2.0cf518",
+    "id": "85da44f2.9478b8",
     "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": 1850.6429443359375,
-    "y": 1359.857177734375,
-    "z": "158dead5.f2086d",
+    "x": 1860.6429443359375,
+    "y": 1366.857177734375,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "c64f6887.de64e",
+    "id": "180cc75.008d139",
     "type": "outcome",
     "name": "prefix-id",
     "xml": "<outcome value='prefix-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1762.7857208251953,
-    "y": 588.1428651809692,
-    "z": "158dead5.f2086d",
+    "x": 1768.341293334961,
+    "y": 632.9206476211548,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "5e015d1e.a95ec4"
+        "4e3dfad.08e4684"
       ]
     ]
   },
   {
-    "id": "5e015d1e.a95ec4",
+    "id": "4e3dfad.08e4684",
     "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": 2009.2857208251953,
-    "y": 588.3928346633911,
-    "z": "158dead5.f2086d",
+    "x": 2014.841293334961,
+    "y": 633.1706171035767,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "93e0546d.de75b",
+    "id": "bfdda910.78af88",
     "type": "execute",
     "name": "execute NetboxClient assignIpAddress",
-    "xml": "<execute plugin=\"org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient\" method=\"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": 1259.285903930664,
-    "y": 713.3928346633911,
-    "z": "158dead5.f2086d",
+    "x": 1094.52392578125,
+    "y": 804.2023315429688,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "a3087de2.330a5"
+        "632677c6.e90368"
       ]
     ]
   },
   {
-    "id": "a3087de2.330a5",
+    "id": "632677c6.e90368",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1514.2858428955078,
-    "y": 713.3928346633911,
-    "z": "158dead5.f2086d",
+    "x": 1349.5238647460938,
+    "y": 804.2023315429688,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "c5dacbf8.86fe78"
+        "2c62cad1.235d9e"
       ]
     ]
   },
   {
-    "id": "c5dacbf8.86fe78",
+    "id": "2c62cad1.235d9e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1684.2858428955078,
-    "y": 713.3928346633911,
-    "z": "158dead5.f2086d",
+    "x": 1519.5238647460938,
+    "y": 804.2023315429688,
+    "z": "a50b508.c70bcb",
     "wires": [
       [
-        "1f126d73.fa4e23",
-        "f3e9ed8c.ec8d78"
+        "db150ab3.5a407",
+        "5b7f4cc.962b0b4"
       ]
     ]
   },
   {
-    "id": "1f126d73.fa4e23",
+    "id": "db150ab3.5a407",
     "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": 1999.2858428955078,
-    "y": 713.3928346633911,
-    "z": "158dead5.f2086d",
+    "x": 1834.5238647460938,
+    "y": 804.2023315429688,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "f3e9ed8c.ec8d78",
+    "id": "5b7f4cc.962b0b4",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1914.2857208251953,
-    "y": 778.3928346633911,
-    "z": "158dead5.f2086d",
+    "x": 1736.1903076171875,
+    "y": 858.0912170410156,
+    "z": "a50b508.c70bcb",
     "wires": []
   },
   {
-    "id": "3f62b174.894c0e",
+    "id": "c2ef384b.46015",
     "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": 2048.75,
-    "y": 963.75,
-    "z": "158dead5.f2086d",
+    "x": 2057.3214111328125,
+    "y": 1037.8928833007812,
+    "z": "a50b508.c70bcb",
+    "wires": []
+  },
+  {
+    "id": "385a53b.66671ac",
+    "type": "outcome",
+    "name": "ip-address-id",
+    "xml": "<outcome value='ip-address-id'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1782.2224426269531,
+    "y": 677.7777214050293,
+    "z": "a50b508.c70bcb",
+    "wires": [
+      [
+        "882acfd1.857a7"
+      ]
+    ]
+  },
+  {
+    "id": "882acfd1.857a7",
+    "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": 2017.2223205566406,
+    "y": 677.7777824401855,
+    "z": "a50b508.c70bcb",
+    "wires": []
+  },
+  {
+    "id": "6407a5bc.0cc834",
+    "type": "outcome",
+    "name": "external_key",
+    "xml": "<outcome value='external_key'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1769.8414611816406,
+    "y": 723.492015838623,
+    "z": "a50b508.c70bcb",
+    "wires": [
+      [
+        "51922093.53fea8"
+      ]
+    ]
+  },
+  {
+    "id": "51922093.53fea8",
+    "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": 2018.4128723144531,
+    "y": 723.4920768737793,
+    "z": "a50b508.c70bcb",
+    "wires": []
+  },
+  {
+    "id": "2bb8b8e0.b3d528",
+    "type": "outcome",
+    "name": "tmp.ss.param.name",
+    "xml": "<outcome value='tmp.ss.param.name'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1543.3333740234375,
+    "y": 979.9998779296875,
+    "z": "a50b508.c70bcb",
+    "wires": [
+      [
+        "e46bc99.e09a7b8"
+      ]
+    ]
+  },
+  {
+    "id": "4678ae91.df7428",
+    "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": 1477.7779541015625,
+    "y": 412.22216796875,
+    "z": "a50b508.c70bcb",
     "wires": []
   }
 ]
\ No newline at end of file