X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_self-serve-vnf-unassign.json;h=6b5b87823fef812c457ef5c3157e769dcca035e9;hb=refs%2Fheads%2Fmaster;hp=a2645b3b988f837c7829021e8d612d2a0e3b9fb9;hpb=8c90e126ea0633cb78d50a7719406d165fa8b013;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json
index a2645b3b..6b5b8782 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-unassign.json
@@ -1,663 +1,570 @@
-[
-    {
-        "id": "62b65505.f8b4b4",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 89,
-        "y": 30,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "928d511f.36c158"
-            ]
-        ]
-    },
-    {
-        "id": "f87c0728.0afeb8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 132.72620391845703,
-        "y": 148.77779006958008,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "3b27abcc.c2ec34",
-                "bf1b89ba.b063e",
-                "1ddd3a42.29f04e",
-                "e5f0334a.e9ca1",
-                "2163e816.27402"
-            ]
-        ]
-    },
-    {
-        "id": "2406fa8b.d43ed6",
-        "type": "method",
-        "name": "method self-serve-vnf-unassign",
-        "xml": "<method rpc='self-serve-vnf-unassign' mode='sync'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 205.76190948486328,
-        "y": 84.70635509490967,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "f87c0728.0afeb8"
-            ]
-        ]
-    },
-    {
-        "id": "928d511f.36c158",
-        "type": "service-logic",
-        "name": "GENERIC-RESOURCE-API ${project.version}",
-        "module": "GENERIC-RESOURCE-API",
-        "version": "${project.version}",
-        "comments": "",
-        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
-        "outputs": 1,
-        "x": 364.23819732666016,
-        "y": 30.190492630004883,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "2406fa8b.d43ed6"
-            ]
-        ]
-    },
-    {
-        "id": "2869f38e.95f41c",
-        "type": "for",
-        "name": "foreach vnf-parameters-data.param[]",
-        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 721.4645538330078,
-        "y": 374.70241928100586,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "acaba079.b68f38",
-                "81ad392.f64cec8"
-            ]
-        ]
-    },
-    {
-        "id": "6b50d8c3.1dbdd",
-        "type": "switchNode",
-        "name": "switch resource-resolution-data.status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 458.17897033691406,
-        "y": 771.50013256073,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "4641618f.395528",
-                "38e2fce4.feed74",
-                "fa07b3ee.3e2bd"
-            ]
-        ]
-    },
-    {
-        "id": "4641618f.395528",
-        "type": "other",
-        "name": "SUCCESS",
-        "xml": "<outcome value='SUCCESS'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 733.5719718933105,
-        "y": 772.2143878936768,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "d99a0768.8b7718"
-            ]
-        ]
-    },
-    {
-        "id": "3b27abcc.c2ec34",
-        "type": "for",
-        "name": "foreach capability-order[]",
-        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 387.0357894897461,
-        "y": 229.89282417297363,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "25e2075a.6d1a6",
-                "96711265.1987a",
-                "2869f38e.95f41c",
-                "8523e1fb.bcf3a8"
-            ]
-        ]
-    },
-    {
-        "id": "acaba079.b68f38",
-        "type": "switchNode",
-        "name": "switch param capability-name == execution",
-        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1077.3574676513672,
-        "y": 418.4285488128662,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "468c9926.a05e6"
-            ]
-        ]
-    },
-    {
-        "id": "468c9926.a05e6",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1340.8574676513672,
-        "y": 418.6785488128662,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "6b50d8c3.1dbdd"
-            ]
-        ]
-    },
-    {
-        "id": "d99a0768.8b7718",
-        "type": "call",
-        "name": "call ss.capability-dg",
-        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 938.6907043457031,
-        "y": 771.9762392044067,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "458b24e4.d3efa4"
-            ]
-        ]
-    },
-    {
-        "id": "25e2075a.6d1a6",
-        "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-->\n",
-        "comments": "",
-        "x": 667.3928451538086,
-        "y": 229.84527587890625,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "81ad392.f64cec8",
-        "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.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
-        "comments": "",
-        "x": 1026.7144927978516,
-        "y": 373.03575897216797,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "96711265.1987a",
-        "type": "set",
-        "name": "set ss.capability.action = unassign",
-        "xml": "<set>\n<parameter name='ss.capability-action' value='unassign' />\n",
-        "comments": "",
-        "x": 714.1069869995117,
-        "y": 276.7618598937988,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "458b24e4.d3efa4",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1123.5832138061523,
-        "y": 771.976300239563,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "6583acac.b53fac"
-            ]
-        ]
-    },
-    {
-        "id": "8523e1fb.bcf3a8",
-        "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": 658.5356750488281,
-        "y": 325.6547737121582,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "d5c58631.876b",
-        "type": "execute",
-        "name": "generate ss-vnf 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-vnf-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1606.4405975341797,
-        "y": 825.8580255508423,
-        "z": "252d9282.9374ae",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5291091f.f20088",
-        "type": "execute",
-        "name": "execute RestApiCallNode - PUT vnf",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-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-vnf\" />\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1575.9048919677734,
-        "y": 928.7152471542358,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "2353e7c1.60c118",
-                "3fc02d49.7486d2"
-            ]
-        ]
-    },
-    {
-        "id": "2353e7c1.60c118",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1850.4985580444336,
-        "y": 982.7134008407593,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "bda099a1.06eb38"
-            ]
-        ]
-    },
-    {
-        "id": "3fc02d49.7486d2",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1842.9271926879883,
-        "y": 929.2134208679199,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "bda099a1.06eb38"
-            ]
-        ]
-    },
-    {
-        "id": "bda099a1.06eb38",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2045.0595169067383,
-        "y": 928.8576755523682,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "d9c8574d.b3fa68"
-            ]
-        ]
-    },
-    {
-        "id": "d9c8574d.b3fa68",
-        "type": "configure",
-        "name": "set error-message",
-        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error persisting self-serve vnf assignments in MD-SAL during unassign\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2263.345283508301,
-        "y": 929.0005388259888,
-        "z": "252d9282.9374ae",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4bfafa2c.df4c8c",
-        "type": "set",
-        "name": "set vf data for restapi-call-node",
-        "xml": "<set>\n<parameter name='vf.vnf-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />\n<parameter name='vf.vnf-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />\n<parameter name='vf.vnf-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />\n<parameter name='vf.vnf-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />\n<parameter name='vf.vnf-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />\n<parameter name='vf.vnf-data.vnf-request-input.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='vf.vnf-data.vnf-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />\n<parameter name='vf.vnf-data.vnf-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />",
-        "comments": "",
-        "x": 1558.8928985595703,
-        "y": 771.9525375366211,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "9abc0123.468d9",
-        "type": "execute",
-        "name": "generate ss-vnf url - replace vnf-id",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vnf-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-id`\"/>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1570.726303100586,
-        "y": 876.6667938232422,
-        "z": "252d9282.9374ae",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6583acac.b53fac",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1284.535888671875,
-        "y": 771.7144117355347,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "d5c58631.876b",
-                "5291091f.f20088",
-                "4bfafa2c.df4c8c",
-                "9abc0123.468d9",
-                "e212b878.28b838"
-            ]
-        ]
-    },
-    {
-        "id": "e212b878.28b838",
-        "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 vnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`\" />\n",
-        "comments": "",
-        "x": 1505.4408569335938,
-        "y": 1056.488195180893,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "e5f0334a.e9ca1",
-        "type": "execute",
-        "name": "printContext",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnf-assign.log' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 348.1193313598633,
-        "y": 1426.0595903396606,
-        "z": "252d9282.9374ae",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "bf1b89ba.b063e",
-        "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='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": 412.25003814697266,
-        "y": 149.00000381469727,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "38e2fce4.feed74",
-        "type": "other",
-        "name": "DELETED",
-        "xml": "<outcome value='DELETED'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 734.0714416503906,
-        "y": 838.7499847412109,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "d6fe1639.ceebb8"
-            ]
-        ]
-    },
-    {
-        "id": "1ddd3a42.29f04e",
-        "type": "set",
-        "name": "set ss.capability-type = vnf",
-        "xml": "<set>\n<parameter name='ss.capability-type' value='vnf' />\n",
-        "comments": "",
-        "x": 391.85713958740234,
-        "y": 188.5714340209961,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "52dbf114.d1abc",
-        "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 vnf assignments because the status for ' + $ss.capability-name + ' is '  + $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`\"/>",
-        "comments": "",
-        "x": 1116.1428833007812,
-        "y": 948.9643857138499,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "d6fe1639.ceebb8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 890.5714340209961,
-        "y": 838.7499732971191,
-        "z": "252d9282.9374ae",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "fa07b3ee.3e2bd",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 725.1428375244141,
-        "y": 896.9642868041992,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "dc8bc4e.8f580b8"
-            ]
-        ]
-    },
-    {
-        "id": "b045a5.6f842258",
-        "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.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`\"/>\n<parameter name=\"field2\" value=\"`'SS: ss.capability-name: ' + $ss.capability-name`\"/>",
-        "comments": "",
-        "outputs": 1,
-        "x": 1095.4285888671875,
-        "y": 896.9643923895701,
-        "z": "252d9282.9374ae",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dc8bc4e.8f580b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 911.8571319580078,
-        "y": 896.9643383026123,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "b045a5.6f842258",
-                "52dbf114.d1abc"
-            ]
-        ]
-    },
-    {
-        "id": "1de371de.5b6456",
-        "type": "for",
-        "name": "for each vnf",
-        "xml": "<for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 915.6666145324707,
-        "y": 1255.9525175094604,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "a5b6b8ba.4ebf4"
-            ]
-        ]
-    },
-    {
-        "id": "a90545d8.1a2728",
-        "type": "comment",
-        "name": "Remove VNF from service data",
-        "info": "",
-        "comments": "",
-        "x": 327.825382232666,
-        "y": 1214.524169921875,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "a5b6b8ba.4ebf4",
-        "type": "set",
-        "name": "move vnf to remove one",
-        "xml": "<set>\n\t<parameter name=\"$tmpidx\" value=\"`$idx - 1`\"/>\n\t<parameter name=\"service-data.vnfs.vnf[$tmpidx].\" value=\"$service-data.vnfs.vnf[$idx].\" />\n\t\n",
-        "comments": "",
-        "x": 1149.2577476501465,
-        "y": 1254.976469039917,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "2163e816.27402",
-        "type": "switchNode",
-        "name": "switch vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 371.92447662353516,
-        "y": 1257.5321464538574,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "db4581e7.f5001",
-                "4742a047.92dc2"
-            ]
-        ]
-    },
-    {
-        "id": "db4581e7.f5001",
-        "type": "outcome",
-        "name": "1",
-        "xml": "<outcome value='1'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 548.9245185852051,
-        "y": 1218.198733329773,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "d699690.c208a18"
-            ]
-        ]
-    },
-    {
-        "id": "d699690.c208a18",
-        "type": "set",
-        "name": "Remove vnfs",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.\" value=\"\"/>\n\n",
-        "comments": "",
-        "x": 712.5910148620605,
-        "y": 1218.1988325119019,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "4742a047.92dc2",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 550.4484100341797,
-        "y": 1301.6748723983765,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "f5197751.96d6b8"
-            ]
-        ]
-    },
-    {
-        "id": "8416ad4e.28c64",
-        "type": "set",
-        "name": "set new vnf length",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value=\"`$service-data.vnfs.vnf_length - 1`\"/>\n\n\t\n",
-        "comments": "",
-        "x": 935.220703125,
-        "y": 1346.532091140747,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "225e71ff.ef5996",
-        "type": "set",
-        "name": "Remove the last vnf in the list",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1].\" value=\"\"/>\n\n",
-        "comments": "",
-        "x": 970.9243583679199,
-        "y": 1301.6431121826172,
-        "z": "252d9282.9374ae",
-        "wires": []
-    },
-    {
-        "id": "f5197751.96d6b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 716.2577514648438,
-        "y": 1302.1986532211304,
-        "z": "252d9282.9374ae",
-        "wires": [
-            [
-                "1de371de.5b6456",
-                "225e71ff.ef5996",
-                "8416ad4e.28c64"
-            ]
-        ]
-    }
+[
+    {
+        "id": "c5b593f.de0997",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 161.42857360839844,
+        "y": 48.57143020629883,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "61eab8c6.809638"
+            ]
+        ]
+    },
+    {
+        "id": "476ba12e.72d0b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 205.15477752685547,
+        "y": 167.3492202758789,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "52ececda.9e0f84",
+                "716b81a4.0f5df",
+                "138a6bf3.2831e4",
+                "434ab0d7.7891",
+                "af88c68d.542008"
+            ]
+        ]
+    },
+    {
+        "id": "f111d369.224dc",
+        "type": "method",
+        "name": "method self-serve-vnf-unassign",
+        "xml": "<method rpc='self-serve-vnf-unassign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 278.1904830932617,
+        "y": 103.2777853012085,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "476ba12e.72d0b"
+            ]
+        ]
+    },
+    {
+        "id": "61eab8c6.809638",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "comments": "",
+        "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+        "outputs": 1,
+        "x": 436.6667709350586,
+        "y": 48.76192283630371,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "f111d369.224dc"
+            ]
+        ]
+    },
+    {
+        "id": "9b53fa35.2106f8",
+        "type": "for",
+        "name": "foreach vnf-parameters-data.param[]",
+        "xml": "<for index='pidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 788.1788864135742,
+        "y": 446.13098907470703,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "13b713a3.91f76c",
+                "eb9f0d00.5c804"
+            ]
+        ]
+    },
+    {
+        "id": "73638f7e.a5e31",
+        "type": "switchNode",
+        "name": "switch resource-resolution-data.status",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1087.2741775512695,
+        "y": 668.4048857688904,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "15033255.82a12e",
+                "beee7743.7ea5e8"
+            ]
+        ]
+    },
+    {
+        "id": "15033255.82a12e",
+        "type": "other",
+        "name": "SUCCESS",
+        "xml": "<outcome value='SUCCESS'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1362.667179107666,
+        "y": 669.1191411018372,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "2bd33584.bf077a"
+            ]
+        ]
+    },
+    {
+        "id": "52ececda.9e0f84",
+        "type": "for",
+        "name": "foreach capability-order[]",
+        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 453.7501220703125,
+        "y": 301.3213939666748,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "975deb30.c1c768",
+                "62184d5d.c851c4",
+                "9b53fa35.2106f8",
+                "1c990616.a2478a"
+            ]
+        ]
+    },
+    {
+        "id": "13b713a3.91f76c",
+        "type": "switchNode",
+        "name": "switch param capability-name == execution",
+        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1144.0718002319336,
+        "y": 489.8571186065674,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "9add8e.52bc827"
+            ]
+        ]
+    },
+    {
+        "id": "9add8e.52bc827",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1407.5718002319336,
+        "y": 490.1071186065674,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "31a0dcaa.e444d4"
+            ]
+        ]
+    },
+    {
+        "id": "2bd33584.bf077a",
+        "type": "call",
+        "name": "call ss.capability-dg",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1567.7859115600586,
+        "y": 668.8809924125671,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "77db13fe.aefb4c",
+                "9f0aca9e.506ad8"
+            ]
+        ]
+    },
+    {
+        "id": "975deb30.c1c768",
+        "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-->\n",
+        "comments": "",
+        "x": 734.107177734375,
+        "y": 301.2738456726074,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "eb9f0d00.5c804",
+        "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.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.capability-name`' />\n",
+        "comments": "",
+        "x": 1093.428825378418,
+        "y": 444.46432876586914,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "62184d5d.c851c4",
+        "type": "set",
+        "name": "set ss.capability.action = unassign",
+        "xml": "<set>\n<parameter name='ss.capability-action' value='unassign' />\n",
+        "comments": "",
+        "x": 780.8213195800781,
+        "y": 348.1904296875,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "77db13fe.aefb4c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1752.6784210205078,
+        "y": 668.8810534477234,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "54d35865.3f3408"
+            ]
+        ]
+    },
+    {
+        "id": "1c990616.a2478a",
+        "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": 725.2500076293945,
+        "y": 397.0833435058594,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "c5498b4d.da47d8",
+        "type": "execute",
+        "name": "generate ss-vnf 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-vnf-assignments`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{service-instance-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.service-instance-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2235.535804748535,
+        "y": 722.7627787590027,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c17c35b8.41b0c8",
+        "type": "execute",
+        "name": "execute RestApiCallNode - PUT vnf",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='templateFileName' value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ss.vnf.templatefile`\" />\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.ss-vnf-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-vnf\" />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2205.000099182129,
+        "y": 825.6200003623962,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "f2f91617.d6bf78",
+                "8fd41743.fdec58"
+            ]
+        ]
+    },
+    {
+        "id": "f2f91617.d6bf78",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2479.593765258789,
+        "y": 879.6181540489197,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "39855d48.9c0d72"
+            ]
+        ]
+    },
+    {
+        "id": "8fd41743.fdec58",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2472.0223999023438,
+        "y": 826.1181740760803,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "39855d48.9c0d72"
+            ]
+        ]
+    },
+    {
+        "id": "39855d48.9c0d72",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2674.1547241210938,
+        "y": 825.7624287605286,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "86aab38.e72235"
+            ]
+        ]
+    },
+    {
+        "id": "86aab38.e72235",
+        "type": "configure",
+        "name": "set error-message",
+        "xml": "<set>\n<parameter name=\"error-message\" value=\"Error persisting self-serve vnf assignments in MD-SAL during unassign\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2892.4404907226562,
+        "y": 825.9052920341492,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "662286b2.d6b178",
+        "type": "set",
+        "name": "set vf data for restapi-call-node",
+        "xml": "<set>\n<parameter name='vf.vnf-id'\n    value='`$service-data.vnfs.vnf[$vnf-index].vnf-id`' />\n<parameter name='vf.vnf-data.sdnc-request-header.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.`' />\n<parameter name='vf.vnf-data.request-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.`' />\n<parameter name='vf.vnf-data.service-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.`' />\n<parameter name='vf.vnf-data.vnf-information.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.`' />\n<parameter name='vf.vnf-data.vnf-request-input.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-input-parameters.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-input-parameters.`' />\n<parameter name='vf.vnf-data.vnf-topology.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.`' />\n<parameter name='vf.vnf-data.vnf-level-oper-status.'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.`' />",
+        "comments": "",
+        "x": 2187.988105773926,
+        "y": 668.8572907447815,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "4e2b6ad5.c5c984",
+        "type": "execute",
+        "name": "generate ss-vnf url - replace vnf-id",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='replace' >\n    <parameter name=\"source\" value=\"`$tmp.ss-vnf-url`\"/>\n    <parameter name=\"outputPath\" value=\"tmp.ss-vnf-url\"/>\n    <parameter name=\"target\" value=\"{vnf-id}\"/>\n    <parameter name=\"replacement\" value=\"`$service-data.vnfs.vnf[$vnf-index].vnf-id`\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2199.8215103149414,
+        "y": 773.5715470314026,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "54d35865.3f3408",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1913.6310958862305,
+        "y": 668.6191649436951,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "c5498b4d.da47d8",
+                "c17c35b8.41b0c8",
+                "662286b2.d6b178",
+                "4e2b6ad5.c5c984",
+                "25354232.f6ff7e"
+            ]
+        ]
+    },
+    {
+        "id": "25354232.f6ff7e",
+        "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 vnf assignments for ' + $ss.capability-dg + ' with error: ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 2134.536064147949,
+        "y": 953.3929483890533,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "434ab0d7.7891",
+        "type": "execute",
+        "name": "printContext",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n<parameter name='filename' value='/var/tmp/ss-vnf-unassign.log' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 401.97650146484375,
+        "y": 1207.4882717132568,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "716b81a4.0f5df",
+        "type": "set",
+        "name": "set ss.capability.execution-order[]",
+        "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[1]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[2]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[3]' value='eipam-ip-assignment' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='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": 484.6786117553711,
+        "y": 167.5714340209961,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "138a6bf3.2831e4",
+        "type": "set",
+        "name": "set ss.capability-type = vnf",
+        "xml": "<set>\n<parameter name='ss.capability-type' value='vnf' />\n",
+        "comments": "",
+        "x": 464.2857131958008,
+        "y": 207.14286422729492,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "beee7743.7ea5e8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1352.9880409240723,
+        "y": 736.3690609931946,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "c149b7eb.e0bad8"
+            ]
+        ]
+    },
+    {
+        "id": "c149b7eb.e0bad8",
+        "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.vnf-topology.vnf-parameters-data.param[$pidx].resource-resolution-data.status`\"/>\n<parameter name=\"field2\" value=\"`'SS: ss.capability-name: ' + $ss.capability-name`\"/>\n<parameter name=\"field3\" value=\"`'SS: tmp.param.capability-name: ' + $tmp.param.capability-name`\"/>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1501.0952224731445,
+        "y": 736.4047665596008,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "31a0dcaa.e444d4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 802.8571090698242,
+        "y": 668.5237793922424,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "a44b8cdb.fe5b2",
+                "73638f7e.a5e31"
+            ]
+        ]
+    },
+    {
+        "id": "a44b8cdb.fe5b2",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 981.2857513427734,
+        "y": 1101.0953178405762,
+        "z": "2e6e6d50.2c5192",
+        "wires": []
+    },
+    {
+        "id": "9f0aca9e.506ad8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1780.1786041259766,
+        "y": 854.8214416503906,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "88d0c6a.b2d2838"
+            ]
+        ]
+    },
+    {
+        "id": "88d0c6a.b2d2838",
+        "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=\"`'DONE: ' + $ss.capability-dg`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1923.9286041259766,
+        "y": 853.5714416503906,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "fbe1b133.89212",
+        "type": "execute",
+        "name": "execute PropertiesNode",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 873.4286477225169,
+        "y": 253.85714776175382,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "af88c68d.542008",
+        "type": "switchNode",
+        "name": "switch prop.controller.user",
+        "xml": "<switch test='`$prop.controller.user`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 462.14288330078125,
+        "y": 254.28576850891113,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "609ed85f.bc0518"
+            ]
+        ]
+    },
+    {
+        "id": "609ed85f.bc0518",
+        "type": "failure",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 661.9999787466868,
+        "y": 253.85718304770353,
+        "z": "2e6e6d50.2c5192",
+        "wires": [
+            [
+                "fbe1b133.89212"
+            ]
+        ]
+    }
 ]
\ No newline at end of file