Merge "Add netbox-ip-assign capability at vnf level"

Former-commit-id: 874475f0264d3271837e6f8bb6bf7512a83e1eaa

4 files changed, 1931 insertions, 15 deletions

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
index 25dcf918..e40d21be 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-assign.json
@@ -1 +1,1253 @@
-[{"id":"e979b2ce.e99fc","type":"dgstart","name":"DGSTART","outputs":1,"x":72.5,"y":33.75,"z":"8a7e5e63.38ace","wires":[["ad0b53dd.30d1f"]]},{"id":"9a9fd368.dccea","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":102.9761962890625,"y":156.0277862548828,"z":"8a7e5e63.38ace","wires":[["46a2b2bf.bd985c","e40ce25b.a46b4","f1a735bc.46ec68","338f391a.b76546","c60edef1.83244","58752160.8f2f","c602370a.7ee398","f2eb9a19.492128","7402f8af.8166a8"]]},{"id":"36c94e51.ac7b62","type":"method","name":"method self-serve-vnf-assign","xml":"<method rpc='self-serve-vnf-assign' mode='sync'>\n","comments":"","outputs":1,"x":189.26190948486328,"y":88.45635509490967,"z":"8a7e5e63.38ace","wires":[["9a9fd368.dccea"]]},{"id":"ad0b53dd.30d1f","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":347.73819732666016,"y":33.94049263000488,"z":"8a7e5e63.38ace","wires":[["36c94e51.ac7b62"]]},{"id":"e40ce25b.a46b4","type":"switchNode","name":"switch vnf-parameters-data.param_length","xml":"<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n","comments":"","outputs":1,"x":391.1786575317383,"y":1376.2620058059692,"z":"8a7e5e63.38ace","wires":[["56678c3c.918f34"]]},{"id":"56678c3c.918f34","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":653.1786880493164,"y":1376.2620058059692,"z":"8a7e5e63.38ace","wires":[["ef587707.052838"]]},{"id":"7880660a.b99988","type":"call","name":"call GENERIC-RESOURCE-API:self-serve-ra-assignment","xml":"<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-ra-assignment' mode='sync' >\n","comments":"","outputs":1,"x":1168.4643478393555,"y":1425.8334369659424,"z":"8a7e5e63.38ace","wires":[["359b210b.18df8e"]]},{"id":"8e6933e0.e2d82","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n","comments":"","x":1640.1785888671875,"y":1425.4048404693604,"z":"8a7e5e63.38ace","wires":[]},{"id":"b6eee0c6.fa3f9","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":616.3574600219727,"y":1743.7620840072632,"z":"8a7e5e63.38ace","wires":[["d5a18e29.fba98","89cf7849.12d878"]]},{"id":"46a2b2bf.bd985c","type":"set","name":"set ss.capability.execution-order[]","xml":"<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assign' />\n<parameter name='ss.capability.execution-order[6]' value='eipam-create-pool\"' />\n<parameter name='ss.capability.execution-order[7]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[8]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[10]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[11]' value='aai-vnf-put' />\n<parameter name='ss.capability.execution-order_length' value='12' />\n","comments":"","x":365.02384185791016,"y":1214.7501401901245,"z":"8a7e5e63.38ace","wires":[]},{"id":"f1a735bc.46ec68","type":"for","name":"foreach capability[]","xml":"<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n","comments":"","outputs":1,"x":320.4286880493164,"y":1483.8691005706787,"z":"8a7e5e63.38ace","wires":[["2287face.851d46","253d7cdf.e1c2d4","b6eee0c6.fa3f9","cef332f9.8255"]]},{"id":"89cf7849.12d878","type":"switchNode","name":"switch capability-name","xml":"<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n","comments":"","outputs":1,"x":920.7502822875977,"y":1789.4048767089844,"z":"8a7e5e63.38ace","wires":[["3ccce09d.0b123"]]},{"id":"3ccce09d.0b123","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1184.2502822875977,"y":1789.6548767089844,"z":"8a7e5e63.38ace","wires":[["420a949e.3280fc"]]},{"id":"359b210b.18df8e","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1486.0356941223145,"y":1425.2620306015015,"z":"8a7e5e63.38ace","wires":[["8e6933e0.e2d82"]]},{"id":"2287face.851d46","type":"set","name":"set ss.capability-name","xml":"<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n<!--\nss.capability.execution-order[]\n-->","comments":"","x":576.7857437133789,"y":1483.8215522766113,"z":"8a7e5e63.38ace","wires":[]},{"id":"d5a18e29.fba98","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":932.107307434082,"y":1744.0120868682861,"z":"8a7e5e63.38ace","wires":[]},{"id":"253d7cdf.e1c2d4","type":"set","name":"set ss.capability.action = assign","xml":"<set>\n<parameter name='ss.capability-action' value='assign' />\n","comments":"","x":605.499885559082,"y":1530.738136291504,"z":"8a7e5e63.38ace","wires":[]},{"id":"cef332f9.8255","type":"set","name":"set capability-dg with 'self-serve-' + capability-name","xml":"<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n","comments":"","x":668.0119781494141,"y":1584.2143802642822,"z":"8a7e5e63.38ace","wires":[]},{"id":"338f391a.b76546","type":"set","name":"set sdnc-generated-cloud-resources = true","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />\n","comments":"","x":393.9881362915039,"y":1268.5001487731934,"z":"8a7e5e63.38ace","wires":[]},{"id":"174083a3.4d324c","type":"block","name":"block","xml":"<block>","atomic":"false","comments":"","outputs":1,"x":650.428539276123,"y":549.2143030166626,"z":"8a7e5e63.38ace","wires":[["e662c249.6a2c4","9cfd2a9c.3fe9f8","3aa296df.78ceaa","3a6e2fc8.07043","f070b71.a554c48","f5b48997.d8b5d8","48ec3ac0.6b9294","788c1a7.a052ae4","edb9a97a.acfa98"]]},{"id":"e662c249.6a2c4","type":"set","name":"set vnf-topology data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n","comments":"","x":865.9284820556641,"y":550.273811340332,"z":"8a7e5e63.38ace","wires":[]},{"id":"d20a6007.88593","type":"set","name":"set vnf-parameters-data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n","comments":"","x":1059.4645767211914,"y":1376.1308345794678,"z":"8a7e5e63.38ace","wires":[]},{"id":"3aa296df.78ceaa","type":"set","name":"set vnf-level-oper-status to PendingCreate","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n","comments":"","x":931.2184371948242,"y":1124.254020690918,"z":"8a7e5e63.38ace","wires":[]},{"id":"9cfd2a9c.3fe9f8","type":"set","name":"copy input data","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' \n\tvalue='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' \n\tvalue='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' \n\tvalue='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' \n\tvalue='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' \n\tvalue='$vnf-topology-operation-input.vnf-request-input.' />\n","comments":"","x":848.5953521728516,"y":1074.0596599578857,"z":"8a7e5e63.38ace","wires":[]},{"id":"4348cdc3.255324","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n","comments":"","x":1262.9286727905273,"y":662.6310405731201,"z":"8a7e5e63.38ace","wires":[]},{"id":"3a6e2fc8.07043","type":"switchNode","name":"switch input model-invariant-uuid","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n","comments":"","outputs":1,"x":903.7857475280762,"y":685.4554843902588,"z":"8a7e5e63.38ace","wires":[["927dafb1.8438f","bbe3b5e.f1f7448"]]},{"id":"927dafb1.8438f","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1112.4524192810059,"y":662.5984477996826,"z":"8a7e5e63.38ace","wires":[["4348cdc3.255324"]]},{"id":"bbe3b5e.f1f7448","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1113.881015777588,"y":706.8840389251709,"z":"8a7e5e63.38ace","wires":[["2bc5b555.62d10a"]]},{"id":"2bc5b555.62d10a","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n","comments":"","x":1268.1667518615723,"y":706.3126111030579,"z":"8a7e5e63.38ace","wires":[]},{"id":"1339e1db.b46ede","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n","comments":"","x":1263.8809432983398,"y":751.169716835022,"z":"8a7e5e63.38ace","wires":[]},{"id":"f070b71.a554c48","type":"switchNode","name":"switch input model-uuid","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n","comments":"","outputs":1,"x":873.4047660827637,"y":773.9942216873169,"z":"8a7e5e63.38ace","wires":[["89d8f336.73fd8","9248202f.22337"]]},{"id":"89d8f336.73fd8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1113.4047393798828,"y":751.1371536254883,"z":"8a7e5e63.38ace","wires":[["1339e1db.b46ede"]]},{"id":"9248202f.22337","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1114.8333358764648,"y":795.4227447509766,"z":"8a7e5e63.38ace","wires":[["d721fa95.0723e8"]]},{"id":"d721fa95.0723e8","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n","comments":"","x":1269.1190719604492,"y":794.8513169288635,"z":"8a7e5e63.38ace","wires":[]},{"id":"bb1a0ad6.4e3e78","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n","comments":"","x":1261.0238761901855,"y":840.0269241333008,"z":"8a7e5e63.38ace","wires":[]},{"id":"f5b48997.d8b5d8","type":"switchNode","name":"switch input model-version","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n","comments":"","outputs":1,"x":884.5476379394531,"y":862.8513689041138,"z":"8a7e5e63.38ace","wires":[["b1acdece.bcc9c","c85877f4.161508"]]},{"id":"b1acdece.bcc9c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1110.547622680664,"y":839.9943313598633,"z":"8a7e5e63.38ace","wires":[["bb1a0ad6.4e3e78"]]},{"id":"c85877f4.161508","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1111.976219177246,"y":884.2799224853516,"z":"8a7e5e63.38ace","wires":[["58474882.b552b8"]]},{"id":"58474882.b552b8","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n","comments":"","x":1266.2619552612305,"y":883.7084946632385,"z":"8a7e5e63.38ace","wires":[]},{"id":"fd2dc0e1.63439","type":"set","name":"set from DB","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n","comments":"","x":1261.0238761901855,"y":927.1697463989258,"z":"8a7e5e63.38ace","wires":[]},{"id":"48ec3ac0.6b9294","type":"switchNode","name":"switch input model-name","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n","comments":"","outputs":1,"x":879.5476379394531,"y":949.9941911697388,"z":"8a7e5e63.38ace","wires":[["3d5ac1e6.b7948e","3f20406f.baebd"]]},{"id":"3d5ac1e6.b7948e","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1110.547622680664,"y":927.1371536254883,"z":"8a7e5e63.38ace","wires":[["fd2dc0e1.63439"]]},{"id":"3f20406f.baebd","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1111.976219177246,"y":971.4227447509766,"z":"8a7e5e63.38ace","wires":[["5a1a5651.f76428"]]},{"id":"5a1a5651.f76428","type":"set","name":"set from input","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n","comments":"","x":1266.2619552612305,"y":970.8513169288635,"z":"8a7e5e63.38ace","wires":[]},{"id":"788c1a7.a052ae4","type":"set","name":"set vnf-id","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n","comments":"","x":829.9047088623047,"y":601.7888488769531,"z":"8a7e5e63.38ace","wires":[]},{"id":"edb9a97a.acfa98","type":"set","name":"set model-customization-uuid","xml":"<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n","comments":"","x":892.3332252502441,"y":1022.8363952636719,"z":"8a7e5e63.38ace","wires":[]},{"id":"f2eb9a19.492128","type":"switchNode","name":"switch service-data.vnfs.vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":376.58329010009766,"y":236.17850017547607,"z":"8a7e5e63.38ace","wires":[["845220fd.30893","e7dd5883.b310d8","7d6220cf.97437"]]},{"id":"845220fd.30893","type":"other","name":"NULL","xml":"<outcome value=''>\n","comments":"","outputs":1,"x":618.7976760864258,"y":174.73793125152588,"z":"8a7e5e63.38ace","wires":[["b13684ac.3b5ec8"]]},{"id":"2eb2a0b4.7673","type":"set","name":"set vnf-index=0","xml":"<set>\n<parameter name='vnf-index' value='0' />\n","comments":"","x":954.083381652832,"y":174.23800563812256,"z":"8a7e5e63.38ace","wires":[]},{"id":"e7dd5883.b310d8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":619.976203918457,"y":296.357120513916,"z":"8a7e5e63.38ace","wires":[["85cecc5e.cffa9"]]},{"id":"420a949e.3280fc","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":455.51221084594727,"y":2046.2222986221313,"z":"8a7e5e63.38ace","wires":[["2f74e598.b4f05a","41b1f8f2.9db618"]]},{"id":"2f74e598.b4f05a","type":"other","name":"PENDING","xml":"<outcome value='PENDING'>\n","comments":"","outputs":1,"x":724.8694267272949,"y":2046.2222547531128,"z":"8a7e5e63.38ace","wires":[["de3056ea.cb97f8"]]},{"id":"41b1f8f2.9db618","type":"other","name":"FAILED","xml":"<outcome value='FAILED'>\n","comments":"","outputs":1,"x":718.4052429199219,"y":2097.1865854263306,"z":"8a7e5e63.38ace","wires":[["de3056ea.cb97f8"]]},{"id":"de3056ea.cb97f8","type":"call","name":"call ss.capability-dg","xml":"<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n","comments":"","outputs":1,"x":933.5239753723145,"y":2097.9484367370605,"z":"8a7e5e63.38ace","wires":[["eb5dc4dc.4296f8"]]},{"id":"583a2f89.5053d","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":1501.0714149475098,"y":2351.924892425537,"z":"8a7e5e63.38ace","wires":[]},{"id":"eb5dc4dc.4296f8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1118.4164848327637,"y":2097.948497772217,"z":"8a7e5e63.38ace","wires":[["4375345d.fcaa8c"]]},{"id":"4375345d.fcaa8c","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1281.690601348877,"y":2097.258038520813,"z":"8a7e5e63.38ace","wires":[["583a2f89.5053d","2c1be433.233fdc","57247a0a.65f024","e7a1b9e.50bf548","4712bf7c.c5565"]]},{"id":"57247a0a.65f024","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":1605.0236930847168,"y":2150.774598121643,"z":"8a7e5e63.38ace","wires":[[]]},{"id":"4712bf7c.c5565","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":1574.4879875183105,"y":2253.6318197250366,"z":"8a7e5e63.38ace","wires":[["513e18d8.e7d3b8","8a1cc506.26d608"]]},{"id":"513e18d8.e7d3b8","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1849.0816535949707,"y":2307.62997341156,"z":"8a7e5e63.38ace","wires":[["71982f5.9f351d"]]},{"id":"8a1cc506.26d608","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1841.5102882385254,"y":2254.1299934387207,"z":"8a7e5e63.38ace","wires":[["71982f5.9f351d"]]},{"id":"2c1be433.233fdc","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-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.`' />\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-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />\n<parameter name='vf.vnf-data.vnf-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />","comments":"","x":1557.4759941101074,"y":2096.869110107422,"z":"8a7e5e63.38ace","wires":[]},{"id":"e7a1b9e.50bf548","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":1569.309398651123,"y":2201.583366394043,"z":"8a7e5e63.38ace","wires":[[]]},{"id":"58752160.8f2f","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":320.85311126708984,"y":2546.099449157715,"z":"8a7e5e63.38ace","wires":[[]]},{"id":"c60edef1.83244","type":"set","name":"set ss.capability-type = vnf","xml":"<set>\n<parameter name='ss.capability-type' value='vnf' />\n","comments":"","x":344.89292907714844,"y":1319.2857942581177,"z":"8a7e5e63.38ace","wires":[]},{"id":"ef587707.052838","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":818.0356597900391,"y":1376.642903327942,"z":"8a7e5e63.38ace","wires":[["d20a6007.88593","7880660a.b99988"]]},{"id":"4503302f.14ead","type":"for","name":"for each existing VNF","xml":"<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n","comments":"","outputs":1,"x":967.0357284545898,"y":296.53579807281494,"z":"8a7e5e63.38ace","wires":[["716305cf.9234dc"]]},{"id":"716305cf.9234dc","type":"switchNode","name":"switch vnf-id: input vs service-data","xml":"<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n","comments":"","outputs":1,"x":1244.321434020996,"y":296.60728549957275,"z":"8a7e5e63.38ace","wires":[["be482925.70caa8"]]},{"id":"be482925.70caa8","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1467.1072006225586,"y":296.1787576675415,"z":"8a7e5e63.38ace","wires":[["51a84602.114aa8"]]},{"id":"51a84602.114aa8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1599.5714530944824,"y":296.21431827545166,"z":"8a7e5e63.38ace","wires":[["eb8243d9.c7ead","eb4574cb.974e98","78f6433b.71dbec"]]},{"id":"eb8243d9.c7ead","type":"break","name":"break","xml":"<break>\n","comments":"","x":1767.464241027832,"y":382.2142963409424,"z":"8a7e5e63.38ace","wires":[]},{"id":"69a01421.b0d1fc","type":"set","name":"set new vnf_length = 1","xml":"<set>\n<parameter name='service-data.vnfs.vnf_length' value='1' />\n","comments":"","x":977.642951965332,"y":219.57148838043213,"z":"8a7e5e63.38ace","wires":[]},{"id":"eb4574cb.974e98","type":"set","name":"set vnf-index = idx","xml":"<set>\n<parameter name='vnf-index' value='`$idx`' />\n","comments":"","x":1798.0357971191406,"y":338.9999752044678,"z":"8a7e5e63.38ace","wires":[]},{"id":"c602370a.7ee398","type":"set","name":"set is-new-vnf = true","xml":"<set>\n<parameter name='is-new-vnf' value='true' />\n","comments":"","x":330.8929214477539,"y":156.07144355773926,"z":"8a7e5e63.38ace","wires":[]},{"id":"78f6433b.71dbec","type":"set","name":"set is-new-vnf = false","xml":"<set>\n<parameter name='is-new-vnf' value='false' />\n","comments":"","x":1806.0714836120605,"y":295.7143201828003,"z":"8a7e5e63.38ace","wires":[]},{"id":"85cecc5e.cffa9","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":757.2500228881836,"y":296.0000162124634,"z":"8a7e5e63.38ace","wires":[["4503302f.14ead","73083910.f9af68"]]},{"id":"73083910.f9af68","type":"switchNode","name":"switch is-new-vnf","xml":"<switch test='`$is-new-vnf`'>\n","comments":"","outputs":1,"x":954.7500152587891,"y":382.5714178085327,"z":"8a7e5e63.38ace","wires":[["4a60d344.c63a9c"]]},{"id":"4a60d344.c63a9c","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1134.6071701049805,"y":382.14286518096924,"z":"8a7e5e63.38ace","wires":[["dd30cb4d.6f3e78"]]},{"id":"b13684ac.3b5ec8","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":772.7499923706055,"y":174.74999713897705,"z":"8a7e5e63.38ace","wires":[["2eb2a0b4.7673","69a01421.b0d1fc"]]},{"id":"7d6220cf.97437","type":"other","name":"0","xml":"<outcome value='0'>\n","comments":"","outputs":1,"x":617.2499923706055,"y":234.49999904632568,"z":"8a7e5e63.38ace","wires":[["b13684ac.3b5ec8"]]},{"id":"7402f8af.8166a8","type":"switchNode","name":"switch is-new-vnf","xml":"<switch test='`$is-new-vnf`'>\n","comments":"","outputs":1,"x":318.75000381469727,"y":550.0000057220459,"z":"8a7e5e63.38ace","wires":[["fb8ba40c.acc858"]]},{"id":"fb8ba40c.acc858","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":498.6071586608887,"y":549.5714530944824,"z":"8a7e5e63.38ace","wires":[["174083a3.4d324c"]]},{"id":"3159769d.7109fa","type":"set","name":"set new vnf_length++","xml":"<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$service-data.vnfs.vnf_length + 1`' />\n","comments":"","x":1482.5,"y":428.75,"z":"8a7e5e63.38ace","wires":[]},{"id":"dd30cb4d.6f3e78","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1280.4999771118164,"y":381.74996185302734,"z":"8a7e5e63.38ace","wires":[["3159769d.7109fa","3ffdf6d3.2240ca"]]},{"id":"3ffdf6d3.2240ca","type":"set","name":"set vnf-index = vnf_length","xml":"<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n","comments":"","x":1491.9999809265137,"y":381.24996185302734,"z":"8a7e5e63.38ace","wires":[]},{"id":"71982f5.9f351d","type":"set","name":"set error-message","xml":"<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vnf assignments during assign in MD-SAL\" />","comments":"","x":2061.428611755371,"y":2253,"z":"8a7e5e63.38ace","wires":[]}]
\ No newline at end of file
+[
+    {
+        "id": "4ab7a500.742b84",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 91,
+        "y": 42,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "41557c8.3b7a284"
+            ]
+        ]
+    },
+    {
+        "id": "ff348586.8270b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 121.4761962890625,
+        "y": 164.2777862548828,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "cd67af0a.d11ae",
+                "f96dad58.53729",
+                "7c74e6bd.a00fb8",
+                "aee6c595.a3c2e8",
+                "3e45c56a.355fba",
+                "9470b636.3af698",
+                "a48cbf50.8520d",
+                "f9268c4a.ab9328",
+                "818a22c.a82fbe"
+            ]
+        ]
+    },
+    {
+        "id": "37b4339e.be9ca4",
+        "type": "method",
+        "name": "method self-serve-vnf-assign",
+        "xml": "<method rpc='self-serve-vnf-assign' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 207.76190948486328,
+        "y": 96.70635509490967,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "ff348586.8270b8"
+            ]
+        ]
+    },
+    {
+        "id": "41557c8.3b7a284",
+        "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": 366.23819732666016,
+        "y": 42.19049263000488,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "37b4339e.be9ca4"
+            ]
+        ]
+    },
+    {
+        "id": "f96dad58.53729",
+        "type": "switchNode",
+        "name": "switch vnf-parameters-data.param_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.param_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 409.6786575317383,
+        "y": 1384.5120058059692,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "1a76b7c7.f60c58"
+            ]
+        ]
+    },
+    {
+        "id": "1a76b7c7.f60c58",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 671.6786880493164,
+        "y": 1384.5120058059692,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "8db9b3e7.403cc8"
+            ]
+        ]
+    },
+    {
+        "id": "4d6ae8ce.a99a2",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:self-serve-ra-assignment",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='self-serve-vnf-ra-assignment' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186.9643478393555,
+        "y": 1434.0834369659424,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "5f59d54a.3b7624"
+            ]
+        ]
+    },
+    {
+        "id": "552faac1.e8b50c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='500' />\n<parameter name='error-message' value=\"`'Failed to get RA assignments: ' + $error-message`\" />\n",
+        "comments": "",
+        "x": 1658.6785888671875,
+        "y": 1433.6548404693604,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "80370664.c86fd",
+        "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": 634.8574600219727,
+        "y": 1752.0120840072632,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "8260f760.79336",
+                "2346f507.b81d6a"
+            ]
+        ]
+    },
+    {
+        "id": "cd67af0a.d11ae",
+        "type": "set",
+        "name": "set ss.capability.execution-order[]",
+        "xml": "<set>\n<parameter name='ss.capability.execution-order[0]' value='generate-name' />\n<parameter name='ss.capability.execution-order[1]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[2]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='eipam-ip-assign' />\n<parameter name='ss.capability.execution-order[6]' value='netbox-ip-assign' />\n<parameter name='ss.capability.execution-order[7]' value='eipam-create-pool\"' />\n<parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />\n<parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />\n<parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />\n<parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />\n<parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />\n<parameter name='ss.capability.execution-order_length' value='13' />\n",
+        "comments": "",
+        "x": 383.52384185791016,
+        "y": 1223.0001401901245,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "7c74e6bd.a00fb8",
+        "type": "for",
+        "name": "foreach capability[]",
+        "xml": "<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 338.9286880493164,
+        "y": 1492.1191005706787,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "c4f31511.d9287",
+                "4357e5bb.501284",
+                "80370664.c86fd",
+                "ee8b6246.5c29f"
+            ]
+        ]
+    },
+    {
+        "id": "2346f507.b81d6a",
+        "type": "switchNode",
+        "name": "switch capability-name",
+        "xml": "<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 939.2502822875977,
+        "y": 1797.6548767089844,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "4293f2a.d82680c"
+            ]
+        ]
+    },
+    {
+        "id": "4293f2a.d82680c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1202.7502822875977,
+        "y": 1797.9048767089844,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "e24f05f3.ca0498"
+            ]
+        ]
+    },
+    {
+        "id": "5f59d54a.3b7624",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1504.5356941223145,
+        "y": 1433.5120306015015,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "552faac1.e8b50c"
+            ]
+        ]
+    },
+    {
+        "id": "c4f31511.d9287",
+        "type": "set",
+        "name": "set ss.capability-name",
+        "xml": "<set>\n<parameter name='ss.capability-name' value='`$ss.capability.execution-order[$cidx]`' />\n<!--\nss.capability.execution-order[]\n-->",
+        "comments": "",
+        "x": 595.2857437133789,
+        "y": 1492.0715522766113,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "8260f760.79336",
+        "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": 950.607307434082,
+        "y": 1752.2620868682861,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "4357e5bb.501284",
+        "type": "set",
+        "name": "set ss.capability.action = assign",
+        "xml": "<set>\n<parameter name='ss.capability-action' value='assign' />\n",
+        "comments": "",
+        "x": 623.999885559082,
+        "y": 1538.988136291504,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "ee8b6246.5c29f",
+        "type": "set",
+        "name": "set capability-dg with 'self-serve-' + capability-name",
+        "xml": "<set>\n<parameter name='ss.capability-dg' value=\"`'self-serve-' + $ss.capability.execution-order[$cidx]`\" />\n",
+        "comments": "",
+        "x": 686.5119781494141,
+        "y": 1592.4643802642822,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "aee6c595.a3c2e8",
+        "type": "set",
+        "name": "set sdnc-generated-cloud-resources = true",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />\n",
+        "comments": "",
+        "x": 412.4881362915039,
+        "y": 1276.7501487731934,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "9b585f6f.16442",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 668.928539276123,
+        "y": 557.4643030166626,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "a94d8d98.d42658",
+                "3cb78e8d.74e962",
+                "c8a900f1.9777a8",
+                "78095309.0dc25c",
+                "be27a7ea.5a181",
+                "1b64f08.bab119",
+                "2ec1f112.0da5c6",
+                "6e55cc0d.b1517c",
+                "4f11607d.71a34"
+            ]
+        ]
+    },
+    {
+        "id": "a94d8d98.d42658",
+        "type": "set",
+        "name": "set vnf-topology data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-id'\n value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-type'\n value='`$vnf-topology-operation-input.vnf-information.vnf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-type'\n value='`$db.vf-model.nf-type`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-role'\n value='`$db.vf-model.nf-role`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-function'\n value='`$db.vf-model.nf-function`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.nf-code'\n value='`$db.vf-model.nf-code`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.tenant'\n value='`$vnf-topology-operation-input.vnf-request-input.tenant`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.aic-cloud-region'\n value='`$vnf-topology-operation-input.vnf-request-input.aic-cloud-region`' />\n \n",
+        "comments": "",
+        "x": 884.4284820556641,
+        "y": 558.523811340332,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "c4c6fe75.ec2388",
+        "type": "set",
+        "name": "set vnf-parameters-data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-parameters-data.'\n  value='vnf-topology-operation-input.vnf-request-input.vnf-input-parameters.' />\n",
+        "comments": "",
+        "x": 1077.9645767211914,
+        "y": 1384.3808345794678,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "c8a900f1.9777a8",
+        "type": "set",
+        "name": "set vnf-level-oper-status to PendingCreate",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status' value='PendingCreate' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />\n",
+        "comments": "",
+        "x": 949.7184371948242,
+        "y": 1132.504020690918,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "3cb78e8d.74e962",
+        "type": "set",
+        "name": "copy input data",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.sdnc-request-header.' \n\tvalue='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.request-information.' \n\tvalue='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.' \n\tvalue='$vnf-topology-operation-input.service-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-information.' \n\tvalue='$vnf-topology-operation-input.vnf-information.' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.' \n\tvalue='$vnf-topology-operation-input.vnf-request-input.' />\n",
+        "comments": "",
+        "x": 867.0953521728516,
+        "y": 1082.3096599578857,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "fa0373bc.4d0538",
+        "type": "set",
+        "name": "set from DB",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$db.vf-model.invariant-uuid`' />\n",
+        "comments": "",
+        "x": 1281.4286727905273,
+        "y": 670.8810405731201,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "78095309.0dc25c",
+        "type": "switchNode",
+        "name": "switch input model-invariant-uuid",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 922.2857475280762,
+        "y": 693.7054843902588,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "9bba5aea.a57f48",
+                "4552d186.b6ea3"
+            ]
+        ]
+    },
+    {
+        "id": "9bba5aea.a57f48",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1130.9524192810059,
+        "y": 670.8484477996826,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "fa0373bc.4d0538"
+            ]
+        ]
+    },
+    {
+        "id": "4552d186.b6ea3",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1132.381015777588,
+        "y": 715.1340389251709,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "28257c6c.608bec"
+            ]
+        ]
+    },
+    {
+        "id": "28257c6c.608bec",
+        "type": "set",
+        "name": "set from input",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-invariant-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-invariant-uuid`' />\n",
+        "comments": "",
+        "x": 1286.6667518615723,
+        "y": 714.5626111030579,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "ad8d3d3c.38aab8",
+        "type": "set",
+        "name": "set from DB",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$db.vf-model.uuid`' />\n",
+        "comments": "",
+        "x": 1282.3809432983398,
+        "y": 759.419716835022,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "be27a7ea.5a181",
+        "type": "switchNode",
+        "name": "switch input model-uuid",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 891.9047660827637,
+        "y": 782.2442216873169,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "70c0f30c.080ebc",
+                "e1067bc0.09616"
+            ]
+        ]
+    },
+    {
+        "id": "70c0f30c.080ebc",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1131.9047393798828,
+        "y": 759.3871536254883,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "ad8d3d3c.38aab8"
+            ]
+        ]
+    },
+    {
+        "id": "e1067bc0.09616",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1133.3333358764648,
+        "y": 803.6727447509766,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "ed31c003.6e5ff8"
+            ]
+        ]
+    },
+    {
+        "id": "ed31c003.6e5ff8",
+        "type": "set",
+        "name": "set from input",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-uuid`' />\n",
+        "comments": "",
+        "x": 1287.6190719604492,
+        "y": 803.1013169288635,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "ea4c9359.636478",
+        "type": "set",
+        "name": "set from DB",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$db.vf-model.version`' />\n",
+        "comments": "",
+        "x": 1279.5238761901855,
+        "y": 848.2769241333008,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "1b64f08.bab119",
+        "type": "switchNode",
+        "name": "switch input model-version",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 903.0476379394531,
+        "y": 871.1013689041138,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "67f74f68.a2256",
+                "12fefdff.fad13a"
+            ]
+        ]
+    },
+    {
+        "id": "67f74f68.a2256",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1129.047622680664,
+        "y": 848.2443313598633,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "ea4c9359.636478"
+            ]
+        ]
+    },
+    {
+        "id": "12fefdff.fad13a",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1130.476219177246,
+        "y": 892.5299224853516,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "f3b92182.211f8"
+            ]
+        ]
+    },
+    {
+        "id": "f3b92182.211f8",
+        "type": "set",
+        "name": "set from input",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-version'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-version`' />\n",
+        "comments": "",
+        "x": 1284.7619552612305,
+        "y": 891.9584946632385,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "e1b96368.4917",
+        "type": "set",
+        "name": "set from DB",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$db.vf-model.name`' />\n",
+        "comments": "",
+        "x": 1279.5238761901855,
+        "y": 935.4197463989258,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "2ec1f112.0da5c6",
+        "type": "switchNode",
+        "name": "switch input model-name",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 898.0476379394531,
+        "y": 958.2441911697388,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "1660517c.cccf6f",
+                "ed71187f.5311e"
+            ]
+        ]
+    },
+    {
+        "id": "1660517c.cccf6f",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1129.047622680664,
+        "y": 935.3871536254883,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "e1b96368.4917"
+            ]
+        ]
+    },
+    {
+        "id": "ed71187f.5311e",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1130.476219177246,
+        "y": 979.6727447509766,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "1b3b7bf2.898ee4"
+            ]
+        ]
+    },
+    {
+        "id": "1b3b7bf2.898ee4",
+        "type": "set",
+        "name": "set from input",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-name'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-name`' />\n",
+        "comments": "",
+        "x": 1284.7619552612305,
+        "y": 979.1013169288635,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "6e55cc0d.b1517c",
+        "type": "set",
+        "name": "set vnf-id",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-id'\n   value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n",
+        "comments": "",
+        "x": 848.4047088623047,
+        "y": 610.0388488769531,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "4f11607d.71a34",
+        "type": "set",
+        "name": "set model-customization-uuid",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.onap-model-information.model-customization-uuid'\n  value='`$vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid`' />\n",
+        "comments": "",
+        "x": 910.8332252502441,
+        "y": 1031.0863952636719,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "f9268c4a.ab9328",
+        "type": "switchNode",
+        "name": "switch service-data.vnfs.vnf_length",
+        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 395.08329010009766,
+        "y": 244.42850017547607,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "eb071fdf.798b28",
+                "9f911665.8875c8",
+                "80f3305a.6722d8"
+            ]
+        ]
+    },
+    {
+        "id": "eb071fdf.798b28",
+        "type": "other",
+        "name": "NULL",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 637.2976760864258,
+        "y": 182.98793125152588,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "98b86e0.9a1f69"
+            ]
+        ]
+    },
+    {
+        "id": "1b8d17c2.822de",
+        "type": "set",
+        "name": "set vnf-index=0",
+        "xml": "<set>\n<parameter name='vnf-index' value='0' />\n",
+        "comments": "",
+        "x": 972.583381652832,
+        "y": 182.48800563812256,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "9f911665.8875c8",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 638.476203918457,
+        "y": 304.607120513916,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "f865c6ab.95d9"
+            ]
+        ]
+    },
+    {
+        "id": "e24f05f3.ca0498",
+        "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": 474.01221084594727,
+        "y": 2054.4722986221313,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "782e269e.4b3fb",
+                "8956ab0b.f8051"
+            ]
+        ]
+    },
+    {
+        "id": "782e269e.4b3fb",
+        "type": "other",
+        "name": "PENDING",
+        "xml": "<outcome value='PENDING'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 743.3694267272949,
+        "y": 2054.472254753113,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "5f47a6e6.b99ea8"
+            ]
+        ]
+    },
+    {
+        "id": "8956ab0b.f8051",
+        "type": "other",
+        "name": "FAILED",
+        "xml": "<outcome value='FAILED'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 736.9052429199219,
+        "y": 2105.4365854263306,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "5f47a6e6.b99ea8"
+            ]
+        ]
+    },
+    {
+        "id": "5f47a6e6.b99ea8",
+        "type": "call",
+        "name": "call ss.capability-dg",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 952.0239753723145,
+        "y": 2106.1984367370605,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "598559d5.cea1e8"
+            ]
+        ]
+    },
+    {
+        "id": "4e7061c4.a89b6",
+        "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": 1519.5714149475098,
+        "y": 2360.174892425537,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "598559d5.cea1e8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1136.9164848327637,
+        "y": 2106.198497772217,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "ec2a0d97.15565"
+            ]
+        ]
+    },
+    {
+        "id": "ec2a0d97.15565",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 1300.190601348877,
+        "y": 2105.508038520813,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "4e7061c4.a89b6",
+                "3dc20fce.5456d8",
+                "a95e3cc2.662a38",
+                "3d72d3ce.0a1af4",
+                "8021d858.4809f8"
+            ]
+        ]
+    },
+    {
+        "id": "a95e3cc2.662a38",
+        "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": 1623.5236930847168,
+        "y": 2159.024598121643,
+        "z": "46985608.45d728",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8021d858.4809f8",
+        "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": 1592.9879875183105,
+        "y": 2261.8818197250366,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "730d5fdb.54ca48",
+                "9d70e9bf.a1c8d8"
+            ]
+        ]
+    },
+    {
+        "id": "730d5fdb.54ca48",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1867.5816535949707,
+        "y": 2315.87997341156,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "9daf4747.49e728"
+            ]
+        ]
+    },
+    {
+        "id": "9d70e9bf.a1c8d8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1860.0102882385254,
+        "y": 2262.3799934387207,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "9daf4747.49e728"
+            ]
+        ]
+    },
+    {
+        "id": "3dc20fce.5456d8",
+        "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-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.`' />\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-request-input.request-version'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.request-version`' />\n<parameter name='vf.vnf-data.vnf-request-input.vnf-name'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.vnf-name`' />\n<parameter name='vf.vnf-data.vnf-request-input.tenant'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.tenant`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-cloud-region'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-cloud-region`' />\n<parameter name='vf.vnf-data.vnf-request-input.aic-clli'\n  value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-request-input.aic-clli`' />",
+        "comments": "",
+        "x": 1575.9759941101074,
+        "y": 2105.119110107422,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "3d72d3ce.0a1af4",
+        "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": 1587.809398651123,
+        "y": 2209.833366394043,
+        "z": "46985608.45d728",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9470b636.3af698",
+        "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": 339.35311126708984,
+        "y": 2554.349449157715,
+        "z": "46985608.45d728",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "3e45c56a.355fba",
+        "type": "set",
+        "name": "set ss.capability-type = vnf",
+        "xml": "<set>\n<parameter name='ss.capability-type' value='vnf' />\n",
+        "comments": "",
+        "x": 363.39292907714844,
+        "y": 1327.5357942581177,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "8db9b3e7.403cc8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 836.5356597900391,
+        "y": 1384.892903327942,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "c4c6fe75.ec2388",
+                "4d6ae8ce.a99a2"
+            ]
+        ]
+    },
+    {
+        "id": "8252aebc.5df44",
+        "type": "for",
+        "name": "for each existing VNF",
+        "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 985.5357284545898,
+        "y": 304.78579807281494,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "5cfbf2.554b941"
+            ]
+        ]
+    },
+    {
+        "id": "5cfbf2.554b941",
+        "type": "switchNode",
+        "name": "switch vnf-id: input vs service-data",
+        "xml": "<switch test='`$vnf-topology-operation-input.vnf-information.vnf-id == $service-data.vnfs.vnf[$idx].vnf-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1262.821434020996,
+        "y": 304.85728549957275,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "2128570f.c158f"
+            ]
+        ]
+    },
+    {
+        "id": "2128570f.c158f",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1485.6072006225586,
+        "y": 304.4287576675415,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "eb37f3e2.ce392"
+            ]
+        ]
+    },
+    {
+        "id": "eb37f3e2.ce392",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1618.0714530944824,
+        "y": 304.46431827545166,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "52f1ea82.cb4e34",
+                "432297ea.ffb6e",
+                "349806c9.e96892"
+            ]
+        ]
+    },
+    {
+        "id": "52f1ea82.cb4e34",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 1785.964241027832,
+        "y": 390.4642963409424,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "550b07af.2d8658",
+        "type": "set",
+        "name": "set new vnf_length = 1",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='1' />\n",
+        "comments": "",
+        "x": 996.142951965332,
+        "y": 227.82148838043213,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "432297ea.ffb6e",
+        "type": "set",
+        "name": "set vnf-index = idx",
+        "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
+        "comments": "",
+        "x": 1816.5357971191406,
+        "y": 347.2499752044678,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "a48cbf50.8520d",
+        "type": "set",
+        "name": "set is-new-vnf = true",
+        "xml": "<set>\n<parameter name='is-new-vnf' value='true' />\n",
+        "comments": "",
+        "x": 349.3929214477539,
+        "y": 164.32144355773926,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "349806c9.e96892",
+        "type": "set",
+        "name": "set is-new-vnf = false",
+        "xml": "<set>\n<parameter name='is-new-vnf' value='false' />\n",
+        "comments": "",
+        "x": 1824.5714836120605,
+        "y": 303.9643201828003,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "f865c6ab.95d9",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 775.7500228881836,
+        "y": 304.2500162124634,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "8252aebc.5df44",
+                "5f2b6eec.7ce8f8"
+            ]
+        ]
+    },
+    {
+        "id": "5f2b6eec.7ce8f8",
+        "type": "switchNode",
+        "name": "switch is-new-vnf",
+        "xml": "<switch test='`$is-new-vnf`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 973.2500152587891,
+        "y": 390.8214178085327,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "13b8df2d.2675e1"
+            ]
+        ]
+    },
+    {
+        "id": "13b8df2d.2675e1",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1153.1071701049805,
+        "y": 390.39286518096924,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "e518d754.42ca68"
+            ]
+        ]
+    },
+    {
+        "id": "98b86e0.9a1f69",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 791.2499923706055,
+        "y": 182.99999713897705,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "1b8d17c2.822de",
+                "550b07af.2d8658"
+            ]
+        ]
+    },
+    {
+        "id": "80f3305a.6722d8",
+        "type": "other",
+        "name": "0",
+        "xml": "<outcome value='0'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 635.7499923706055,
+        "y": 242.74999904632568,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "98b86e0.9a1f69"
+            ]
+        ]
+    },
+    {
+        "id": "818a22c.a82fbe",
+        "type": "switchNode",
+        "name": "switch is-new-vnf",
+        "xml": "<switch test='`$is-new-vnf`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 337.25000381469727,
+        "y": 558.2500057220459,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "57fdfbd7.0bb994"
+            ]
+        ]
+    },
+    {
+        "id": "57fdfbd7.0bb994",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 517.1071586608887,
+        "y": 557.8214530944824,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "9b585f6f.16442"
+            ]
+        ]
+    },
+    {
+        "id": "699a17c5.2f4418",
+        "type": "set",
+        "name": "set new vnf_length++",
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf_length' value='`$service-data.vnfs.vnf_length + 1`' />\n",
+        "comments": "",
+        "x": 1501,
+        "y": 437,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "e518d754.42ca68",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1298.9999771118164,
+        "y": 389.99996185302734,
+        "z": "46985608.45d728",
+        "wires": [
+            [
+                "699a17c5.2f4418",
+                "4e889749.bdf14"
+            ]
+        ]
+    },
+    {
+        "id": "4e889749.bdf14",
+        "type": "set",
+        "name": "set vnf-index = vnf_length",
+        "xml": "<set>\n<parameter name='vnf-index' value='`$service-data.vnfs.vnf_length`' />\n",
+        "comments": "",
+        "x": 1510.4999809265137,
+        "y": 389.49996185302734,
+        "z": "46985608.45d728",
+        "wires": []
+    },
+    {
+        "id": "9daf4747.49e728",
+        "type": "set",
+        "name": "set error-message",
+        "xml": "<set>\n<parameter name=\"error-message\" value=\"Failed to persist self-serve vnf assignments during assign in MD-SAL\" />",
+        "comments": "",
+        "x": 2079.928611755371,
+        "y": 2261.25,
+        "z": "46985608.45d728",
+        "wires": []
+    }
+]
\ No newline at end of file
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 45dcab56..a2645b3b 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 +1,663 @@
-[{"id":"a6385a9d.53bbd8","type":"dgstart","name":"DGSTART","outputs":1,"x":210,"y":41.42857360839844,"z":"50509cff.314024","wires":[["68771f71.1c988"]]},{"id":"c2830c02.352ca","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":253.72620391845703,"y":160.20636367797852,"z":"50509cff.314024","wires":[["7a7eb5ea.d9c27c","cadde72f.768658","61da759.184e28c","8603e753.202d08","ee44abff.0a52c8"]]},{"id":"df83a576.0a03c8","type":"method","name":"method self-serve-vnf-unassign","xml":"<method rpc='self-serve-vnf-unassign' mode='sync'>\n","comments":"","outputs":1,"x":326.7619094848633,"y":96.1349287033081,"z":"50509cff.314024","wires":[["c2830c02.352ca"]]},{"id":"68771f71.1c988","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":485.23819732666016,"y":41.61906623840332,"z":"50509cff.314024","wires":[["df83a576.0a03c8"]]},{"id":"d04042ce.4a948","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":842.4645538330078,"y":386.1309928894043,"z":"50509cff.314024","wires":[["bcabf14.e18d21","5506226b.04018c"]]},{"id":"20db9a83.47e506","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":579.1789703369141,"y":782.9287061691284,"z":"50509cff.314024","wires":[["af96cd32.20d99","8025d892.0ac388","acbf2cb7.1041"]]},{"id":"af96cd32.20d99","type":"other","name":"SUCCESS","xml":"<outcome value='SUCCESS'>\n","comments":"","outputs":1,"x":854.5719718933105,"y":783.6429615020752,"z":"50509cff.314024","wires":[["cd65f121.8b137"]]},{"id":"7a7eb5ea.d9c27c","type":"for","name":"foreach capability-order[]","xml":"<for index='cidx' start='0' end='`$ss.capability.execution-order_length`' >\n","comments":"","outputs":1,"x":508.0357894897461,"y":241.32139778137207,"z":"50509cff.314024","wires":[["697d23ef.8a2fbc","5b9beee2.2b424","d04042ce.4a948","9b2708ec.431508"]]},{"id":"bcabf14.e18d21","type":"switchNode","name":"switch param capability-name == execution","xml":"<switch test='`$ss.capability-name == $tmp.param.capability-name`'>\n","comments":"","outputs":1,"x":1198.3574676513672,"y":429.85712242126465,"z":"50509cff.314024","wires":[["4c332048.14e83"]]},{"id":"4c332048.14e83","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":1461.8574676513672,"y":430.10712242126465,"z":"50509cff.314024","wires":[["20db9a83.47e506"]]},{"id":"cd65f121.8b137","type":"call","name":"call ss.capability-dg","xml":"<call module='GENERIC-RESOURCE-API' rpc='`$ss.capability-dg`' mode='sync' >\n","comments":"","outputs":1,"x":1059.6907043457031,"y":783.4048128128052,"z":"50509cff.314024","wires":[["7c9a62de.b663cc"]]},{"id":"697d23ef.8a2fbc","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":788.3928451538086,"y":241.2738494873047,"z":"50509cff.314024","wires":[]},{"id":"5506226b.04018c","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":1147.7144927978516,"y":384.4643325805664,"z":"50509cff.314024","wires":[]},{"id":"5b9beee2.2b424","type":"set","name":"set ss.capability.action = unassign","xml":"<set>\n<parameter name='ss.capability-action' value='unassign' />\n","comments":"","x":835.1069869995117,"y":288.19043350219727,"z":"50509cff.314024","wires":[]},{"id":"7c9a62de.b663cc","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1244.5832138061523,"y":783.4048738479614,"z":"50509cff.314024","wires":[["5ae85112.18d99"]]},{"id":"9b2708ec.431508","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":779.5356750488281,"y":337.08334732055664,"z":"50509cff.314024","wires":[]},{"id":"bad23ec5.376d3","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":1727.4405975341797,"y":837.2865991592407,"z":"50509cff.314024","wires":[[]]},{"id":"fbec284e.585d38","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":1696.9048919677734,"y":940.1438207626343,"z":"50509cff.314024","wires":[["c47e36eb.d05728","b96d7225.bf08f"]]},{"id":"c47e36eb.d05728","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":1971.4985580444336,"y":994.1419744491577,"z":"50509cff.314024","wires":[["e88954ca.906d58"]]},{"id":"b96d7225.bf08f","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1963.9271926879883,"y":940.6419944763184,"z":"50509cff.314024","wires":[["e88954ca.906d58"]]},{"id":"e88954ca.906d58","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":2166.0595169067383,"y":940.2862491607666,"z":"50509cff.314024","wires":[["80bd3596.06daa8"]]},{"id":"80bd3596.06daa8","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":2384.345283508301,"y":940.4291124343872,"z":"50509cff.314024","wires":[[]]},{"id":"5acff27f.210b1c","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":1679.8928985595703,"y":783.3811111450195,"z":"50509cff.314024","wires":[]},{"id":"3ed081d1.8cc08e","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":1691.726303100586,"y":888.0953674316406,"z":"50509cff.314024","wires":[[]]},{"id":"5ae85112.18d99","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1405.535888671875,"y":783.1429853439331,"z":"50509cff.314024","wires":[["bad23ec5.376d3","fbec284e.585d38","5acff27f.210b1c","3ed081d1.8cc08e","4e5f969d.6392c8"]]},{"id":"4e5f969d.6392c8","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":1626.4408569335938,"y":1067.9167687892914,"z":"50509cff.314024","wires":[]},{"id":"8603e753.202d08","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":469.1193313598633,"y":1437.488163948059,"z":"50509cff.314024","wires":[[]]},{"id":"cadde72f.768658","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='vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />\n<parameter name='ss.capability.execution-order[5]' value='alts-license-assign' />\n<parameter name='ss.capability.execution-order[6]' value='alts-entitlement-assign' />\n<parameter name='ss.capability.execution-order[7]' value='generate-name' />\n<parameter name='ss.capability.execution-order_length' value='8' />","comments":"","x":533.2500381469727,"y":160.4285774230957,"z":"50509cff.314024","wires":[]},{"id":"8025d892.0ac388","type":"other","name":"DELETED","xml":"<outcome value='DELETED'>\n","comments":"","outputs":1,"x":855.0714416503906,"y":850.1785583496094,"z":"50509cff.314024","wires":[["3057289e.008328"]]},{"id":"61da759.184e28c","type":"set","name":"set ss.capability-type = vnf","xml":"<set>\n<parameter name='ss.capability-type' value='vnf' />\n","comments":"","x":512.8571395874023,"y":200.00000762939453,"z":"50509cff.314024","wires":[]},{"id":"6b6d2942.d47c48","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":1237.1428833007812,"y":960.3929593222483,"z":"50509cff.314024","wires":[]},{"id":"3057289e.008328","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":1011.5714340209961,"y":850.1785469055176,"z":"50509cff.314024","wires":[[]]},{"id":"acbf2cb7.1041","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":846.1428375244141,"y":908.3928604125977,"z":"50509cff.314024","wires":[["c1c0b7f6.69a4e8"]]},{"id":"70287cdc.85b194","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":1216.4285888671875,"y":908.3929659979685,"z":"50509cff.314024","wires":[[]]},{"id":"c1c0b7f6.69a4e8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1032.8571319580078,"y":908.3929119110107,"z":"50509cff.314024","wires":[["70287cdc.85b194","6b6d2942.d47c48"]]},{"id":"1c8c4c56.6f0bc4","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":1036.6666145324707,"y":1267.381091117859,"z":"50509cff.314024","wires":[["39ffbb9b.5384c4"]]},{"id":"48bdb965.fbf268","type":"comment","name":"Remove VNF from service data","info":"","comments":"","x":448.825382232666,"y":1225.9527435302734,"z":"50509cff.314024","wires":[]},{"id":"39ffbb9b.5384c4","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":1270.2577476501465,"y":1266.4050426483154,"z":"50509cff.314024","wires":[]},{"id":"ee44abff.0a52c8","type":"switchNode","name":"switch vnf_length","xml":"<switch test='`$service-data.vnfs.vnf_length`'>\n","comments":"","outputs":1,"x":492.92447662353516,"y":1268.9607200622559,"z":"50509cff.314024","wires":[["3c166715.7796b8","62f98baa.f6f574"]]},{"id":"3c166715.7796b8","type":"outcome","name":"1","xml":"<outcome value='1'>\n","comments":"","outputs":1,"x":669.9245185852051,"y":1229.6273069381714,"z":"50509cff.314024","wires":[["8af99073.0156"]]},{"id":"8af99073.0156","type":"set","name":"Remove vnfs","xml":"<set>\n\t<parameter name=\"service-data.vnfs.\" value=\"\"/>\n\n","comments":"","x":833.5910148620605,"y":1229.6274061203003,"z":"50509cff.314024","wires":[]},{"id":"62f98baa.f6f574","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":671.4484100341797,"y":1313.103446006775,"z":"50509cff.314024","wires":[["b4f726ae.38e868"]]},{"id":"c1ef091a.99d9e8","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":1056.220703125,"y":1357.9606647491455,"z":"50509cff.314024","wires":[]},{"id":"2c024236.55d4ae","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":1091.92435836792,"y":1313.0716857910156,"z":"50509cff.314024","wires":[]},{"id":"b4f726ae.38e868","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":837.2577514648438,"y":1313.6272268295288,"z":"50509cff.314024","wires":[["1c8c4c56.6f0bc4","2c024236.55d4ae","c1ef091a.99d9e8"]]}]
\ No newline at end of file
+[
+    {
+        "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"
+            ]
+        ]
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
index 393c7bcb..bc92ba07 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-assign.xml
@@ -171,13 +171,14 @@
                 <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />

                 <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />

                 <parameter name='ss.capability.execution-order[5]' value='eipam-ip-assign' />

-                <parameter name='ss.capability.execution-order[6]' value='eipam-create-pool"' />

-                <parameter name='ss.capability.execution-order[7]' value='mac-address-assign' />

-                <parameter name='ss.capability.execution-order[8]' value='mS-mac-address-assign' />

-                <parameter name='ss.capability.execution-order[9]' value='create-vpe-pool' />

-                <parameter name='ss.capability.execution-order[10]' value='unresolved-composite-data' />

-                <parameter name='ss.capability.execution-order[11]' value='aai-vnf-put' />

-                <parameter name='ss.capability.execution-order_length' value='12' />

+                <parameter name='ss.capability.execution-order[6]' value='netbox-ip-assign' />

+                <parameter name='ss.capability.execution-order[7]' value='eipam-create-pool"' />

+                <parameter name='ss.capability.execution-order[8]' value='mac-address-assign' />

+                <parameter name='ss.capability.execution-order[9]' value='mS-mac-address-assign' />

+                <parameter name='ss.capability.execution-order[10]' value='create-vpe-pool' />

+                <parameter name='ss.capability.execution-order[11]' value='unresolved-composite-data' />

+                <parameter name='ss.capability.execution-order[12]' value='aai-vnf-put' />

+                <parameter name='ss.capability.execution-order_length' value='13' />

             </set>

             <set>

                 <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.sdnc-generated-cloud-resources' value='true' />

diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
index 517948ee..dd5bc409 100644
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-unassign.xml
@@ -7,12 +7,13 @@
                 <parameter name='ss.capability.execution-order[0]' value='mac-address-assign' />

                 <parameter name='ss.capability.execution-order[1]' value='mS-mac-address-assign' />

                 <parameter name='ss.capability.execution-order[2]' value='eipam-ip-assign' />

-                <parameter name='ss.capability.execution-order[3]' value='vlan-tag-assign' />

-                <parameter name='ss.capability.execution-order[4]' value='mS-vlan-tag-assign' />

-                <parameter name='ss.capability.execution-order[5]' value='alts-license-assign' />

-                <parameter name='ss.capability.execution-order[6]' value='alts-entitlement-assign' />

-                <parameter name='ss.capability.execution-order[7]' value='generate-name' />

-                <parameter name='ss.capability.execution-order_length' value='8' />

+                <parameter name='ss.capability.execution-order[3]' value='netbox-ip-assign' />

+                <parameter name='ss.capability.execution-order[4]' value='vlan-tag-assign' />

+                <parameter name='ss.capability.execution-order[5]' value='mS-vlan-tag-assign' />

+                <parameter name='ss.capability.execution-order[6]' value='alts-license-assign' />

+                <parameter name='ss.capability.execution-order[7]' value='alts-entitlement-assign' />

+                <parameter name='ss.capability.execution-order[8]' value='generate-name' />

+                <parameter name='ss.capability.execution-order_length' value='9' />

             </set>

             <set>

                 <parameter name='ss.capability-type' value='vnf' />