self-serve dg patch
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / GENERIC-RESOURCE-API_self-serve-vf-module-unassign.json
index 51d9b3c..7511ed2 100644 (file)
@@ -1,57 +1,57 @@
 [
   {
-    "id": "59c8eddd.d351d4",
+    "id": "6215fee5.bddad",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 115,
-    "y": 47.5,
-    "z": "e707a2eb.031dc",
+    "x": 136.66665649414062,
+    "y": 49.999996185302734,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "3fa7b3b2.14694c"
+        "e0abbbb4.1691a8"
       ]
     ]
   },
   {
-    "id": "7094f80c.f334a8",
+    "id": "c0b04192.50c06",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 158.72620391845703,
-    "y": 160.27779006958008,
-    "z": "e707a2eb.031dc",
+    "x": 180.39286041259766,
+    "y": 162.7777862548828,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "e9626c7d.713ca",
-        "669839ba.56b488",
-        "4b0a760.f121c8c",
-        "c4d10211.0d483",
-        "bd7013b7.21885"
+        "c39465f2.9d0ab8",
+        "9ba3908c.b3993",
+        "9c2ed3b1.7a9c5",
+        "21cbbc15.66ca44",
+        "65e92b38.4daee4"
       ]
     ]
   },
   {
-    "id": "8f7300f3.a1d57",
+    "id": "7d5065be.a2599c",
     "type": "method",
     "name": "method self-serve-vf-module-unassign",
     "xml": "<method rpc='self-serve-vf-module-unassign' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 231.76190948486328,
-    "y": 102.20635509490967,
-    "z": "e707a2eb.031dc",
+    "x": 253.4285659790039,
+    "y": 104.7063512802124,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "7094f80c.f334a8"
+        "c0b04192.50c06"
       ]
     ]
   },
   {
-    "id": "3fa7b3b2.14694c",
+    "id": "e0abbbb4.1691a8",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
     "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": 390.23819732666016,
-    "y": 47.69049263000488,
-    "z": "e707a2eb.031dc",
+    "x": 411.9048538208008,
+    "y": 50.19048881530762,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "8f7300f3.a1d57"
+        "7d5065be.a2599c"
       ]
     ]
   },
   {
-    "id": "88e4ca0d.4b82e8",
+    "id": "8fa17821.c8c998",
     "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": 483.5361022949219,
-    "y": 760.1786985397339,
-    "z": "e707a2eb.031dc",
+    "x": 505.2027587890625,
+    "y": 762.6786947250366,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "2e842ad6.b13196",
-        "6f51aecc.4c371",
-        "81b87eaf.eec99"
+        "5b5326aa.c9a828",
+        "6d9494a.3f2206c",
+        "862297c.bf59968"
       ]
     ]
   },
   {
-    "id": "2e842ad6.b13196",
+    "id": "5b5326aa.c9a828",
     "type": "other",
     "name": "SUCCESS",
     "xml": "<outcome value='SUCCESS'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 761.2386436462402,
-    "y": 760.547661781311,
-    "z": "e707a2eb.031dc",
+    "x": 782.9053001403809,
+    "y": 763.0476579666138,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "a18437e.11876c8"
+        "9fffaa92.3e94f8"
       ]
     ]
   },
   {
-    "id": "e9626c7d.713ca",
+    "id": "c39465f2.9d0ab8",
     "type": "for",
     "name": "foreach capability-order[]",
     "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 409.1786346435547,
-    "y": 247.53568077087402,
-    "z": "e707a2eb.031dc",
+    "x": 430.8452911376953,
+    "y": 250.03567695617676,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "5cc84364.d00a7c",
-        "52fc6783.b27a48",
-        "60c0d544.1395bc",
-        "1f5f6357.bb701d"
+        "f837bbd3.874678",
+        "b931e6cb.da94c8",
+        "d21e6f1d.1016c",
+        "89534d93.1f285"
       ]
     ]
   },
   {
-    "id": "a18437e.11876c8",
+    "id": "9fffaa92.3e94f8",
     "type": "call",
     "name": "call ss.capability-dg",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 966.3573760986328,
-    "y": 760.309513092041,
-    "z": "e707a2eb.031dc",
+    "x": 988.0240325927734,
+    "y": 762.8095092773438,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "83cd0b73.a2d968",
-        "e01eeb11.ffdd28"
+        "fc60047e.9fb338"
       ]
     ]
   },
   {
-    "id": "5cc84364.d00a7c",
+    "id": "f837bbd3.874678",
     "type": "set",
     "name": "ss.capability-name",
     "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n\n<!--\nss.capability.execution-order\n-->",
     "comments": "",
-    "x": 677.5356903076172,
-    "y": 247.48813247680664,
-    "z": "e707a2eb.031dc",
+    "x": 699.2023468017578,
+    "y": 249.98812866210938,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "60c0d544.1395bc",
+    "id": "b931e6cb.da94c8",
     "type": "set",
     "name": "set ss.capability.action = unassign",
     "xml": "<set>\n<parameter name='ss.capability-action' value='unassign' />\n",
     "comments": "",
-    "x": 726.2498321533203,
-    "y": 294.4047164916992,
-    "z": "e707a2eb.031dc",
+    "x": 747.9164886474609,
+    "y": 296.90471267700195,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "83cd0b73.a2d968",
+    "id": "fc60047e.9fb338",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1151.249885559082,
-    "y": 760.3095741271973,
-    "z": "e707a2eb.031dc",
+    "x": 1172.9165420532227,
+    "y": 762.8095703125,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "b3347c0d.511cc"
+        "a1d1bb97.069c18"
       ]
     ]
   },
   {
-    "id": "99396b28.795028",
+    "id": "89534d93.1f285",
     "type": "set",
     "name": "set capability-dg",
     "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
     "comments": "",
-    "x": 1130.0119018554688,
-    "y": 441.63094902038574,
-    "z": "e707a2eb.031dc",
+    "x": 696.678596496582,
+    "y": 344.13096809387207,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "52fc6783.b27a48",
-    "type": "switchNode",
-    "name": "switch ss.capability-name",
-    "xml": "<switch test='`$ss.capability-name`'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 701.5119018554688,
-    "y": 343.3809566497803,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "89609b9d.832be8",
-        "bb8dbf03.25222",
-        "3e252dd8.99cbe2"
-      ]
-    ]
-  },
-  {
-    "id": "89609b9d.832be8",
-    "type": "other",
-    "name": "alts-entitlement-assign",
-    "xml": "<outcome value='alts-entitlement-assign'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 995.2620239257812,
-    "y": 343.88094902038574,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "71970fc.f01b7f"
-      ]
-    ]
-  },
-  {
-    "id": "bb8dbf03.25222",
-    "type": "other",
-    "name": "alts-license-assign",
-    "xml": "<outcome value='alts-license-assign'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 984.5120239257812,
-    "y": 391.63094902038574,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "71970fc.f01b7f"
-      ]
-    ]
-  },
-  {
-    "id": "3e252dd8.99cbe2",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 950.5119857788086,
-    "y": 441.8809394836426,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "99396b28.795028"
-      ]
-    ]
-  },
-  {
-    "id": "71970fc.f01b7f",
-    "type": "set",
-    "name": "set capability-dg",
-    "xml": "<set>\n<parameter name='ss.capability-dg' value='self-serve-alts-assignment' />\n",
-    "comments": "",
-    "x": 1254.0119018554688,
-    "y": 343.38094902038574,
-    "z": "e707a2eb.031dc",
-    "wires": []
-  },
-  {
-    "id": "c4d10211.0d483",
+    "id": "21cbbc15.66ca44",
     "type": "execute",
     "name": "printContext",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vf-unassign.log' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 413.53592681884766,
-    "y": 1625.226125717163,
-    "z": "e707a2eb.031dc",
+    "x": 378.7739944458008,
+    "y": 1376.5357284545898,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       []
     ]
   },
   {
-    "id": "669839ba.56b488",
+    "id": "9ba3908c.b3993",
     "type": "set",
     "name": "set ss.capability.execution-order[]",
-    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[1]' value='eipam-ip-assign' />\n<parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[5]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[6]' value='generate-name' />\n<parameter name='ss.capability.execution-order_length' value='7' />",
+    "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[1]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[2]' value='eipam-ip-assign' />\n<parameter
+name='ss.capability.execution-order[3]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[4]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[8]' value='generate-name' />\n<parameter name='ss.capability.execution-order_length' value='9' />",
     "comments": "",
-    "x": 434.25003814697266,
-    "y": 160.50000381469727,
-    "z": "e707a2eb.031dc",
+    "x": 455.9166946411133,
+    "y": 163,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "ecc91ea3.fdc65",
+    "id": "9e65963.9a3dd68",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Encountered error from capability: '+ $ss.capability-dg + ', with error: '+ $error-message`\" />\n",
     "comments": "",
-    "x": 1533.75,
-    "y": 1115.5,
-    "z": "e707a2eb.031dc",
+    "x": 1555.4166564941406,
+    "y": 1117.9999961853027,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "b3347c0d.511cc",
+    "id": "a1d1bb97.069c18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1315.3691329956055,
-    "y": 760.8329677581787,
-    "z": "e707a2eb.031dc",
+    "x": 1337.035789489746,
+    "y": 763.3329639434814,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "ecc91ea3.fdc65",
-        "f80cfa5f.ec5538",
-        "f9478e50.da1ab",
-        "b33b6f0d.9741b",
-        "a62aae18.246a5",
-        "9cf116cc.5d7c88"
+        "9e65963.9a3dd68",
+        "4247535f.a8b05c",
+        "fbdfcf9e.431bd",
+        "28c4a99d.6f10c6",
+        "b86c7b66.596838",
+        "ac551aca.87f3c8"
       ]
     ]
   },
   {
-    "id": "f80cfa5f.ec5538",
+    "id": "4247535f.a8b05c",
     "type": "execute",
     "name": "execute RestApiCallNode - PUT vf-module",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vfmodule.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vfmodule-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='PUT' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-ss-vfmodule\" />\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1630.9165725708008,
-    "y": 1017.2069272994995,
-    "z": "e707a2eb.031dc",
+    "x": 1652.5832290649414,
+    "y": 1019.7069234848022,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "5a81dded.44b2c4",
-        "2b7e4172.d9466e",
-        "9c94c0a8.8a6b6"
+        "fa9ef1c0.afa1e",
+        "45457ce5.ba3554"
       ]
     ]
   },
   {
-    "id": "5a81dded.44b2c4",
+    "id": "fa9ef1c0.afa1e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1905.510238647461,
-    "y": 1071.205080986023,
-    "z": "e707a2eb.031dc",
+    "x": 1927.1768951416016,
+    "y": 1073.7050771713257,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "144bf243.c5cf4e"
+        "56d2d025.0c556"
       ]
     ]
   },
   {
-    "id": "2b7e4172.d9466e",
+    "id": "45457ce5.ba3554",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1897.9388732910156,
-    "y": 1017.7051010131836,
-    "z": "e707a2eb.031dc",
+    "x": 1919.6055297851562,
+    "y": 1020.2050971984863,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "144bf243.c5cf4e"
+        "56d2d025.0c556"
       ]
     ]
   },
   {
-    "id": "9c94c0a8.8a6b6",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1901.688865661621,
-    "y": 964.062198638916,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "9b806219.d57b1"
-      ]
-    ]
-  },
-  {
-    "id": "9b806219.d57b1",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2078.059097290039,
-    "y": 963.9686799049377,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "144bf243.c5cf4e",
+    "id": "56d2d025.0c556",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2100.0711975097656,
-    "y": 1017.3493556976318,
-    "z": "e707a2eb.031dc",
+    "x": 2121.7378540039062,
+    "y": 1019.8493518829346,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "a8a3bda2.3a4e7"
+        "726d654.997219c"
       ]
     ]
   },
   {
-    "id": "a8a3bda2.3a4e7",
+    "id": "726d654.997219c",
     "type": "configure",
     "name": "set error-message",
     "xml": "<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vf-module assignments during unassign in MD-SAL\" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 2318.356964111328,
-    "y": 1017.4922189712524,
-    "z": "e707a2eb.031dc",
+    "x": 2340.0236206054688,
+    "y": 1019.9922151565552,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       []
     ]
   },
   {
-    "id": "f9478e50.da1ab",
+    "id": "fbdfcf9e.431bd",
     "type": "set",
     "name": "set vf data for restapi-call-node",
     "xml": "<set>\n<parameter name='vf.vf-module-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`' />\n<parameter name='vf.vf-module-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.sdnc-request-header.`' />\n<parameter name='vf.vf-module-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.request-information.`' />\n<parameter name='vf.vf-module-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.`' />\n<parameter name='vf.vf-module-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.`' />\n<parameter name='vf.vf-module-data.vf-module-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-information.`' />\n<parameter name='vf.vf-module-data.vf-module-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.`' />\n<parameter name='vf.vf-module-data.vf-module-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-level-oper-status.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-input-parameters.`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.request-version`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.vf-module-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.vf-module-name`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.tenant`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-cloud-region`' />\n<parameter name='vf.vf-module-data.vf-module-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-request-input.aic-clli`' />",
     "comments": "",
-    "x": 1592.428596496582,
-    "y": 761.3249444961548,
-    "z": "e707a2eb.031dc",
+    "x": 1614.0952529907227,
+    "y": 763.8249406814575,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "b33b6f0d.9741b",
+    "id": "28c4a99d.6f10c6",
     "type": "execute",
     "name": "generate ss-vfmodule url replace service-instance-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$prop.restapi.ss-vfmodule-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.service-information.service-instance-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1658.6785430908203,
-    "y": 809.3249893188477,
-    "z": "e707a2eb.031dc",
+    "x": 1680.345199584961,
+    "y": 811.8249855041504,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       []
     ]
   },
   {
-    "id": "a62aae18.246a5",
+    "id": "b86c7b66.596838",
     "type": "execute",
     "name": "generate ss-vfmodule url - replace vnf-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vnf-information.vnf-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1622.964241027832,
-    "y": 857.3839063644409,
-    "z": "e707a2eb.031dc",
+    "x": 1644.6308975219727,
+    "y": 859.8839025497437,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       []
     ]
   },
   {
-    "id": "9cf116cc.5d7c88",
+    "id": "ac551aca.87f3c8",
     "type": "execute",
     "name": "generate ss-vfmodule url - replace vf-module-id",
     "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vfmodule-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vfmodule-url\"/>\n    <parameter name=\"target\" value=\"{vf-module-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1644.904914855957,
-    "y": 907.3004064559937,
-    "z": "e707a2eb.031dc",
+    "x": 1666.5715713500977,
+    "y": 909.8004026412964,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       []
     ]
   },
   {
-    "id": "4b0a760.f121c8c",
+    "id": "9c2ed3b1.7a9c5",
     "type": "set",
     "name": "set ss.capability-type = vf-module",
     "xml": "<set>\n<parameter name='ss.capability-type' value='vf-module' />\n",
     "comments": "",
-    "x": 434.8571319580078,
-    "y": 203.50001049041748,
-    "z": "e707a2eb.031dc",
-    "wires": []
-  },
-  {
-    "id": "e01eeb11.ffdd28",
-    "type": "success",
-    "name": "success",
-    "xml": "<outcome value='success'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 1153.75,
-    "y": 711.25,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "70f15cdb.b52454"
-      ]
-    ]
-  },
-  {
-    "id": "70f15cdb.b52454",
-    "type": "set",
-    "name": "set capability-dg to UNASSIGNED",
-    "xml": "<set>\n<parameter name='`$ss.capability-dg`' value='UNASSIGNED' />\n",
-    "comments": "",
-    "x": 1379.499984741211,
-    "y": 710.9999723434448,
-    "z": "e707a2eb.031dc",
+    "x": 456.52378845214844,
+    "y": 206.00000667572021,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "6f51aecc.4c371",
+    "id": "6d9494a.3f2206c",
     "type": "other",
     "name": "DELETED",
     "xml": "<outcome value='DELETED'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 760,
-    "y": 857.1428833007812,
-    "z": "e707a2eb.031dc",
+    "x": 781.6666564941406,
+    "y": 859.642879486084,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "31a0085.606c5f8"
+        "d7a7bd94.ef4ff"
       ]
     ]
   },
   {
-    "id": "383dc66d.17f72a",
+    "id": "c4930fe.fd50af",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to unassign self-serve vf-module assignments because the status for ' + $ss.capability-name + ' is '  + $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`\"/>",
     "comments": "",
-    "x": 1110.7380447387695,
-    "y": 1024.6905918121338,
-    "z": "e707a2eb.031dc",
+    "x": 1132.4047012329102,
+    "y": 1027.1905879974365,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "31a0085.606c5f8",
+    "id": "d7a7bd94.ef4ff",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 916.4999923706055,
-    "y": 857.1428718566895,
-    "z": "e707a2eb.031dc",
+    "x": 938.1666488647461,
+    "y": 859.6428680419922,
+    "z": "6680f8ca.ebffb8",
     "wires": [
-      [
-        "df136536.ec6fa8",
-        "296bd731.42cef8"
-      ]
+      []
     ]
   },
   {
-    "id": "81b87eaf.eec99",
+    "id": "862297c.bf59968",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 750.0713958740234,
-    "y": 989.3571853637695,
-    "z": "e707a2eb.031dc",
+    "x": 771.7380523681641,
+    "y": 991.8571815490723,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "74d32650.e89458"
+        "4834af54.75b2c"
       ]
     ]
   },
   {
-    "id": "df136536.ec6fa8",
+    "id": "ffba3e5c.b7c54",
     "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=\"`'SS: resource-resolution-data.status: ' + $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<parameter name=\"field2\" value=\"`'SS: ss.capability-name: ' + $ss.capability-name`\"/>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1090.3572616577148,
-    "y": 948.6905670166016,
-    "z": "e707a2eb.031dc",
+    "x": 1112.0239181518555,
+    "y": 951.1905632019043,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       []
     ]
   },
   {
-    "id": "74d32650.e89458",
+    "id": "4834af54.75b2c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 917.7856903076172,
-    "y": 989.3572368621826,
-    "z": "e707a2eb.031dc",
+    "x": 939.4523468017578,
+    "y": 991.8572330474854,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "df136536.ec6fa8",
-        "383dc66d.17f72a"
+        "ffba3e5c.b7c54",
+        "c4930fe.fd50af"
       ]
     ]
   },
   {
-    "id": "1f5f6357.bb701d",
+    "id": "d21e6f1d.1016c",
     "type": "for",
     "name": "foreach vf-module-parameters.param[]",
     "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`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 733.9999732971191,
-    "y": 511.4285945892334,
-    "z": "e707a2eb.031dc",
+    "x": 765.6665954589844,
+    "y": 395.5952453613281,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "842a7679.474c78",
-        "ff70ed31.3b468"
+        "36153975.73d276",
+        "2926b6d0.39b40a"
       ]
     ]
   },
   {
-    "id": "842a7679.474c78",
+    "id": "36153975.73d276",
     "type": "switchNode",
     "name": "switch capability-name param vs. execution",
     "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1106.3927955627441,
-    "y": 557.0713872909546,
-    "z": "e707a2eb.031dc",
+    "x": 1138.0594177246094,
+    "y": 441.2380380630493,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "e83762f2.ee222"
+        "b81d1a56.666918"
       ]
     ]
   },
   {
-    "id": "e83762f2.ee222",
+    "id": "b81d1a56.666918",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1369.8927955627441,
-    "y": 557.3213872909546,
-    "z": "e707a2eb.031dc",
+    "x": 1401.5594177246094,
+    "y": 441.4880380630493,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "88e4ca0d.4b82e8"
+        "8fa17821.c8c998"
       ]
     ]
   },
   {
-    "id": "ff70ed31.3b468",
+    "id": "2926b6d0.39b40a",
     "type": "set",
     "name": "tmp.param.capability-name",
     "xml": "<set>\n<parameter name='tmp.param.capability-name' 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.capability-name`' />\n",
     "comments": "",
-    "x": 1055.7498207092285,
-    "y": 511.67859745025635,
-    "z": "e707a2eb.031dc",
+    "x": 1087.4164428710938,
+    "y": 395.8452482223511,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "1b981df9.eea952",
+    "id": "4adf8877.8b7b48",
     "type": "for",
-    "name": "for i in vnf-parameters-data.param[]",
-    "xml": "<for index='i' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+    "name": "for each vf module",
+    "xml": "<for index='idx' start='`$vf-module-index + 1`' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1211.8215026855469,
-    "y": 1353.5238590240479,
-    "z": "e707a2eb.031dc",
+    "x": 1000.8887634277344,
+    "y": 1207.142822265625,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "2955f79d.d9f148"
+        "794c2919.51d0e8"
       ]
     ]
   },
   {
-    "id": "2955f79d.d9f148",
-    "type": "switchNode",
-    "name": "switch param[$i].name",
-    "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$i].name`'>\n",
+    "id": "70cab900.ea1ee8",
+    "type": "comment",
+    "name": "Remove VF Module from service data",
+    "info": "",
     "comments": "",
-    "outputs": 1,
-    "x": 1490.5715026855469,
-    "y": 1354.0238304138184,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "21118528.d17aba"
-      ]
-    ]
+    "x": 350.7142639160156,
+    "y": 1162.3812627792358,
+    "z": "6680f8ca.ebffb8",
+    "wires": []
   },
   {
-    "id": "5b3c9b0.4a95764",
-    "type": "save",
-    "name": "DELETE VNFC object",
-    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vnfc\" \n\t\tkey=\"vnfc.vnfc-name = $tmp.ss.vnfc-name\" >",
+    "id": "794c2919.51d0e8",
+    "type": "set",
+    "name": "move vf module to remove one",
+    "xml": "<set>\n\t<parameter name=\"tmpidx\" value=\"`$idx - 1`\"/>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmpidx].\" value=\"$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].\" />\n\t\n",
     "comments": "",
-    "outputs": 1,
-    "x": 2052.3216857910156,
-    "y": 1412.4880809783936,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "8f720052.82f16",
-        "c7b9a17c.70b3a"
-      ]
-    ]
+    "x": 1244.4798965454102,
+    "y": 1207.1667881011963,
+    "z": "6680f8ca.ebffb8",
+    "wires": []
   },
   {
-    "id": "3da72337.12504c",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic='true'>",
-    "atomic": "true",
+    "id": "65e92b38.4daee4",
+    "type": "switchNode",
+    "name": "switch vf-module_length",
+    "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 948.6785659790039,
-    "y": 1353.0116090774536,
-    "z": "e707a2eb.031dc",
+    "x": 418.1466827392578,
+    "y": 1218.4844932556152,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "1b981df9.eea952"
+        "586a0bd3.b18144",
+        "bc68084b.283918"
       ]
     ]
   },
   {
-    "id": "8f720052.82f16",
-    "type": "failure",
-    "name": "failure",
-    "xml": "<outcome value='failure'>\n",
+    "id": "586a0bd3.b18144",
+    "type": "outcome",
+    "name": "1",
+    "xml": "<outcome value='1'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2264.0716705322266,
-    "y": 1412.9880504608154,
-    "z": "e707a2eb.031dc",
+    "x": 613.4800491333008,
+    "y": 1169.389100074768,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "19415073.afd87"
+        "ed8959f0.36d8a8"
       ]
     ]
   },
   {
-    "id": "19415073.afd87",
+    "id": "ed8959f0.36d8a8",
     "type": "set",
-    "name": "set error-message",
-    "xml": "<set>\n<parameter name='error-message' value='Failed to delete vnfc object in AnAI' />\n",
+    "name": "Remove vf modules",
+    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.\" value=\"\"/>\n\n",
     "comments": "",
-    "x": 2454.0716705322266,
-    "y": 1412.7380504608154,
-    "z": "e707a2eb.031dc",
+    "x": 785.4798202514648,
+    "y": 1169.3892192840576,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "c7b9a17c.70b3a",
-    "type": "not-found",
-    "name": "not-found",
-    "xml": "<outcome value='not-found'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 2270.3216819763184,
-    "y": 1464.7380847930908,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "920b3ae7.9a1678"
-      ]
-    ]
-  },
-  {
-    "id": "21118528.d17aba",
+    "id": "bc68084b.283918",
     "type": "other",
-    "name": "vnfc-name",
-    "xml": "<outcome value='vnfc-name'>\n<!--\n<outcome value='vmxvre_name_0'>\n-->\n",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1695.1072311401367,
-    "y": 1354.5238122940063,
-    "z": "e707a2eb.031dc",
+    "x": 612.1468048095703,
+    "y": 1263.1509094238281,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "a6da92f.e11037"
+        "caf3c8d0.bea748"
       ]
     ]
   },
   {
-    "id": "e5273bc6.236098",
-    "type": "break",
-    "name": "break",
-    "xml": "<break>\n",
+    "id": "7578e2bc.143aac",
+    "type": "set",
+    "name": "set new vf module length",
+    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value=\"`$lastidx`\"/>\n\n\t\n",
     "comments": "",
-    "x": 2006.8215789794922,
-    "y": 1496.9524536132812,
-    "z": "e707a2eb.031dc",
+    "x": 1019.7762985229492,
+    "y": 1334.8652992248535,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "a6da92f.e11037",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 1836.8215522766113,
-    "y": 1354.0953855514526,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "ebb79471.77e198",
-        "e5273bc6.236098",
-        "5b3c9b0.4a95764"
-      ]
-    ]
-  },
-  {
-    "id": "ebb79471.77e198",
+    "id": "d8df61bf.20743",
     "type": "set",
-    "name": "set tmp.ss.vnfc-name",
-    "xml": "<set>\n<parameter name='tmp.ss.vnfc-name' 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[$i].value`' />\n",
+    "name": "Remove the last vf module in the list",
+    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lastidx].\" value=\"\"/>\n",
     "comments": "",
-    "x": 2047.9643249511719,
-    "y": 1354.0953922271729,
-    "z": "e707a2eb.031dc",
+    "x": 1055.4799118041992,
+    "y": 1290.9764366149902,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   },
   {
-    "id": "bd7013b7.21885",
-    "type": "switchNode",
-    "name": "switch self-serve-generate-name  == UNASSIGNED",
-    "xml": "<switch test=\"`$self-serve-generate-name == 'UNASSIGNED'`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 518.5713958740234,
-    "y": 1205.3806629180908,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "60911edd.fbec9",
-        "dbc995c8.389a48"
-      ]
-    ]
-  },
-  {
-    "id": "60911edd.fbec9",
-    "type": "success",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 823.4999198913574,
-    "y": 1255.5235767364502,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "3da72337.12504c"
-      ]
-    ]
-  },
-  {
-    "id": "dbc995c8.389a48",
-    "type": "outcomeFalse",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 821.6071472167969,
-    "y": 1205.3450736999512,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      [
-        "2732c8d4.650e48"
-      ]
-    ]
-  },
-  {
-    "id": "76c0b009.2d7e4",
-    "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=\"`'SS: self-serve-generate-name status: ' + $self-serve-generate-name`\"/>\n<parameter name=\"field2\" value=\"`'SS: self-serve-unresolved-composite-data: ' + $self-serve-unresolved-composite-data`\"/>",
-    "comments": "",
-    "outputs": 1,
-    "x": 1171.0357284545898,
-    "y": 1205.3452463150024,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "2732c8d4.650e48",
+    "id": "caf3c8d0.bea748",
     "type": "block",
     "name": "block : atomic",
-    "xml": "<block atomic='true'>",
+    "xml": "<block atomic=\"true\">",
     "atomic": "true",
-    "comments": "",
     "outputs": 1,
-    "x": 987.4642715454102,
-    "y": 1205.3451922280447,
-    "z": "e707a2eb.031dc",
+    "x": 769.3847351074219,
+    "y": 1263.3889112472534,
+    "z": "6680f8ca.ebffb8",
     "wires": [
       [
-        "76c0b009.2d7e4",
-        "f27b027f.fa36"
+        "4adf8877.8b7b48",
+        "d8df61bf.20743",
+        "7578e2bc.143aac",
+        "c6fed918.aacf78"
       ]
     ]
   },
   {
-    "id": "f27b027f.fa36",
-    "type": "returnFailure",
-    "name": "return failure",
-    "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'AAI Put is being skipped because NOT all capability components have SUCCESS status; '+ $error-message`\" />\n",
-    "comments": "",
-    "x": 1192.321418762207,
-    "y": 1248.7737998962402,
-    "z": "e707a2eb.031dc",
-    "wires": []
-  },
-  {
-    "id": "920b3ae7.9a1678",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
-    "comments": "",
-    "outputs": 1,
-    "x": 2423.333251953125,
-    "y": 1464.333251953125,
-    "z": "e707a2eb.031dc",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "296bd731.42cef8",
+    "id": "c6fed918.aacf78",
     "type": "set",
-    "name": "set capability-dg to UNASSIGNED",
-    "xml": "<set>\n<parameter name='`$ss.capability-dg`' value='UNASSIGNED' />\n",
-    "comments": "",
-    "x": 1171.3333129882812,
-    "y": 857.333263669695,
-    "z": "e707a2eb.031dc",
+    "name": "set lastidx",
+    "xml": "<set>\n<parameter name='lastidx' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length - 1`' />\n",
+    "comments": "EIPAM plug-in needs this attribute set with this name",
+    "x": 973.6190795898438,
+    "y": 1247.3811359405518,
+    "z": "6680f8ca.ebffb8",
     "wires": []
   }
-]
\ No newline at end of file
+]