76 files changed, 224 insertions, 395 deletions

diff --git a/platform-logic/vnfapi/src/main/json/generate-l3network-network-id.json b/platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json
index 6a881f68..6a881f68 100644
--- a/platform-logic/vnfapi/src/main/json/generate-l3network-network-id.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_generate-l3network-network-id.json
diff --git a/platform-logic/vnfapi/src/main/json/generate-subnets-subnet-id.json b/platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json
index 9e526f64..9e526f64 100644
--- a/platform-logic/vnfapi/src/main/json/generate-subnets-subnet-id.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_generate-subnets-subnet-id.json
diff --git a/platform-logic/vnfapi/src/main/json/network-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json
index 351376ec..351376ec 100644
--- a/platform-logic/vnfapi/src/main/json/network-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-assign.json
diff --git a/platform-logic/vnfapi/src/main/json/network-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json
index 5a3beb49..5a3beb49 100644
--- a/platform-logic/vnfapi/src/main/json/network-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-changeassign.json
diff --git a/platform-logic/vnfapi/src/main/json/network-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json
index 3c2ca1dd..3c2ca1dd 100644
--- a/platform-logic/vnfapi/src/main/json/network-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-delete.json
diff --git a/platform-logic/vnfapi/src/main/json/network-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json
index edffef6d..edffef6d 100644
--- a/platform-logic/vnfapi/src/main/json/network-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/network-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json
index 6ba2b668..6ba2b668 100644
--- a/platform-logic/vnfapi/src/main/json/network-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_network-topology-rollback.json
diff --git a/platform-logic/vnfapi/src/main/json/preload-network-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json
index e0701c9b..e0701c9b 100644
--- a/platform-logic/vnfapi/src/main/json/preload-network-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-network-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/preload-vf-module-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json
index d400658d..d400658d 100644
--- a/platform-logic/vnfapi/src/main/json/preload-vf-module-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vf-module-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/preload-vnf-instance-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json
index fca4005a..fca4005a 100644
--- a/platform-logic/vnfapi/src/main/json/preload-vnf-instance-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-instance-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/preload-vnf-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json
index e0390357..e0390357 100644
--- a/platform-logic/vnfapi/src/main/json/preload-vnf-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_preload-vnf-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-activate.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json
index 7d875a87..7d875a87 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-activate.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-activate.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-assign-vnf-networks.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json
index 15e63adf..15e63adf 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-assign-vnf-networks.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign-vnf-networks.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json
index 46afa880..46afa880 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-assign.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json
index d12a01cb..d12a01cb 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-changeassign.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json
index 66fbf719..66fbf719 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-delete.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json
index 1acb0fdb..1acb0fdb 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/vf-module-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json
index 85e05a5d..85e05a5d 100644
--- a/platform-logic/vnfapi/src/main/json/vf-module-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vf-module-topology-rollback.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-activate.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json
index 5e025e36..5e025e36 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-activate.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-activate.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-assign-vnf-networks.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json
index 577b7513..577b7513 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-assign-vnf-networks.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign-vnf-networks.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json
index cccd771d..cccd771d 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-assign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-assign.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json
index 4f583970..4f583970 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-changeassign.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json
index edca37e5..edca37e5 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-delete.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-delete.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json
index b82bb884..b82bb884 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-operation.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-operation.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json
index e9d9dc45..e9d9dc45 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-instance-topology-rollback.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-instance-topology-rollback.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-activate.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json
index 87f11f2c..87f11f2c 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-activate.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-activate.json
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-assign-vfmodule.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json
index 6bdfc895..6bdfc895 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-assign-vfmodule.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign-vfmodule.json
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json
new file mode 100644
index 00000000..c681ab9b
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-assign.json
@@ -0,0 +1 @@
+[{"id":"6b847111.14518","type":"dgstart","name":"DGSTART","outputs":1,"x":138,"y":100,"z":"f6aa4435.0ea2a8","wires":[["e8032bdd.c514c8"]]},{"id":"e8032bdd.c514c8","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":252,"y":160,"z":"f6aa4435.0ea2a8","wires":[["efc24499.7db518"]]},{"id":"efc24499.7db518","type":"method","name":"method vnf-topology-assign","xml":"<method rpc='vnf-topology-assign' mode='sync'>\n","comments":"","outputs":1,"x":254.5,"y":220,"z":"f6aa4435.0ea2a8","wires":[["291cc045.48f06"]]},{"id":"291cc045.48f06","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":292,"y":280,"z":"f6aa4435.0ea2a8","wires":[["79076789.383708","d3435702.674a18","53b3c202.b3d34c","6511ce13.6b3e7","b261bb64.7dc868","730a4402.7a9fec","cc1eb17.357f85","ec4234b5.37aa58","e1123f17.441d3"]]},{"id":"79076789.383708","type":"set","name":"set: order-status = PendingCreate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingCreate\"/>","comments":"","x":594.5,"y":640,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"d3435702.674a18","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":533.5,"y":720,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"3098b2d1.15998e","type":"comment","name":"request-action = VNFActivateRequest","info":"","comments":"","x":222,"y":60,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"404b9c45.b090b4","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":890,"y":600,"z":"f6aa4435.0ea2a8","wires":[["44680508.69c9cc"]]},{"id":"76ee352d.d7924c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"Encountered error while updating vf-module orchestration-status in AnAI\"/>","comments":"","x":1268.5,"y":600,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"e68cdc52.c407d","type":"save","name":"save relationship: l3-network","xml":"<save plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />","comments":"","outputs":1,"x":918,"y":480,"z":"f6aa4435.0ea2a8","wires":[["37286e8d.29b9f2"]]},{"id":"37286e8d.29b9f2","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":890,"y":520,"z":"f6aa4435.0ea2a8","wires":[["44f17fbc.617ed"]]},{"id":"53b3c202.b3d34c","type":"for","name":"for i : SERVICE_DATA vnf-networks","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":600,"y":480,"z":"f6aa4435.0ea2a8","wires":[["e68cdc52.c407d"]]},{"id":"749c3a93.be4684","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\"/>","comments":"","x":1268.5,"y":560,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"44f17fbc.617ed","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":1052,"y":520,"z":"f6aa4435.0ea2a8","wires":[["a2a13f6d.2a0c8","749c3a93.be4684"]]},{"id":"a2a13f6d.2a0c8","type":"save","name":"delete vf-module: l3-network relationship","xml":"<delete plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":1355.5,"y":520,"z":"f6aa4435.0ea2a8","wires":[[]]},{"id":"6511ce13.6b3e7","type":"save","name":"update AnAI - vf-module.orchestration-status","xml":"<update plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />","comments":"","outputs":1,"x":628.5,"y":600,"z":"f6aa4435.0ea2a8","wires":[["404b9c45.b090b4"]]},{"id":"44680508.69c9cc","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":1049.5,"y":600,"z":"f6aa4435.0ea2a8","wires":[["76ee352d.d7924c","a2a13f6d.2a0c8"]]},{"id":"b261bb64.7dc868","type":"call","name":"call: vnf-topology-assign-vfmodule","xml":"<call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' >","comments":"","outputs":1,"x":594.5,"y":400,"z":"f6aa4435.0ea2a8","wires":[[]]},{"id":"730a4402.7a9fec","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":558.5,"y":680,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"cc1eb17.357f85","type":"switchNode","name":"switch ...SERVICE-DATA vnf-networks[]","xml":"<switch test=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":612.5,"y":440,"z":"f6aa4435.0ea2a8","wires":[["e9379e9d.985f7"]]},{"id":"e9379e9d.985f7","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":850,"y":440,"z":"f6aa4435.0ea2a8","wires":[["be746643.61ac78"]]},{"id":"be746643.61ac78","type":"set","name":"set SERVICE-DATA vnf-networks[] = 0","xml":"<set>\n<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />\n","comments":"","x":1088,"y":440,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"ec4234b5.37aa58","type":"save","name":"GET AnAI - vf-module","xml":"<get-resource plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >","comments":"","outputs":1,"x":557.5,"y":340,"z":"f6aa4435.0ea2a8","wires":[["1080e2bd.3bc8dd","573755d9.256a8c"]]},{"id":"1080e2bd.3bc8dd","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":790,"y":320,"z":"f6aa4435.0ea2a8","wires":[["5f7a62b3.c0435c"]]},{"id":"573755d9.256a8c","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":798.5,"y":360,"z":"f6aa4435.0ea2a8","wires":[["b3b13d2d.da245"]]},{"id":"5f7a62b3.c0435c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":988.5,"y":320,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"b3b13d2d.da245","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":988.5,"y":360,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"e1123f17.441d3","type":"switchNode","name":"switch:vnf-id | config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":579.8333129882812,"y":280.00001335144043,"z":"f6aa4435.0ea2a8","wires":[["3a4715d4.547d2a"]]},{"id":"2730cc09.74d084","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value='vnf-id is already present in config-tree'/>","comments":"","x":988.5,"y":280,"z":"f6aa4435.0ea2a8","wires":[]},{"id":"3a4715d4.547d2a","type":"outcomeTrue","name":"true","xml":"<outcome value='true'>\n","comments":"","outputs":1,"x":790,"y":280,"z":"f6aa4435.0ea2a8","wires":[["2730cc09.74d084"]]}]
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-changeassign.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json
index 5c4b03cc..5c4b03cc 100644
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-changeassign.json
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changeassign.json
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json
new file mode 100644
index 00000000..d2eee089
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-changedelete.json
@@ -0,0 +1 @@
+[{"id":"793c9be.5fc6b64","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":268.7654113769531,"y":201.6666717529297,"z":"3dd6ebc6.a724f4","wires":[["7a4e0a99.334ed4","e4ca79b3.d28a88","1cd82265.55c3be","3ae9090d.f22816","dec0e9d5.73e028","d825c0c4.1d4a1","407cc4f8.57aaec","af3c9c59.5186d"]]},{"id":"4d73e6f.4df7218","type":"method","name":"method vnf-topology-changedelete","xml":"<method rpc='vnf-topology-changedelete' mode='sync'>\n","comments":"","outputs":1,"x":329.4320983886719,"y":127.83333683013916,"z":"3dd6ebc6.a724f4","wires":[["793c9be.5fc6b64"]]},{"id":"7a4e0a99.334ed4","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"'$service-data.oper-status.order-status == Active'\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":564.0987243652344,"y":259.9998321533203,"z":"3dd6ebc6.a724f4","wires":[["ce1b152f.c5c3d8"]]},{"id":"20352e7f.4c6aa2","type":"service-logic","name":"VNF-API 2.2.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":399.43206787109375,"y":81.83334445953369,"z":"3dd6ebc6.a724f4","wires":[["4d73e6f.4df7218"]]},{"id":"ce1b152f.c5c3d8","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":784.4320983886719,"y":260.33314514160156,"z":"3dd6ebc6.a724f4","wires":[["ba2b0430.95ba08"]]},{"id":"6ebec187.42b24","type":"dgstart","name":"DGSTART","outputs":1,"x":236.26541137695312,"y":81.666672706604,"z":"3dd6ebc6.a724f4","wires":[["20352e7f.4c6aa2"]]},{"id":"ba2b0430.95ba08","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid last-order-status'/>","comments":"","x":943.7652282714844,"y":260.33319091796875,"z":"3dd6ebc6.a724f4","wires":[]},{"id":"e4ca79b3.d28a88","type":"set","name":"set: order-status = PendingDelete","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingDelete\"/>","comments":"","x":579.265380859375,"y":421.66664123535156,"z":"3dd6ebc6.a724f4","wires":[[]]},{"id":"1cd82265.55c3be","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />\n","comments":"","x":525.2654113769531,"y":588.6666412353516,"z":"3dd6ebc6.a724f4","wires":[]},{"id":"edf99f91.a8ecc","type":"comment","name":"Update VNF status to PendingDelete","info":"","comments":"","x":1137.5987854003906,"y":72.55556964874268,"z":"3dd6ebc6.a724f4","wires":[]},{"id":"b076f9c8.0ae248","type":"comment","name":"VNF-TOPOLOGY-CHANGEDELETE","info":"","comments":"","x":833.1543121337891,"y":72.22222900390625,"z":"3dd6ebc6.a724f4","wires":[]},{"id":"2780acb6.663784","type":"comment","name":"request-action = DisconnectVNFRequest, svc-action = changedelete","info":"","comments":"","x":966.0431518554688,"y":108.3333387374878,"z":"3dd6ebc6.a724f4","wires":[]},{"id":"d825c0c4.1d4a1","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":522.2654113769531,"y":475.66664123535156,"z":"3dd6ebc6.a724f4","wires":[[]]},{"id":"3ae9090d.f22816","type":"switchNode","name":"switch:vnf-id   config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":561.4018096923828,"y":202.8586196899414,"z":"3dd6ebc6.a724f4","wires":[["34619221.3001ae"]]},{"id":"34619221.3001ae","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":783.8563232421875,"y":203.04042434692383,"z":"3dd6ebc6.a724f4","wires":[["eb0b61e2.b88"]]},{"id":"eb0b61e2.b88","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":941.9472274780273,"y":202.94952201843262,"z":"3dd6ebc6.a724f4","wires":[]},{"id":"dec0e9d5.73e028","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":584.4017639160156,"y":370.8585968017578,"z":"3dd6ebc6.a724f4","wires":[[]]},{"id":"407cc4f8.57aaec","type":"set","name":"set: service-data = input","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" /> \n","comments":"","x":553.4017639160156,"y":529.8585357666016,"z":"3dd6ebc6.a724f4","wires":[[]]},{"id":"af3c9c59.5186d","type":"save","name":"update generic-vnf status to pending-delete","xml":"<update plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-delete\" />\n","comments":"","outputs":1,"x":611.7352142333984,"y":315.85854721069336,"z":"3dd6ebc6.a724f4","wires":[[]]}]
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json
new file mode 100644
index 00000000..701c8817
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-delete.json
@@ -0,0 +1 @@
+[{"id":"708f9f60.b1b","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":425.4320831298828,"y":578.3055973052979,"z":"730f50c9.364a4","wires":[]},{"id":"237e95c1.a3bd4a","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":202.4320297241211,"y":171.8888864517212,"z":"730f50c9.364a4","wires":[["989753b1.14334","708f9f60.b1b","af6f4fd2.ed4a","edddc577.9baf38","5e0a89d0.58c1a8","8e21b6e.34d7548","19c37308.a9d61d","d46e73ef.6e8c1"]]},{"id":"989753b1.14334","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":466.4320831298828,"y":405.30559730529785,"z":"730f50c9.364a4","wires":[]},{"id":"39154674.c0751a","type":"method","name":"method vnf-topology-delete","xml":"<method rpc='vnf-topology-delete' mode='sync'>\n","comments":"","outputs":1,"x":234.09871673583984,"y":121.05555057525635,"z":"730f50c9.364a4","wires":[["237e95c1.a3bd4a"]]},{"id":"33be7113.0fa75e","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":350.7653503417969,"y":69.05556106567383,"z":"730f50c9.364a4","wires":[["39154674.c0751a"]]},{"id":"fb046bf4.0e07e8","type":"dgstart","name":"DGSTART","outputs":1,"x":140.9320297241211,"y":68.88888645172119,"z":"730f50c9.364a4","wires":[["33be7113.0fa75e"]]},{"id":"14ee4185.d94a2e","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1129.356357574463,"y":253.3510227203369,"z":"730f50c9.364a4","wires":[["95ad750b.27f1e8"]]},{"id":"95ad750b.27f1e8","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1281.6894874572754,"y":253.35108375549316,"z":"730f50c9.364a4","wires":[]},{"id":"5e0a89d0.58c1a8","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":427.68968200683594,"y":448.8511905670166,"z":"730f50c9.364a4","wires":[]},{"id":"af6f4fd2.ed4a","type":"switchNode","name":"switch:vnf-id   config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":471.575927734375,"y":171.37643146514893,"z":"730f50c9.364a4","wires":[["fd98c370.2db85"]]},{"id":"fd98c370.2db85","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":673.0304870605469,"y":171.55825901031494,"z":"730f50c9.364a4","wires":[["957a2f6d.be384"]]},{"id":"957a2f6d.be384","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":836.6214065551758,"y":171.71735954284668,"z":"730f50c9.364a4","wires":[]},{"id":"edddc577.9baf38","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":492.82603454589844,"y":364.04314613342285,"z":"730f50c9.364a4","wires":[]},{"id":"8e21b6e.34d7548","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","x":436.82603454589844,"y":489.04314613342285,"z":"730f50c9.364a4","wires":[]},{"id":"d113d476.f18958","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">","comments":"","outputs":1,"x":927.5392570495605,"y":253.65082359313965,"z":"730f50c9.364a4","wires":[["14ee4185.d94a2e"]]},{"id":"d46e73ef.6e8c1","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":448.14640045166016,"y":534.2460708618164,"z":"730f50c9.364a4","wires":[]},{"id":"19c37308.a9d61d","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":480.4320831298828,"y":253.97222518920898,"z":"730f50c9.364a4","wires":[["2a5a8a8e.704016"]]},{"id":"a7341ebe.65182","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":712.1820793151855,"y":301.6150789260864,"z":"730f50c9.364a4","wires":[["707c532.d07baac"]]},{"id":"707c532.d07baac","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":909.1821212768555,"y":301.72224712371826,"z":"730f50c9.364a4","wires":[["e4a6dc7f.9a579","75bd2a98.3f43e4"]]},{"id":"2a5a8a8e.704016","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":711.6821403503418,"y":253.72223949432373,"z":"730f50c9.364a4","wires":[["d113d476.f18958"]]},{"id":"e4a6dc7f.9a579","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1104.1820678710938,"y":302.4722204208374,"z":"730f50c9.364a4","wires":[["6afa8d4b.3fc5e4"]]},{"id":"6afa8d4b.3fc5e4","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Either aic-cloud-region or aic-clli must be present'/>","comments":"","x":1276.6820678710938,"y":302.9722204208374,"z":"730f50c9.364a4","wires":[]},{"id":"75bd2a98.3f43e4","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1105.4320678710938,"y":344.9722204208374,"z":"730f50c9.364a4","wires":[["ea02cba4.399b88"]]},{"id":"a2aea115.0a314","type":"save","name":"delete generic-vnf-l3-network","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-l3-network\" \n\tkey=\"DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1227.9320983886719,"y":467.472243309021,"z":"730f50c9.364a4","wires":[["f95d56cc.7fed28"]]},{"id":"6635778e.a76f48","type":"save","name":"delete GammaResource: generic-vnf","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf\" \n\tkey=\"DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id\" \n\tlocal-only=\"true\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1251.5912628173828,"y":553.8435049057007,"z":"730f50c9.364a4","wires":[["f95d56cc.7fed28"]]},{"id":"7f88cb67.0cb8a4","type":"save","name":"delete generic-vnf-vserver","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-vserver\" \n\tkey=\"DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1219.3412628173828,"y":508.9267873764038,"z":"730f50c9.364a4","wires":[["f95d56cc.7fed28"]]},{"id":"7a91b73a.5b45a8","type":"switchNode","name":"switch: order-status = PendingDelete","xml":"<switch test=\"'$service-data.oper-status.order-status == PendingDelete'\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":1251.1820831298828,"y":425.72222805023193,"z":"730f50c9.364a4","wires":[["77eb7904.f9f168"]]},{"id":"77eb7904.f9f168","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1480.5154571533203,"y":426.0555410385132,"z":"730f50c9.364a4","wires":[["4fba8967.330558"]]},{"id":"4fba8967.330558","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1632.8485870361328,"y":426.05560207366943,"z":"730f50c9.364a4","wires":[]},{"id":"ea02cba4.399b88","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":997.9320678710938,"y":425.9722204208374,"z":"730f50c9.364a4","wires":[["a2aea115.0a314","6635778e.a76f48","7f88cb67.0cb8a4","7b46fa5d.f08144"]]},{"id":"f95d56cc.7fed28","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1514.1820678710938,"y":508.4722204208374,"z":"730f50c9.364a4","wires":[["640275aa.06b0bc"]]},{"id":"640275aa.06b0bc","type":"set","name":"set: error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource\"/>","comments":"","x":1696.6820907592773,"y":508.47222900390625,"z":"730f50c9.364a4","wires":[]},{"id":"7b46fa5d.f08144","type":"save","name":"delete AnAI: generic-vnf","xml":"<delete plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\tkey=\"generic-vnf.vnf-id = $service-data.vnf-id\" \n\tlocal-only=\"false\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1211.0432662963867,"y":598.2222328186035,"z":"730f50c9.364a4","wires":[["4fdd37a6.2bc6e8"]]},{"id":"4fdd37a6.2bc6e8","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1403.0228729248047,"y":598.3509359359741,"z":"730f50c9.364a4","wires":[["39c806b9.27c7ca"]]},{"id":"39c806b9.27c7ca","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Failed to delete generic-vnf from AnAI with vnf-id = '+ $service-data.vnf-id`\"/>","comments":"","x":1561.1893997192383,"y":598.4343166351318,"z":"730f50c9.364a4","wires":[]},{"id":"532716cb.365f68","type":"comment","name":"NOT checking order-status intentionally","info":"","comments":"","x":1355.4320831298828,"y":389.9722261428833,"z":"730f50c9.364a4","wires":[]},{"id":"5a7a473b.e0aa98","type":"comment","name":"Removing check for aic-cllu in 1707","info":"ks220y: Confirmed with Pat Cheung, as MSO won't send aic-clli","comments":"","x":798.7222595214844,"y":340.0000162124634,"z":"730f50c9.364a4","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json
new file mode 100644
index 00000000..993816c6
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-operation.json
@@ -0,0 +1 @@
+[{"id":"ad31faf8.a28e58","type":"dgstart","name":"DGSTART","outputs":1,"x":130.98763275146484,"y":74.8147964477539,"z":"ff75fb1b.407f18","wires":[["7839f2b5.31b63c"]]},{"id":"7839f2b5.31b63c","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":338.59873962402344,"y":75.59258079528809,"z":"ff75fb1b.407f18","wires":[["58b89b27.381414"]]},{"id":"58b89b27.381414","type":"method","name":"vnf-topology-operation","xml":"<method rpc='vnf-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":188.4876251220703,"y":117.03701591491699,"z":"ff75fb1b.407f18","wires":[["69f2c20a.e2c48c"]]},{"id":"2fcb889f.9b6a98","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\";  // equal to commit\n\t\tenum \"delete\";\t  // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":382.5431823730469,"y":748.1480579376221,"z":"ff75fb1b.407f18","wires":[["4c7d728.daa808c","41c57d1b.576a84","94d2e486.6f3448","e32f59bc.c90dc8","27d581c1.a421ae","ae4934b6.9b4a38"]]},{"id":"4c7d728.daa808c","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":598.1265411376953,"y":1164.898217201233,"z":"ff75fb1b.407f18","wires":[["14f2f153.53b29f"]]},{"id":"41c57d1b.576a84","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":600.0987396240234,"y":748.148063659668,"z":"ff75fb1b.407f18","wires":[["95b724e4.ed2158"]]},{"id":"14f2f153.53b29f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":770.1265411376953,"y":1164.898217201233,"z":"ff75fb1b.407f18","wires":[]},{"id":"94d2e486.6f3448","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":603.0987548828125,"y":837.3980522155762,"z":"ff75fb1b.407f18","wires":[["45ea3d3b.526244"]]},{"id":"e32f59bc.c90dc8","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":602.8487548828125,"y":879.6480531692505,"z":"ff75fb1b.407f18","wires":[["66620bb3.131634"]]},{"id":"ae4934b6.9b4a38","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":621.5987548828125,"y":793.6480541229248,"z":"ff75fb1b.407f18","wires":[["844e3292.c9273"]]},{"id":"27d581c1.a421ae","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":599.2098999023438,"y":1118.509292602539,"z":"ff75fb1b.407f18","wires":[["908aef41.2bc07"]]},{"id":"92788477.fe9ef8","type":"call","name":"call: vnf-topology-assign","xml":"<call module='VNF-API' rpc='vnf-topology-assign' mode='sync' >","comments":"","outputs":1,"x":992.3487396240234,"y":748.1480617523193,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"4abd40bf.58d05","type":"other","name":"changedelete","xml":"<outcome value='changedelete'>","comments":"","outputs":1,"x":619.8487854003906,"y":977.3980617523193,"z":"ff75fb1b.407f18","wires":[["3f04da90.5ddb46"]]},{"id":"6fb62f48.45eaa","type":"call","name":"call: vnf-topology-changeassign","xml":"<call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":1015.5988616943359,"y":792.1480617523193,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"637b797f.c31418","type":"call","name":"call: vnf-topology-rollback","xml":"<call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":997.3488616943359,"y":879.648063659668,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"908aef41.2bc07","type":"call","name":"call: vnf-topology-delete","xml":"<call module='VNF-API' rpc='vnf-topology-delete' mode='sync' >","comments":"","outputs":1,"x":807.9599685668945,"y":1118.5092935562134,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"e7fd424d.8e73e","type":"call","name":"call: vnf-topology-activate","xml":"<call module='VNF-API' rpc='vnf-topology-activate' mode='sync' >","comments":"","outputs":1,"x":996.8488540649414,"y":836.6480574607849,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"941ba26c.5a73a","type":"call","name":"call: vnf-topology-changedelete","xml":"<call module='VNF-API' rpc='vnf-topology-changedelete' mode='sync' >","comments":"","outputs":1,"x":1002.3488693237305,"y":1068.398063659668,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"c7fed43a.1fdfc8","type":"record","name":"record","xml":"<record plugin=\"com.att.sdnctl.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"svc-topology-operation\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\"/>\n<parameter name=\"field4\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field5\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field6\" value=\"`$vnf-topology-operation-input.request-information.request-id`\"/>\n<parameter name=\"field7\" value=\"`$vnf-topology-operation-input.request-information.request-action`\"/>\n<parameter name=\"field8\" value=\"`$vnf-topology-operation-input.request-information.source`\"/>\n<parameter name=\"field9\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\"/>\n<parameter name=\"field10\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\"/>\n<parameter name=\"field11\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\"/>\n<parameter name=\"field12\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\"/>\n<parameter name=\"field13\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\"/>\n<parameter name=\"field14\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>\n<parameter name=\"field15\" value=\"`$vnf-topology-operation-input.vnf-request-information.tenant`\"/>\n<parameter name=\"field16\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\"/>\n<parameter name=\"field17\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\"/>\n<parameter name=\"field18\" value=\"`$preload-data.oper-status.order-status`\"/>","comments":"","outputs":1,"x":352.54320526123047,"y":162.70369148254395,"z":"ff75fb1b.407f18","wires":[[]]},{"id":"3966d205.46131e","type":"comment","name":"vnf-topology-operation","info":"","comments":"","x":593.8765106201172,"y":97.25924110412598,"z":"ff75fb1b.407f18","wires":[]},{"id":"69f2c20a.e2c48c","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":187.98764038085938,"y":162.8148021697998,"z":"ff75fb1b.407f18","wires":[["c7fed43a.1fdfc8","1aa071dd.7189ce","6f227892.2f2f88","2fcb889f.9b6a98","c7a5bb34.6cd898"]]},{"id":"1aa071dd.7189ce","type":"switchNode","name":"switch: INPUT vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\">","comments":"","outputs":1,"x":405.2098617553711,"y":207.25922966003418,"z":"ff75fb1b.407f18","wires":[["2f137f03.276d1","8b5d3318.12e65"]]},{"id":"2f137f03.276d1","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":619.2098617553711,"y":207.25922966003418,"z":"ff75fb1b.407f18","wires":[["cd2548e7.eb45e8"]]},{"id":"8b5d3318.12e65","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":620.2098617553711,"y":243.25922966003418,"z":"ff75fb1b.407f18","wires":[["b81ede1a.26023"]]},{"id":"cd2548e7.eb45e8","type":"switchNode","name":"switch: PRELOAD vnf-name","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":830.2098617553711,"y":207.25922966003418,"z":"ff75fb1b.407f18","wires":[["4b33c019.d78c4","28683154.b197be"]]},{"id":"4b33c019.d78c4","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1041.209861755371,"y":207.25922966003418,"z":"ff75fb1b.407f18","wires":[["d4df4bf7.d45898"]]},{"id":"28683154.b197be","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1042.209861755371,"y":242.25922966003418,"z":"ff75fb1b.407f18","wires":[["9127a6c0.5f3948"]]},{"id":"d4df4bf7.d45898","type":"switchNode","name":"switch: vnf-name INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":1289.209846496582,"y":207.25922775268555,"z":"ff75fb1b.407f18","wires":[["f61177d2.0496e8"]]},{"id":"f61177d2.0496e8","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1535.543212890625,"y":206.9261302947998,"z":"ff75fb1b.407f18","wires":[["ee53ce5d.f0c37"]]},{"id":"ee53ce5d.f0c37","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-name not found in preload-data'/>","comments":"","x":1694.2098388671875,"y":206.25922966003418,"z":"ff75fb1b.407f18","wires":[]},{"id":"9127a6c0.5f3948","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-name'/>","comments":"","x":1209.209861755371,"y":242.25922966003418,"z":"ff75fb1b.407f18","wires":[]},{"id":"b81ede1a.26023","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-name is required'/>","comments":"","x":781.7098617553711,"y":243.50922966003418,"z":"ff75fb1b.407f18","wires":[]},{"id":"6f227892.2f2f88","type":"switchNode","name":"switch: INPUT vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\">","comments":"","outputs":1,"x":401.2098922729492,"y":295.2592296600342,"z":"ff75fb1b.407f18","wires":[["24c9f125.fdc50e","f3899ce.dbbc36"]]},{"id":"24c9f125.fdc50e","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":618.2098846435547,"y":296.2592296600342,"z":"ff75fb1b.407f18","wires":[["bf94b69b.d80c18"]]},{"id":"f3899ce.dbbc36","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":619.2098846435547,"y":332.2592296600342,"z":"ff75fb1b.407f18","wires":[["a714f3a7.3c79"]]},{"id":"bf94b69b.d80c18","type":"switchNode","name":"switch: PRELOAD vnf-type","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":829.2098846435547,"y":296.2592296600342,"z":"ff75fb1b.407f18","wires":[["7068bd84.42cb04","27c908db.2eaf38"]]},{"id":"7068bd84.42cb04","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1040.2098846435547,"y":296.2592296600342,"z":"ff75fb1b.407f18","wires":[["8804e415.3ac678"]]},{"id":"27c908db.2eaf38","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1041.2098846435547,"y":331.2592296600342,"z":"ff75fb1b.407f18","wires":[["1b9c23ac.bcc3dc"]]},{"id":"a714f3a7.3c79","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-type is required'/>","comments":"","x":780.7098846435547,"y":332.5092296600342,"z":"ff75fb1b.407f18","wires":[]},{"id":"8804e415.3ac678","type":"switchNode","name":"switch: vnf-type INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":1288.209861755371,"y":296.2592296600342,"z":"ff75fb1b.407f18","wires":[["57646a93.6e2a94"]]},{"id":"1b9c23ac.bcc3dc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-type'/>","comments":"","x":1208.209861755371,"y":331.2592296600342,"z":"ff75fb1b.407f18","wires":[]},{"id":"57646a93.6e2a94","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1537.209861755371,"y":296.5927257537842,"z":"ff75fb1b.407f18","wires":[["3f123004.958b6"]]},{"id":"3f123004.958b6","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-type not found in preload-data'/>","comments":"","x":1695.8764877319336,"y":295.92582511901855,"z":"ff75fb1b.407f18","wires":[]},{"id":"c7a5bb34.6cd898","type":"switchNode","name":"switch: INPUT vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\">","comments":"","outputs":1,"x":393.88853454589844,"y":389.7235565185547,"z":"ff75fb1b.407f18","wires":[["cbbf2f4c.136ff","e7b44032.17a4b"]]},{"id":"e7b44032.17a4b","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":576.8885040283203,"y":426.86639404296875,"z":"ff75fb1b.407f18","wires":[["178f1e70.b638e2"]]},{"id":"cbbf2f4c.136ff","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":576.0314331054688,"y":389.2949924468994,"z":"ff75fb1b.407f18","wires":[["178f1e70.b638e2"]]},{"id":"178f1e70.b638e2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/>","comments":"","x":751.7457122802734,"y":427.15211486816406,"z":"ff75fb1b.407f18","wires":[]},{"id":"7d79781f.255938","type":"switchNode","name":"switch: INPUT generic-vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\">","comments":"","outputs":1,"x":1199.959945678711,"y":491.00926303863525,"z":"ff75fb1b.407f18","wires":[["a8b4aed2.c3f36","943e63b4.ef736"]]},{"id":"943e63b4.ef736","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1432.9599151611328,"y":529.1521005630493,"z":"ff75fb1b.407f18","wires":[["35237646.800b2a"]]},{"id":"a8b4aed2.c3f36","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":1432.1028442382812,"y":491.58069896698,"z":"ff75fb1b.407f18","wires":[["35237646.800b2a"]]},{"id":"35237646.800b2a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/>","comments":"","x":1586.817123413086,"y":529.4378213882446,"z":"ff75fb1b.407f18","wires":[]},{"id":"5ed2eb67.b75164","type":"switchNode","name":"switch: INPUT generic-vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\">","comments":"","outputs":1,"x":1211.709945678711,"y":572.0092630386353,"z":"ff75fb1b.407f18","wires":[["9baa7b10.895288"]]},{"id":"9baa7b10.895288","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1429.7099151611328,"y":572.1521005630493,"z":"ff75fb1b.407f18","wires":[["172388cf.fdcde7"]]},{"id":"172388cf.fdcde7","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-name cannot be NULL'/>","comments":"","x":1583.567123413086,"y":572.4378213882446,"z":"ff75fb1b.407f18","wires":[]},{"id":"b8d6328.88dfed","type":"switchNode","name":"switch: INPUT generic-vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\">","comments":"","outputs":1,"x":1205.959945678711,"y":616.0092630386353,"z":"ff75fb1b.407f18","wires":[["237a1c70.276ac4"]]},{"id":"237a1c70.276ac4","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1423.9599151611328,"y":616.1521005630493,"z":"ff75fb1b.407f18","wires":[["35171a5b.eb7476"]]},{"id":"35171a5b.eb7476","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-type cannot be NULL'/>","comments":"","x":1577.817123413086,"y":616.4378213882446,"z":"ff75fb1b.407f18","wires":[]},{"id":"fe5797fc.3d36a8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":969.4877700805664,"y":490.56486320495605,"z":"ff75fb1b.407f18","wires":[["7d79781f.255938","5ed2eb67.b75164","b8d6328.88dfed","22a28b74.3c5684"]]},{"id":"45ea3d3b.526244","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":751.4876480102539,"y":836.8148059844971,"z":"ff75fb1b.407f18","wires":[["fe5797fc.3d36a8","e7fd424d.8e73e"]]},{"id":"844e3292.c9273","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":780.2376480102539,"y":793.0648059844971,"z":"ff75fb1b.407f18","wires":[["fe5797fc.3d36a8","6fb62f48.45eaa"]]},{"id":"66620bb3.131634","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":752.7376480102539,"y":879.3148069381714,"z":"ff75fb1b.407f18","wires":[["637b797f.c31418","fe5797fc.3d36a8"]]},{"id":"95b724e4.ed2158","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":770.2376480102539,"y":748.0648078918457,"z":"ff75fb1b.407f18","wires":[["fe5797fc.3d36a8","92788477.fe9ef8"]]},{"id":"9057cec1.f752e","type":"comment","name":"changedelete is for 1604 VNF ONLY","info":"","comments":"","x":1056.987648010254,"y":928.5648097991943,"z":"ff75fb1b.407f18","wires":[]},{"id":"22a28b74.3c5684","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1205.237648010254,"y":658.5648078918457,"z":"ff75fb1b.407f18","wires":[["b4a1c947.515b78"]]},{"id":"b4a1c947.515b78","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1423.2376174926758,"y":658.7076454162598,"z":"ff75fb1b.407f18","wires":[["a83bc57.8cd4238"]]},{"id":"a83bc57.8cd4238","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":1577.094825744629,"y":658.9933662414551,"z":"ff75fb1b.407f18","wires":[]},{"id":"26d86665.a6ecca","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1000.7376518249512,"y":977.8148097991943,"z":"ff75fb1b.407f18","wires":[["4d8403aa.79275c"]]},{"id":"4d8403aa.79275c","type":"outcome","name":"other","xml":"<outcome value='other'>","comments":"","outputs":1,"x":1218.737621307373,"y":977.9576473236084,"z":"ff75fb1b.407f18","wires":[["6dc15274.5eef5c"]]},{"id":"6dc15274.5eef5c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1372.5948295593262,"y":978.2433681488037,"z":"ff75fb1b.407f18","wires":[]},{"id":"63c1d36f.afccbc","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":970.7376708984375,"y":1021.3148241043091,"z":"ff75fb1b.407f18","wires":[["c88d7ce8.74bd4"]]},{"id":"c88d7ce8.74bd4","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1152.7376403808594,"y":1021.4576616287231,"z":"ff75fb1b.407f18","wires":[["be943b75.307c28"]]},{"id":"be943b75.307c28","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1306.5948486328125,"y":1021.7433824539185,"z":"ff75fb1b.407f18","wires":[]},{"id":"3f04da90.5ddb46","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":781.9876518249512,"y":977.5648097991943,"z":"ff75fb1b.407f18","wires":[["26d86665.a6ecca","63c1d36f.afccbc","941ba26c.5a73a"]]},{"id":"6dc7ab88.aec594","type":"comment","name":"Removing outcome for changeDelete in 1707","info":"ks220y: Confirmed with Pat Cheung, as MSO is not at all calling with this svc action","comments":"","x":714.3209228515625,"y":936.2963123321533,"z":"ff75fb1b.407f18","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json
new file mode 100644
index 00000000..3520747a
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/json/VNF-API_vnf-topology-rollback.json
@@ -0,0 +1 @@
+[{"id":"91e51a78.f2f898","type":"comment","name":"vnf-topology-rollback","info":"","comments":"","x":744.3209228515625,"y":66.54320526123047,"z":"da6e10f.d63acf","wires":[]},{"id":"cf768572.2720b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":167.79322814941406,"y":531.182092666626,"z":"da6e10f.d63acf","wires":[["38ee8eff.5172c2"]]},{"id":"685886bd.6497f8","type":"method","name":"method vnf-topology-rollback","xml":"<method rpc='vnf-topology-rollback' mode='sync'>\n","comments":"","outputs":1,"x":180.65435028076172,"y":125.26542377471924,"z":"da6e10f.d63acf","wires":[["e765cc09.203e5"]]},{"id":"9497dff0.cd216","type":"service-logic","name":"VNF-API ${project.version}","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":329.6543884277344,"y":77.15432167053223,"z":"da6e10f.d63acf","wires":[["685886bd.6497f8"]]},{"id":"bd68af1b.bf9c3","type":"dgstart","name":"DGSTART","outputs":1,"x":126.48766326904297,"y":77.09875869750977,"z":"da6e10f.d63acf","wires":[["9497dff0.cd216"]]},{"id":"cdbdf7d4.379e78","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":489.3766670227051,"y":447.2627954483032,"z":"da6e10f.d63acf","wires":[]},{"id":"c94fe78d.f21d78","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":526.2377548217773,"y":318.2627754211426,"z":"da6e10f.d63acf","wires":[]},{"id":"77ddff10.81a9e","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">","comments":"","outputs":1,"x":559.0786972045898,"y":232.39155769348145,"z":"da6e10f.d63acf","wires":[["1dbee524.28393b"]]},{"id":"1dbee524.28393b","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":790.6620788574219,"y":232.22486972808838,"z":"da6e10f.d63acf","wires":[["a0f6ee02.fe089"]]},{"id":"a0f6ee02.fe089","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":942.9952087402344,"y":232.22493076324463,"z":"da6e10f.d63acf","wires":[]},{"id":"712c6030.e56b2","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":487.9954490661621,"y":360.5583686828613,"z":"da6e10f.d63acf","wires":[]},{"id":"aa95e846.1b2478","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":779.3362731933594,"y":185.18211460113525,"z":"da6e10f.d63acf","wires":[["4527a17.6e2476"]]},{"id":"4527a17.6e2476","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`\"/>","comments":"","x":942.4270935058594,"y":185.59121799468994,"z":"da6e10f.d63acf","wires":[]},{"id":"9ab6d07b.bdd0c","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":552.8817977905273,"y":275.25032234191895,"z":"da6e10f.d63acf","wires":[]},{"id":"95a16bfa.1fed78","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","x":500.2707099914551,"y":404.2503433227539,"z":"da6e10f.d63acf","wires":[]},{"id":"52c9c127.4c5ea","type":"switchNode","name":"switch:CONFIG == INPUT - vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":548.4877548217773,"y":185.18211460113525,"z":"da6e10f.d63acf","wires":[["aa95e846.1b2478"]]},{"id":"38ee8eff.5172c2","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":275.2932357788086,"y":578.1265535354614,"z":"da6e10f.d63acf","wires":[["3321b25c.99345e"]]},{"id":"3321b25c.99345e","type":"other","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":511.54322814941406,"y":578.8765468597412,"z":"da6e10f.d63acf","wires":[[]]},{"id":"e765cc09.203e5","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":257.98773193359375,"y":184.4321117401123,"z":"da6e10f.d63acf","wires":[["52c9c127.4c5ea","77ddff10.81a9e","9ab6d07b.bdd0c","c94fe78d.f21d78","712c6030.e56b2","95a16bfa.1fed78","cdbdf7d4.379e78"]]},{"id":"a864c3f6.a048c","type":"comment","name":"request-action = VNFActivateRequest, svc-action = rollback","info":"","comments":"","x":755.7376708984375,"y":102.5432071685791,"z":"da6e10f.d63acf","wires":[]},{"id":"5b757381.4bc8ac","type":"comment","name":"Removing the redundent check","info":"ks220y: it's being checked at node 3","comments":"","x":217.65431213378906,"y":490.987642288208,"z":"da6e10f.d63acf","wires":[]}]
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-assign.json b/platform-logic/vnfapi/src/main/json/vnf-topology-assign.json
deleted file mode 100644
index 6e431987..00000000
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-assign.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-[{"id":"ffac9d92.2aaca","type":"dgstart","name":"DGSTART","outputs":1,"x":192.85714721679688,"y":78.57142639160156,"z":"c61f02a7.f710b","wires":[["cb8ca6c4.e37a28"]]},{"id":"cb8ca6c4.e37a28","type":"service-logic","name":"VNF-API 2.0.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":358.0238037109375,"y":78.73809814453125,"z":"c61f02a7.f710b","wires":[["5e434d1b.a4bf14"]]},{"id":"5e434d1b.a4bf14","type":"method","name":"method vnf-topology-assign","xml":"<method rpc='vnf-topology-assign' mode='sync'>\n","comments":"","outputs":1,"x":266.0238342285156,"y":125.73809051513672,"z":"c61f02a7.f710b","wires":[["d0de5a86.924be8"]]},{"id":"d0de5a86.924be8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","comments":"","outputs":1,"x":253.3571548461914,"y":181.57142639160156,"z":"c61f02a7.f710b","wires":[["1e8a3f5e.717d91","f514732f.8810c","d85c86c9.1e8a28","3fd98125.b3edde","ea24658e.334798","3868dfb4.d7723","954a9a87.8b91b8","69314bf3.7bab64"]]},{"id":"1e8a3f5e.717d91","type":"set","name":"set: order-status = PendingCreate","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingCreate\"/>","comments":"","outputs":1,"x":521.2479934692383,"y":602.7636432647705,"z":"c61f02a7.f710b","wires":[[]]},{"id":"f514732f.8810c","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":460.39083099365234,"y":688.4682750701904,"z":"c61f02a7.f710b","wires":[]},{"id":"9d55e492.693d48","type":"comment","name":"request-action = VNFActivateRequest","info":"","comments":"","x":700.023811340332,"y":98.68254089355469,"z":"c61f02a7.f710b","wires":[]},{"id":"8ef75230.30a75","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":818.2977523803711,"y":553.7861671447754,"z":"c61f02a7.f710b","wires":[["e8c4e2c.01b712"]]},{"id":"34349fb4.a298a","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"Encountered error while updating vf-module orchestration-status in AnAI\"/>","comments":"","x":1202.4406814575195,"y":553.7862377166748,"z":"c61f02a7.f710b","wires":[]},{"id":"64dd9984.c41aa8","type":"save","name":"save relationship: l3-network","xml":"<save plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\">\n\t\n\t<parameter name=\"relationship-list.relationship[0].related-to\" value=\"l3-network\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"l3-network.network-id\" />\n\t<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\" />","comments":"","outputs":1,"x":820.6032409667969,"y":396.6863851547241,"z":"c61f02a7.f710b","wires":[["df85f46a.a2a638"]]},{"id":"df85f46a.a2a638","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1033.2475128173828,"y":396.7333993911743,"z":"c61f02a7.f710b","wires":[["90ef1bbc.fcd5d8"]]},{"id":"d85c86c9.1e8a28","type":"for","name":"for i : SERVICE_DATA vnf-networks","xml":"<for index=\"i\" start=\"0\" end=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":526.2500457763672,"y":396.6548662185669,"z":"c61f02a7.f710b","wires":[["64dd9984.c41aa8"]]},{"id":"cab52ea5.e9d35","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`\"/>","comments":"","x":1202.2975769042969,"y":506.7497262954712,"z":"c61f02a7.f710b","wires":[]},{"id":"90ef1bbc.fcd5d8","type":"block","name":"block : atomic","xml":"<block atomic='true'>","atomic":"true","comments":"","outputs":1,"x":992.011962890625,"y":459.0355796813965,"z":"c61f02a7.f710b","wires":[["1f3d8f07.94f7b1","cab52ea5.e9d35"]]},{"id":"1f3d8f07.94f7b1","type":"save","name":"delete vf-module: l3-network relationship","xml":"<delete plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module:relationship-list\" \n\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\tAND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id \n\t\tAND related-to = l3-network\" \n\tforce=\"true\" \n\tlocal-only=\"false\">","comments":"","outputs":1,"x":1285.440559387207,"y":459.4643259048462,"z":"c61f02a7.f710b","wires":[[]]},{"id":"3fd98125.b3edde","type":"save","name":"update AnAI - vf-module.orchestration-status","xml":"<update plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-create\" />","comments":"","outputs":1,"x":553.7738952636719,"y":553.797664642334,"z":"c61f02a7.f710b","wires":[["8ef75230.30a75"]]},{"id":"e8c4e2c.01b712","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":976.7263259887695,"y":553.8929262161255,"z":"c61f02a7.f710b","wires":[["34349fb4.a298a","1f3d8f07.94f7b1"]]},{"id":"ea24658e.334798","type":"call","name":"call: vnf-topology-assign-vfmodule","xml":"<call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' >","comments":"","outputs":1,"x":520.5238342285156,"y":286.3214416503906,"z":"c61f02a7.f710b","wires":[[]]},{"id":"3868dfb4.d7723","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","outputs":1,"x":484.4286422729492,"y":647.8928623199463,"z":"c61f02a7.f710b","wires":[[]]},{"id":"954a9a87.8b91b8","type":"switchNode","name":"switch ...SERVICE-DATA vnf-networks[]","xml":"<switch test=\"`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`\">","comments":"","outputs":1,"x":538.6071929931641,"y":336.89287185668945,"z":"c61f02a7.f710b","wires":[["49274fc7.115de"]]},{"id":"49274fc7.115de","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":779.0516662597656,"y":336.42058181762695,"z":"c61f02a7.f710b","wires":[["b1bab9f3.5e4328"]]},{"id":"b1bab9f3.5e4328","type":"set","name":"set SERVICE-DATA vnf-networks[] = 0","xml":"<set>\n<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />\n","comments":"","outputs":1,"x":1000.607275221083,"y":336.4206024805703,"z":"c61f02a7.f710b","wires":[[]]},{"id":"69314bf3.7bab64","type":"save","name":"GET AnAI - vf-module","xml":"<get-resource plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"vf-module\" \n\t\tkey=\"vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id \n\t\t\tand generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id\" \n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.AnAI.vfmodule\" >","comments":"","outputs":1,"x":484.10716247558594,"y":181.07143688201904,"z":"c61f02a7.f710b","wires":[["7ddae686.7d9d48","4aa52b8f.fa62b4"]]},{"id":"7ddae686.7d9d48","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":678.1071624755859,"y":180.82143688201904,"z":"c61f02a7.f710b","wires":[["72bfa174.1630f"]]},{"id":"4aa52b8f.fa62b4","type":"not-found","name":"not-found","xml":"<outcome value='not-found'>\n","comments":"","outputs":1,"x":685.607177734375,"y":220.82144737243652,"z":"c61f02a7.f710b","wires":[["a517ff09.80f91"]]},{"id":"72bfa174.1630f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":832.3571624755859,"y":180.57143688201904,"z":"c61f02a7.f710b","wires":[]},{"id":"a517ff09.80f91","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>","comments":"","x":852.8571624755859,"y":221.07143688201904,"z":"c61f02a7.f710b","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-changedelete.json b/platform-logic/vnfapi/src/main/json/vnf-topology-changedelete.json
deleted file mode 100644
index aec54958..00000000
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-changedelete.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-[{"id":"acc7a1a9.a1048","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":202.5,"y":202.5,"z":"c2480ba7.74ffa8","wires":[["64cc4463.d3e58c","85ab4097.8b2dc","acf4923b.06fde","5df44df2.cfa404","a0786094.6ea81","ecb32124.6cd76","b4b1be1a.81bad","b95c32b4.219e1"]]},{"id":"eaa42ad6.78f358","type":"method","name":"method vnf-topology-changedelete","xml":"<method rpc='vnf-topology-changedelete' mode='sync'>\n","comments":"","outputs":1,"x":263.16668701171875,"y":128.66666507720947,"z":"c2480ba7.74ffa8","wires":[["acc7a1a9.a1048"]]},{"id":"64cc4463.d3e58c","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"'$service-data.oper-status.order-status == Active'\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":497.83331298828125,"y":260.8331604003906,"z":"c2480ba7.74ffa8","wires":[["b18f56cb.33d1f8"]]},{"id":"c7301650.992bf8","type":"service-logic","name":"VNF-API 2.0.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":333.1666564941406,"y":82.666672706604,"z":"c2480ba7.74ffa8","wires":[["eaa42ad6.78f358"]]},{"id":"b18f56cb.33d1f8","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":718.1666870117188,"y":261.1664733886719,"z":"c2480ba7.74ffa8","wires":[["94a2faf.7549008"]]},{"id":"608bf838.51bd68","type":"dgstart","name":"DGSTART","outputs":1,"x":170,"y":82.50000095367432,"z":"c2480ba7.74ffa8","wires":[["c7301650.992bf8"]]},{"id":"94a2faf.7549008","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid last-order-status'/>","comments":"","x":877.4998168945312,"y":261.16651916503906,"z":"c2480ba7.74ffa8","wires":[]},{"id":"85ab4097.8b2dc","type":"set","name":"set: order-status = PendingDelete","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"PendingDelete\"/>","comments":"","outputs":1,"x":512.9999694824219,"y":422.4999694824219,"z":"c2480ba7.74ffa8","wires":[[]]},{"id":"acf4923b.06fde","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />\n","comments":"","x":459,"y":589.4999694824219,"z":"c2480ba7.74ffa8","wires":[]},{"id":"efff4a22.b9abb8","type":"comment","name":"Update VNF status to PendingDelete","info":"","comments":"","x":1071.3333740234375,"y":73.38889789581299,"z":"c2480ba7.74ffa8","wires":[]},{"id":"67d8ea7b.3b55e4","type":"comment","name":"VNF-TOPOLOGY-CHANGEDELETE","info":"","comments":"","x":766.8889007568359,"y":73.05555725097656,"z":"c2480ba7.74ffa8","wires":[]},{"id":"94a9e016.11104","type":"comment","name":"request-action = DisconnectVNFRequest, svc-action = changedelete","info":"","comments":"","x":899.7777404785156,"y":109.1666669845581,"z":"c2480ba7.74ffa8","wires":[]},{"id":"ecb32124.6cd76","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","outputs":1,"x":456,"y":476.4999694824219,"z":"c2480ba7.74ffa8","wires":[[]]},{"id":"5df44df2.cfa404","type":"switchNode","name":"switch:vnf-id   config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":495.1363830566406,"y":203.69192504882812,"z":"c2480ba7.74ffa8","wires":[["e76a19e5.7aa208"]]},{"id":"e76a19e5.7aa208","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":717.5909118652344,"y":203.87375259399414,"z":"c2480ba7.74ffa8","wires":[["7f2aec26.3ec724"]]},{"id":"7f2aec26.3ec724","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":875.6818161010742,"y":203.78285026550293,"z":"c2480ba7.74ffa8","wires":[]},{"id":"a0786094.6ea81","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","outputs":1,"x":518.1363525390625,"y":371.6919250488281,"z":"c2480ba7.74ffa8","wires":[[]]},{"id":"b4b1be1a.81bad","type":"set","name":"set: service-data = input","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"vnf-topology-operation-input.\" /> \n","comments":"","outputs":1,"x":487.1363525390625,"y":530.6918640136719,"z":"c2480ba7.74ffa8","wires":[[]]},{"id":"b95c32b4.219e1","type":"save","name":"update generic-vnf status to pending-delete","xml":"<update plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\t\tkey=\"vnf-id = $vnf-topology-operation-input.vnf-request-information.vnf-id\" \n\tforce=\"true\" \n\tlocal-only=\"false\" >\n\t<parameter name=\"orchestration-status\" value=\"pending-delete\" />\n","comments":"","outputs":1,"x":542.1363525390625,"y":316.6918640136719,"z":"c2480ba7.74ffa8","wires":[[]]}]
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-delete.json b/platform-logic/vnfapi/src/main/json/vnf-topology-delete.json
deleted file mode 100644
index aee34c11..00000000
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-delete.json
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-[{"id":"fcf7e196.b57a18","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":407,"y":762.7500286102295,"z":"56a388d8.4ce54","wires":[]},{"id":"31ea957a.8db692","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":183.99996185302734,"y":123,"z":"56a388d8.4ce54","wires":[["9de92ad.50ab058","fcf7e196.b57a18","bb79241.52c52d8","32164f41.c7fe48","4983281c.426558","a52c709c.8702d","a6b4d2d7.948f98","1672533.d5ee9ad"]]},{"id":"9de92ad.50ab058","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","x":448,"y":589.7500286102295,"z":"56a388d8.4ce54","wires":[[]]},{"id":"1ccc10cf.aaa8b7","type":"method","name":"method vnf-topology-delete","xml":"<method rpc='vnf-topology-delete' mode='sync'>\n","comments":"","outputs":1,"x":215.6666488647461,"y":72.16666412353516,"z":"56a388d8.4ce54","wires":[["31ea957a.8db692"]]},{"id":"a68ff260.8bc4","type":"service-logic","name":"VNF-API 2.0.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":285.66661834716797,"y":20.166671752929688,"z":"56a388d8.4ce54","wires":[["1ccc10cf.aaa8b7"]]},{"id":"f5fafe40.045238","type":"dgstart","name":"DGSTART","outputs":1,"x":122.49996185302734,"y":20,"z":"56a388d8.4ce54","wires":[["a68ff260.8bc4"]]},{"id":"3d3232c2.77f4ce","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1110.9242897033691,"y":204.46213626861572,"z":"56a388d8.4ce54","wires":[["26bca269.f17f9e"]]},{"id":"26bca269.f17f9e","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1263.2574195861816,"y":204.46219730377197,"z":"56a388d8.4ce54","wires":[]},{"id":"4983281c.426558","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","x":409.2575988769531,"y":633.2956218719482,"z":"56a388d8.4ce54","wires":[[]]},{"id":"bb79241.52c52d8","type":"switchNode","name":"switch:vnf-id   config == input","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":453.14385986328125,"y":122.48754501342773,"z":"56a388d8.4ce54","wires":[["beb921bb.2c9b58"]]},{"id":"beb921bb.2c9b58","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":654.5984191894531,"y":122.66937255859375,"z":"56a388d8.4ce54","wires":[["127ae102.70f307"]]},{"id":"127ae102.70f307","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-id not found'/>","comments":"","x":818.189338684082,"y":122.82847309112549,"z":"56a388d8.4ce54","wires":[]},{"id":"32164f41.c7fe48","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","x":474.3939514160156,"y":548.4875774383545,"z":"56a388d8.4ce54","wires":[[]]},{"id":"a52c709c.8702d","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.vnf-topology-information.\" value=\"\" /> \n","comments":"","x":418.3939514160156,"y":673.4875774383545,"z":"56a388d8.4ce54","wires":[[]]},{"id":"1283dc8f.0dbbdb","type":"switchNode","name":"switch: order-status = Active","xml":"<switch test=\"`$service-data.oper-status.order-status == Active`\">","comments":"","outputs":1,"x":909.1071891784668,"y":204.76193714141846,"z":"56a388d8.4ce54","wires":[["3d3232c2.77f4ce"]]},{"id":"1672533.d5ee9ad","type":"set","name":"Set final indicator to Y","xml":"<set>\n<parameter name=\"ack-final\" value=\"Y\"/>","comments":"","x":429.71431732177734,"y":718.690502166748,"z":"56a388d8.4ce54","wires":[[]]},{"id":"a6b4d2d7.948f98","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":462.00001525878906,"y":205.0833387374878,"z":"56a388d8.4ce54","wires":[["3af03fc8.e707b","ddc78af.60992f8"]]},{"id":"3af03fc8.e707b","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":693.7500114440918,"y":252.72619247436523,"z":"56a388d8.4ce54","wires":[["afd57709.8addb"]]},{"id":"afd57709.8addb","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":890.7500534057617,"y":252.83336067199707,"z":"56a388d8.4ce54","wires":[["dadea9f1.52f198","ac9e3f4c.36446"]]},{"id":"ddc78af.60992f8","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":693.250072479248,"y":204.83335304260254,"z":"56a388d8.4ce54","wires":[["1283dc8f.0dbbdb"]]},{"id":"dadea9f1.52f198","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1085.75,"y":253.5833339691162,"z":"56a388d8.4ce54","wires":[["81095c78.688578"]]},{"id":"81095c78.688578","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Either aic-cloud-region or aic-clli must be present'/>","comments":"","x":1258.25,"y":254.0833339691162,"z":"56a388d8.4ce54","wires":[]},{"id":"ac9e3f4c.36446","type":"other","name":"other","xml":"<outcome value='Other'>\n","comments":"","outputs":1,"x":1087,"y":296.0833339691162,"z":"56a388d8.4ce54","wires":[["7a2e8e8a.7bba7"]]},{"id":"680cdb38.59b984","type":"save","name":"delete generic-vnf-l3-network","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-l3-network\" \n\tkey=\"DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1209.5000305175781,"y":418.5833568572998,"z":"56a388d8.4ce54","wires":[["bb5026cb.49ad98"]]},{"id":"e95a580b.ce45f8","type":"save","name":"delete GammaResource: generic-vnf","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf\" \n\tkey=\"DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id\" \n\tlocal-only=\"true\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1233.159194946289,"y":504.9546184539795,"z":"56a388d8.4ce54","wires":[["bb5026cb.49ad98"]]},{"id":"e46b8405.65dc18","type":"save","name":"delete generic-vnf-vserver","xml":"<delete plugin=\"org.openecomp.sdnc.sli.resource.sql.SqlResource\" \n\tresource=\"generic-vnf-vserver\" \n\tkey=\"DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1200.909194946289,"y":460.0379009246826,"z":"56a388d8.4ce54","wires":[["bb5026cb.49ad98"]]},{"id":"f2b7f8ab.79b31","type":"switchNode","name":"switch: order-status = PendingDelete","xml":"<switch test=\"'$service-data.oper-status.order-status == PendingDelete'\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":1232.750015258789,"y":376.83334159851074,"z":"56a388d8.4ce54","wires":[["142b3d5d.ab57d3"]]},{"id":"142b3d5d.ab57d3","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1462.0833892822266,"y":377.166654586792,"z":"56a388d8.4ce54","wires":[["f3ef39a7.92022"]]},{"id":"f3ef39a7.92022","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1614.416519165039,"y":377.16671562194824,"z":"56a388d8.4ce54","wires":[]},{"id":"7a2e8e8a.7bba7","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":979.5,"y":377.0833339691162,"z":"56a388d8.4ce54","wires":[["680cdb38.59b984","e95a580b.ce45f8","e46b8405.65dc18","6a59db9b.2f1714"]]},{"id":"bb5026cb.49ad98","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1495.75,"y":459.5833339691162,"z":"56a388d8.4ce54","wires":[["8239c2d0.1bd9c"]]},{"id":"8239c2d0.1bd9c","type":"set","name":"set: error-message","xml":"<set>\n\t<parameter name=\"error-code\" value=\"500\"/>\n\t<parameter name=\"error-message\" value=\"An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource\"/>","comments":"","x":1678.2500228881836,"y":459.58334255218506,"z":"56a388d8.4ce54","wires":[[]]},{"id":"6a59db9b.2f1714","type":"save","name":"delete AnAI: generic-vnf","xml":"<delete plugin=\"com.att.sdnctl.sli.aai.AAIService\" \n\tresource=\"generic-vnf\" \n\tkey=\"generic-vnf.vnf-id = $service-data.vnf-id\" \n\tlocal-only=\"false\" \n\tforce=\"true\" >\n\n","comments":"","outputs":1,"x":1191.5,"y":549.3333339691162,"z":"56a388d8.4ce54","wires":[["6f19a831.9a037"]]},{"id":"6f19a831.9a037","type":"failure","name":"failure","xml":"<outcome value='failure'>\n","comments":"","outputs":1,"x":1384.590805053711,"y":549.4620494842529,"z":"56a388d8.4ce54","wires":[["d613b798.91976"]]},{"id":"d613b798.91976","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='500'/>\n\t<parameter name='error-message' value=\"`'Failed to delete generic-vnf from AnAI with vnf-id = '+ $service-data.vnf-id`\"/>","comments":"","x":1542.7573318481445,"y":549.5454301834106,"z":"56a388d8.4ce54","wires":[]},{"id":"1e6708d8.18e507","type":"comment","name":"NOT checking order-status intentionally","info":"","comments":"","x":1337.000015258789,"y":341.0833396911621,"z":"56a388d8.4ce54","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-operation.json b/platform-logic/vnfapi/src/main/json/vnf-topology-operation.json
deleted file mode 100644
index 3658949d..00000000
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-operation.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-[{"id":"958f963f.31b188","type":"dgstart","name":"DGSTART","outputs":1,"x":119,"y":55,"z":"25983d3c.1a46c2","wires":[["d0fd6aea.b81a28"]]},{"id":"d0fd6aea.b81a28","type":"service-logic","name":"VNF-API 2.0.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":286.2777633666992,"y":54.66666889190674,"z":"25983d3c.1a46c2","wires":[["1c65065f.c3d76a"]]},{"id":"1c65065f.c3d76a","type":"method","name":"vnf-topology-operation","xml":"<method rpc='vnf-topology-operation' mode='sync'>\n","comments":"","outputs":1,"x":176.49999237060547,"y":97.22221946716309,"z":"25983d3c.1a46c2","wires":[["3cc3382f.1bf7c8"]]},{"id":"dde1c2c4.10a5a","type":"switchNode","name":"switch: svc-action","xml":"<switch test=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\">\n<!--\nleaf svc-action { \n\ttype enumeration { \n\t\tenum \"reserve\";\n\t\tenum \"assign\";\n\t\tenum \"activate\";  // equal to commit\n\t\tenum \"delete\";\t  // equal to commit\n\t\tenum \"changeassign\";\n\t\tenum \"changedelete\";\n\t\tenum \"rollback\";\n\t}\n}\n-->\n\n","comments":"","outputs":1,"x":370.55554962158203,"y":728.3332614898682,"z":"25983d3c.1a46c2","wires":[["8f40217f.2be81","44aca114.d2cc","972c2555.d107c8","5e0f2d9d.3e79e4","cbce4b74.b01e88","57c70c87.486604","b4b94e63.99422"]]},{"id":"8f40217f.2be81","type":"other","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":578.3611526489258,"y":1255.0832691192627,"z":"25983d3c.1a46c2","wires":[["7399697a.b21158"]]},{"id":"44aca114.d2cc","type":"other","name":"assign","xml":"<outcome value='assign'>","comments":"","outputs":1,"x":588.1111068725586,"y":728.3332672119141,"z":"25983d3c.1a46c2","wires":[["221592c2.d2e22e"]]},{"id":"7399697a.b21158","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='svc-action not recognized'/>\n","comments":"","x":750.3611526489258,"y":1255.0832691192627,"z":"25983d3c.1a46c2","wires":[]},{"id":"972c2555.d107c8","type":"other","name":"activate","xml":"<outcome value='activate'>","comments":"","outputs":1,"x":591.1111221313477,"y":817.5832557678223,"z":"25983d3c.1a46c2","wires":[["42a68a05.d53734"]]},{"id":"5e0f2d9d.3e79e4","type":"other","name":"rollback","xml":"<outcome value='rollback'>","comments":"","outputs":1,"x":590.8611221313477,"y":859.8332567214966,"z":"25983d3c.1a46c2","wires":[["a61ccd6d.3aebe"]]},{"id":"57c70c87.486604","type":"other","name":"changeassign","xml":"<outcome value='changeassign'>","comments":"","outputs":1,"x":609.6111221313477,"y":773.8332576751709,"z":"25983d3c.1a46c2","wires":[["e15984c8.645068"]]},{"id":"cbce4b74.b01e88","type":"other","name":"delete","xml":"<outcome value='delete'>","comments":"","outputs":1,"x":586.1111602783203,"y":1127.5832681655884,"z":"25983d3c.1a46c2","wires":[["f561040f.098178"]]},{"id":"b2b5054b.a272c8","type":"call","name":"call: vnf-topology-assign","xml":"<call module='VNF-API' rpc='vnf-topology-assign' mode='sync' >","comments":"","outputs":1,"x":980.3611068725586,"y":728.3332653045654,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"b4b94e63.99422","type":"other","name":"changedelete","xml":"<outcome value='changedelete'>","comments":"","outputs":1,"x":607.8611526489258,"y":957.5832653045654,"z":"25983d3c.1a46c2","wires":[["c42de2b1.7e92f"]]},{"id":"ba1b2b13.db9ac8","type":"call","name":"call: vnf-topology-changeassign","xml":"<call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' >","comments":"","outputs":1,"x":1003.6112289428711,"y":772.3332653045654,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"3dbb27de.9f2dc8","type":"call","name":"call: vnf-topology-rollback","xml":"<call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' >","comments":"","outputs":1,"x":985.3612289428711,"y":859.8332672119141,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"f561040f.098178","type":"call","name":"call: vnf-topology-delete","xml":"<call module='VNF-API' rpc='vnf-topology-delete' mode='sync' >","comments":"","outputs":1,"x":794.8612289428711,"y":1127.5832691192627,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"c6b280b0.6cd7f","type":"call","name":"call: vnf-topology-activate","xml":"<call module='VNF-API' rpc='vnf-topology-activate' mode='sync' >","comments":"","outputs":1,"x":984.8612213134766,"y":816.833261013031,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"155d31e0.05b84e","type":"call","name":"call: vnf-topology-changedelete","xml":"<call module='VNF-API' rpc='vnf-topology-changedelete' mode='sync' >","comments":"","outputs":1,"x":990.3612365722656,"y":1048.583267211914,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"a7b54cb3.980ce","type":"record","name":"record","xml":"<record plugin=\"com.att.sdnctl.sli.recording.FileRecorder\">\n<parameter name=\"file\" value=\"/opt/opendaylight/current/data/log/svclogic.log\"/>\n<parameter name=\"field1\" value=\"__TIMESTAMP__\"/>\n<parameter name=\"field2\" value=\"svc-topology-operation\"/>\n<parameter name=\"field3\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-action`\"/>\n<parameter name=\"field4\" value=\"`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`\"/>\n<parameter name=\"field5\" value=\"`$vnf-topology-operation-input.service-information.service-instance-id`\"/>\n<parameter name=\"field6\" value=\"`$vnf-topology-operation-input.request-information.request-id`\"/>\n<parameter name=\"field7\" value=\"`$vnf-topology-operation-input.request-information.request-action`\"/>\n<parameter name=\"field8\" value=\"`$vnf-topology-operation-input.request-information.source`\"/>\n<parameter name=\"field9\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\"/>\n<parameter name=\"field10\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\"/>\n<parameter name=\"field11\" value=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\"/>\n<parameter name=\"field12\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\"/>\n<parameter name=\"field13\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\"/>\n<parameter name=\"field14\" value=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\"/>\n<parameter name=\"field15\" value=\"`$vnf-topology-operation-input.vnf-request-information.tenant`\"/>\n<parameter name=\"field16\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\"/>\n<parameter name=\"field17\" value=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\"/>\n<parameter name=\"field18\" value=\"`$preload-data.oper-status.order-status`\"/>","comments":"","outputs":1,"x":340.5555725097656,"y":142.88889503479004,"z":"25983d3c.1a46c2","wires":[[]]},{"id":"bffc5a60.352f28","type":"comment","name":"vnf-topology-operation","info":"","comments":"","x":581.8888778686523,"y":77.44444465637207,"z":"25983d3c.1a46c2","wires":[]},{"id":"3cc3382f.1bf7c8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":176.00000762939453,"y":143.0000057220459,"z":"25983d3c.1a46c2","wires":[["a7b54cb3.980ce","54531a3f.9a8244","f8efbd03.26ae7","dde1c2c4.10a5a","28d8bce6.199104"]]},{"id":"54531a3f.9a8244","type":"switchNode","name":"switch: INPUT vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name`\">","comments":"","outputs":1,"x":393.22222900390625,"y":187.44443321228027,"z":"25983d3c.1a46c2","wires":[["45cb3770.822158","cf085c81.629d9"]]},{"id":"45cb3770.822158","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":607.2222290039062,"y":187.44443321228027,"z":"25983d3c.1a46c2","wires":[["edf87ba5.9649e8"]]},{"id":"cf085c81.629d9","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":608.2222290039062,"y":223.44443321228027,"z":"25983d3c.1a46c2","wires":[["c31d2b9a.235b38"]]},{"id":"edf87ba5.9649e8","type":"switchNode","name":"switch: PRELOAD vnf-name","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":818.2222290039062,"y":187.44443321228027,"z":"25983d3c.1a46c2","wires":[["dd3bda61.91fef8","d1fbfea6.d6b4e"]]},{"id":"dd3bda61.91fef8","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1029.2222290039062,"y":187.44443321228027,"z":"25983d3c.1a46c2","wires":[["a56ba8fa.fd0dc8"]]},{"id":"d1fbfea6.d6b4e","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1030.2222290039062,"y":222.44443321228027,"z":"25983d3c.1a46c2","wires":[["74256d47.66f134"]]},{"id":"a56ba8fa.fd0dc8","type":"switchNode","name":"switch: vnf-name INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`\">","comments":"","outputs":1,"x":1277.2222137451172,"y":187.44443130493164,"z":"25983d3c.1a46c2","wires":[["fd6ecd32.7e998"]]},{"id":"fd6ecd32.7e998","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1523.5555801391602,"y":187.1113338470459,"z":"25983d3c.1a46c2","wires":[["d4097d82.5bf18"]]},{"id":"d4097d82.5bf18","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-name not found in preload-data'/>","comments":"","x":1682.2222061157227,"y":186.44443321228027,"z":"25983d3c.1a46c2","wires":[]},{"id":"74256d47.66f134","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-name'/>","comments":"","x":1197.2222290039062,"y":222.44443321228027,"z":"25983d3c.1a46c2","wires":[]},{"id":"c31d2b9a.235b38","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-name is required'/>","comments":"","x":769.7222290039062,"y":223.69443321228027,"z":"25983d3c.1a46c2","wires":[]},{"id":"f8efbd03.26ae7","type":"switchNode","name":"switch: INPUT vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type`\">","comments":"","outputs":1,"x":389.2222595214844,"y":275.4444332122803,"z":"25983d3c.1a46c2","wires":[["65e149af.cbde18","ea33806b.6d2f5"]]},{"id":"65e149af.cbde18","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":606.2222518920898,"y":276.4444332122803,"z":"25983d3c.1a46c2","wires":[["62202805.17d5c8"]]},{"id":"ea33806b.6d2f5","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":607.2222518920898,"y":312.4444332122803,"z":"25983d3c.1a46c2","wires":[["ac6b3fa2.70605"]]},{"id":"62202805.17d5c8","type":"switchNode","name":"switch: PRELOAD vnf-type","xml":"<switch test=\"`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":817.2222518920898,"y":276.4444332122803,"z":"25983d3c.1a46c2","wires":[["c1ab266d.3e50e8","6103e8e2.d0ac48"]]},{"id":"c1ab266d.3e50e8","type":"outcome","name":"Other","xml":"<outcome value='Other'>","comments":"","outputs":1,"x":1028.2222518920898,"y":276.4444332122803,"z":"25983d3c.1a46c2","wires":[["7d4ee884.193e58"]]},{"id":"6103e8e2.d0ac48","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1029.2222518920898,"y":311.4444332122803,"z":"25983d3c.1a46c2","wires":[["25b723b.6c928dc"]]},{"id":"ac6b3fa2.70605","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vnf-type is required'/>","comments":"","x":768.7222518920898,"y":312.6944332122803,"z":"25983d3c.1a46c2","wires":[]},{"id":"7d4ee884.193e58","type":"switchNode","name":"switch: vnf-type INPUT == PRELOAD","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`\">","comments":"","outputs":1,"x":1276.2222290039062,"y":276.4444332122803,"z":"25983d3c.1a46c2","wires":[["3f9c526d.64517e"]]},{"id":"25b723b.6c928dc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='No preload data found to match vnf-type'/>","comments":"","x":1196.2222290039062,"y":311.4444332122803,"z":"25983d3c.1a46c2","wires":[]},{"id":"3f9c526d.64517e","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1525.2222290039062,"y":276.7779293060303,"z":"25983d3c.1a46c2","wires":[["1f890771.7bde59"]]},{"id":"1f890771.7bde59","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='request.vnf-type not found in preload-data'/>","comments":"","x":1683.8888549804688,"y":276.11102867126465,"z":"25983d3c.1a46c2","wires":[]},{"id":"28d8bce6.199104","type":"switchNode","name":"switch: INPUT vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id`\">","comments":"","outputs":1,"x":381.9009017944336,"y":369.9087600708008,"z":"25983d3c.1a46c2","wires":[["ae4cccb8.ead7f","c595b7b0.cb5c08"]]},{"id":"c595b7b0.cb5c08","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":564.9008712768555,"y":407.05159759521484,"z":"25983d3c.1a46c2","wires":[["c4592136.61d7c"]]},{"id":"ae4cccb8.ead7f","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":564.0438003540039,"y":369.4801959991455,"z":"25983d3c.1a46c2","wires":[["c4592136.61d7c"]]},{"id":"c4592136.61d7c","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/>","comments":"","x":739.7580795288086,"y":407.33731842041016,"z":"25983d3c.1a46c2","wires":[]},{"id":"40476a8f.071944","type":"switchNode","name":"switch: INPUT generic-vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`\">","comments":"","outputs":1,"x":1187.972312927246,"y":471.19446659088135,"z":"25983d3c.1a46c2","wires":[["71e91fc9.fc681","eaa464db.400d28"]]},{"id":"eaa464db.400d28","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1420.972282409668,"y":509.3373041152954,"z":"25983d3c.1a46c2","wires":[["f557b1e2.3389f"]]},{"id":"71e91fc9.fc681","type":"outcome","name":"0","xml":"<outcome value='0'>","comments":"","outputs":1,"x":1420.1152114868164,"y":471.7659025192261,"z":"25983d3c.1a46c2","wires":[["f557b1e2.3389f"]]},{"id":"f557b1e2.3389f","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/>","comments":"","x":1574.829490661621,"y":509.6230249404907,"z":"25983d3c.1a46c2","wires":[]},{"id":"6c32f4a6.dc1bbc","type":"switchNode","name":"switch: INPUT generic-vnf-name","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`\">","comments":"","outputs":1,"x":1199.722312927246,"y":552.1944665908813,"z":"25983d3c.1a46c2","wires":[["65632028.5d066"]]},{"id":"65632028.5d066","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1417.722282409668,"y":552.3373041152954,"z":"25983d3c.1a46c2","wires":[["8ba72342.bbed5"]]},{"id":"8ba72342.bbed5","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-name cannot be NULL'/>","comments":"","x":1571.579490661621,"y":552.6230249404907,"z":"25983d3c.1a46c2","wires":[]},{"id":"b28e0cca.d41bb","type":"switchNode","name":"switch: INPUT generic-vnf-type","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`\">","comments":"","outputs":1,"x":1193.972312927246,"y":596.1944665908813,"z":"25983d3c.1a46c2","wires":[["aa1b2f7.b06f8d"]]},{"id":"aa1b2f7.b06f8d","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1411.972282409668,"y":596.3373041152954,"z":"25983d3c.1a46c2","wires":[["e2e17d64.872be"]]},{"id":"e2e17d64.872be","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='generic-vnf-type cannot be NULL'/>","comments":"","x":1565.829490661621,"y":596.6230249404907,"z":"25983d3c.1a46c2","wires":[]},{"id":"58a1478b.c0e8f8","type":"block","name":"block: atomic","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":957.5001373291016,"y":470.75006675720215,"z":"25983d3c.1a46c2","wires":[["40476a8f.071944","6c32f4a6.dc1bbc","b28e0cca.d41bb","529f560e.4f4038"]]},{"id":"42a68a05.d53734","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":739.5000152587891,"y":817.0000095367432,"z":"25983d3c.1a46c2","wires":[["58a1478b.c0e8f8","c6b280b0.6cd7f"]]},{"id":"e15984c8.645068","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":768.2500152587891,"y":773.2500095367432,"z":"25983d3c.1a46c2","wires":[["58a1478b.c0e8f8","ba1b2b13.db9ac8"]]},{"id":"a61ccd6d.3aebe","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":740.7500152587891,"y":859.5000104904175,"z":"25983d3c.1a46c2","wires":[["3dbb27de.9f2dc8","58a1478b.c0e8f8"]]},{"id":"221592c2.d2e22e","type":"block","name":"block","xml":"<block>\n","atomic":"false","comments":"","outputs":1,"x":758.2500152587891,"y":728.2500114440918,"z":"25983d3c.1a46c2","wires":[["58a1478b.c0e8f8","b2b5054b.a272c8"]]},{"id":"5199930f.f65cbc","type":"comment","name":"changedelete is for 1604 VNF ONLY","info":"","comments":"","x":1045.000015258789,"y":908.7500133514404,"z":"25983d3c.1a46c2","wires":[]},{"id":"529f560e.4f4038","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":1193.250015258789,"y":638.7500114440918,"z":"25983d3c.1a46c2","wires":[["97a6fbef.743c78"]]},{"id":"97a6fbef.743c78","type":"outcome","name":"NULL","xml":"<outcome value=''>","outputs":1,"x":1411.249984741211,"y":638.8928489685059,"z":"25983d3c.1a46c2","wires":[["4f783332.567abc"]]},{"id":"4f783332.567abc","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region cannot be NULL'/>","comments":"","x":1565.107192993164,"y":639.1785697937012,"z":"25983d3c.1a46c2","wires":[]},{"id":"65f88fb5.ab931","type":"switchNode","name":"switch: INPUT aic-cloud-region","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`\">","comments":"","outputs":1,"x":988.7500190734863,"y":958.0000133514404,"z":"25983d3c.1a46c2","wires":[["41b77e7.203668"]]},{"id":"41b77e7.203668","type":"outcome","name":"other","xml":"<outcome value='other'>","comments":"","outputs":1,"x":1206.7499885559082,"y":958.1428508758545,"z":"25983d3c.1a46c2","wires":[["c067f3e8.62d66"]]},{"id":"c067f3e8.62d66","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1360.6071968078613,"y":958.4285717010498,"z":"25983d3c.1a46c2","wires":[]},{"id":"bfc65951.089598","type":"switchNode","name":"switch: INPUT aic-clli","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.aic-clli`\">","comments":"","outputs":1,"x":958.7500381469727,"y":1001.5000276565552,"z":"25983d3c.1a46c2","wires":[["8c86155.bd7ede8"]]},{"id":"8c86155.bd7ede8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1140.7500076293945,"y":1001.6428651809692,"z":"25983d3c.1a46c2","wires":[["b2dd9cc5.c6ce"]]},{"id":"b2dd9cc5.c6ce","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/>","comments":"","x":1294.6072158813477,"y":1001.9285860061646,"z":"25983d3c.1a46c2","wires":[]},{"id":"c42de2b1.7e92f","type":"block","name":"block","xml":"<block atomic=\"true\">\n","atomic":"false","comments":"","outputs":1,"x":770.0000190734863,"y":957.7500133514404,"z":"25983d3c.1a46c2","wires":[["65f88fb5.ab931","bfc65951.089598","155d31e0.05b84e"]]}]
diff --git a/platform-logic/vnfapi/src/main/json/vnf-topology-rollback.json b/platform-logic/vnfapi/src/main/json/vnf-topology-rollback.json
deleted file mode 100644
index 0f0477d0..00000000
--- a/platform-logic/vnfapi/src/main/json/vnf-topology-rollback.json
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-[{"id":"4adc401f.6fd4e","type":"comment","name":"vnf-topology-rollback","info":"","comments":"","x":768.75,"y":68.75,"z":"c46e36ad.370538","wires":[]},{"id":"a35df8d1.5089b8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":176.66674041748047,"y":180.05554580688477,"z":"c46e36ad.370538","wires":[["4b413bbb.dead44"]]},{"id":"4b859f58.89806","type":"method","name":"method vnf-topology-rollback","xml":"<method rpc='vnf-topology-rollback' mode='sync'>\n","comments":"","outputs":1,"x":205.08342742919922,"y":127.47221851348877,"z":"c46e36ad.370538","wires":[["a35df8d1.5089b8"]]},{"id":"f018b62.ed5ec48","type":"service-logic","name":"VNF-API 2.0.0","module":"VNF-API","version":"${project.version}","comments":"","xml":"<service-logic xmlns='http://www.att.com/sdnctl/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.att.com/sdnctl/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'>","outputs":1,"x":297.0833969116211,"y":80.4722261428833,"z":"c46e36ad.370538","wires":[["4b859f58.89806"]]},{"id":"7687c33c.8308fc","type":"dgstart","name":"DGSTART","outputs":1,"x":150.91674041748047,"y":79.3055534362793,"z":"c46e36ad.370538","wires":[["f018b62.ed5ec48"]]},{"id":"9e388b53.8eec58","type":"returnSuccess","name":"return success","xml":"<return status='success'>\n\t<parameter name=\"error-code\" value=\"200\" />","comments":"","x":914.9167633056641,"y":490.5806646347046,"z":"c46e36ad.370538","wires":[]},{"id":"498b1cdc.f5b874","type":"set","name":"set: order-status = Deleted","xml":"<set>\n\t<parameter name=\"service-data.oper-status.order-status\" value=\"Deleted\"/>","comments":"","outputs":1,"x":950.6667633056641,"y":361.5806636810303,"z":"c46e36ad.370538","wires":[[]]},{"id":"966704da.f1e5e8","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">","comments":"","outputs":1,"x":983.5077056884766,"y":275.70944595336914,"z":"c46e36ad.370538","wires":[["f9e7dbf4.3cee38"]]},{"id":"f9e7dbf4.3cee38","type":"other","name":"false","xml":"<outcome value='false'>","comments":"","outputs":1,"x":1215.0910873413086,"y":275.5427579879761,"z":"c46e36ad.370538","wires":[["da524aac.dca358"]]},{"id":"da524aac.dca358","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value='Invalid order-status'/>","comments":"","x":1367.424217224121,"y":275.5428190231323,"z":"c46e36ad.370538","wires":[]},{"id":"1b62d02c.b7bba","type":"set","name":"set: last-action ","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-action\" value=\"`$service-data.request-information.request-action`\"/>","comments":"","outputs":1,"x":912.4244575500488,"y":403.876256942749,"z":"c46e36ad.370538","wires":[[]]},{"id":"db17d4a.2603328","type":"outcomeFalse","name":"false","xml":"<outcome value='false'>\n","comments":"","outputs":1,"x":1203.765281677246,"y":228.50000286102295,"z":"c46e36ad.370538","wires":[["27eb4ee.58ec4b2"]]},{"id":"27eb4ee.58ec4b2","type":"returnFailure","name":"return failure","xml":"<return status='failure'>\n\t<parameter name='error-code' value='400'/>\n\t<parameter name='error-message' value=\"`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`\"/>","comments":"","x":1366.856101989746,"y":228.90910625457764,"z":"c46e36ad.370538","wires":[]},{"id":"523d2145.891db","type":"set","name":"set: last-order-status = order-status","xml":"<set>\n\t<parameter name=\"service-data.oper-status.last-order-status\" value=\"`$service-data.oper-status.order-status`\"/>","comments":"","outputs":1,"x":977.3108062744141,"y":318.56821060180664,"z":"c46e36ad.370538","wires":[[]]},{"id":"c8d475e9.cca918","type":"set","name":"Clear vnf topology","xml":"<set>\n\t<parameter name=\"service-data.\" value=\"\" /> \n","comments":"","outputs":1,"x":925.8108062744141,"y":447.5682125091553,"z":"c46e36ad.370538","wires":[[]]},{"id":"1b28eda7.d7bd22","type":"switchNode","name":"switch:CONFIG == INPUT - vnf-id","xml":"<switch test=\"`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`\">","comments":"","outputs":1,"x":972.9167633056641,"y":228.50000286102295,"z":"c46e36ad.370538","wires":[["db17d4a.2603328"]]},{"id":"4b413bbb.dead44","type":"switchNode","name":"switch: order-status = PendingCreate","xml":"<switch test=\"`$service-data.oper-status.order-status == PendingCreate`\">\n\n<!--\nleaf order-status {\n\ttype enumeration {\n\t\tenum \"Active\";\n\t\tenum \"PendingAssignment\";\n\t\tenum \"PendingCreate\";\n\t\tenum \"PendingUpdate\";\n\t\tenum \"Deleted\";\n\t}\n}\n-->","comments":"","outputs":1,"x":284.166748046875,"y":227.00000667572021,"z":"c46e36ad.370538","wires":[["487e1089.4a94b"]]},{"id":"487e1089.4a94b","type":"other","name":"true","xml":"<outcome value='true'>","comments":"","outputs":1,"x":520.4167404174805,"y":227.75,"z":"c46e36ad.370538","wires":[["1f7d22e0.cbfffd"]]},{"id":"1f7d22e0.cbfffd","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":682.4167404174805,"y":227.75,"z":"c46e36ad.370538","wires":[["1b28eda7.d7bd22","966704da.f1e5e8","523d2145.891db","498b1cdc.f5b874","1b62d02c.b7bba","c8d475e9.cca918","9e388b53.8eec58"]]},{"id":"9dca4993.365578","type":"comment","name":"request-action = VNFActivateRequest, svc-action = rollback","info":"","comments":"","x":780.166748046875,"y":104.75000190734863,"z":"c46e36ad.370538","wires":[]}]
diff --git a/platform-logic/vnfapi/src/main/xml/dg-generate-l3network-network-id.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml
index a08a7a26..a08a7a26 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-generate-l3network-network-id.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-generate-subnets-subnet-id.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml
index 5903707d..5903707d 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-generate-subnets-subnet-id.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
index 5e787c7c..5e787c7c 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-assign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
index 006c65d6..006c65d6 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-changeassign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml
index fd31513d..fd31513d 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-delete.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml
index 7352d888..7352d888 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-network-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml
index 83c181a9..83c181a9 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-network-topology-rollback.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml
index 2652e033..2652e033 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-preload-network-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
index 3fb8483d..3fb8483d 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-preload-vf-module-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
index b9ed2a27..b9ed2a27 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-instance-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml
index 7908deca..7908deca 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-preload-vnf-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml
index 388939f2..388939f2 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-activate.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-activate.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml
index 808fffd8..808fffd8 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign-vnf-networks.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml
index 99d52408..99d52408 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-assign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml
index 5461fa54..5461fa54 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-changeassign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-changeassign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml
index 10a265aa..10a265aa 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-delete.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml
index c0359f45..c0359f45 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml
index d5e27b1f..d5e27b1f 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vf-module-topology-rollback.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml
index 88a2c634..88a2c634 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-activate.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml
index acee4ff1..acee4ff1 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign-vnf-networks.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml
index 047f9cb5..047f9cb5 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-assign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml
index ff828b7b..ff828b7b 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-changeassign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml
index a7fc602f..a7fc602f 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-delete.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml
index 23e915c1..23e915c1 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml
index 9b185f90..9b185f90 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-instance-topology-rollback.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml
index 1b5ad0c8..1b5ad0c8 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-activate.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml
index d8c211fd..d8c211fd 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign-vfmodule.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign-vfmodule.xml
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml
new file mode 100644
index 00000000..b365142d
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml
@@ -0,0 +1,54 @@
+<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-assign' mode='sync'>

+<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='true'>

+<return status='failure'>

+	<parameter name='error-code' value='500'/>

+	<parameter name='error-message' value='vnf-id is already present in config-tree'/></return></outcome></switch><get-resource plugin="com.att.sdnctl.sli.aai.AAIService" 

+	resource="vf-module" 

+		key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id 

+			and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" 

+		local-only="false" 

+		pfx="tmp.AnAI.vfmodule" ><outcome value='failure'>

+<return status='failure'>

+	<parameter name='error-code' value='500'/>

+	<parameter name='error-message' value="`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome><outcome value='not-found'>

+<return status='failure'>

+	<parameter name='error-code' value='500'/>

+	<parameter name='error-message' value="`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' ></call><switch test="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set>

+<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />

+</set></outcome></switch><for index="i" start="0" end="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="com.att.sdnctl.sli.aai.AAIService" 

+	resource="vf-module:relationship-list" 

+		key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id 

+			and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" 

+	force="true" 

+	local-only="false">

+	

+	<parameter name="relationship-list.relationship[0].related-to" value="l3-network" />

+	<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />

+	<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'>

+<block atomic='true'><delete plugin="com.att.sdnctl.sli.aai.AAIService" 

+	resource="vf-module:relationship-list" 

+	key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id 

+		AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id 

+		AND related-to = l3-network" 

+	force="true" 

+	local-only="false"></delete><return status='failure'>

+	<parameter name='error-code' value='500'/>

+	<parameter name='error-message' value="`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="com.att.sdnctl.sli.aai.AAIService" 

+	resource="vf-module" 

+		key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id 

+			and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" 

+		local-only="false" >

+	<parameter name="orchestration-status" value="pending-create" /><outcome value='failure'>

+<block atomic="true">

+<delete plugin="com.att.sdnctl.sli.aai.AAIService" 

+	resource="vf-module:relationship-list" 

+	key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id 

+		AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id 

+		AND related-to = l3-network" 

+	force="true" 

+	local-only="false"></delete><return status='failure'>

+	<parameter name='error-code' value='500'/>

+	<parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>

+	<parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>

+<parameter name="ack-final" value="Y"/></set><return status='success'>

+	<parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml
index 10aaaf98..10aaaf98 100644
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changeassign.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml
new file mode 100644
index 00000000..a16e5bba
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changedelete.xml
@@ -0,0 +1,32 @@
+<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-changedelete' mode='sync'>

+<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>

+<return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="'$service-data.oper-status.order-status == Active'">

+

+<!--

+leaf order-status {

+	type enumeration {

+		enum "Active";

+		enum "PendingAssignment";

+		enum "PendingCreate";

+		enum "PendingUpdate";

+		enum "Deleted";

+	}

+}

+--><outcome value='false'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='Invalid last-order-status'/></return></outcome></switch><update plugin="com.att.sdnctl.sli.aai.AAIService" 

+	resource="generic-vnf" 

+		key="generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id" 

+	force="true" 

+	local-only="false" >

+	<parameter name="orchestration-status" value="pending-delete" />

+</update><set>

+	<parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>

+	<parameter name="service-data.oper-status.order-status" value="PendingDelete"/></set><set>

+	<parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>

+	<parameter name="service-data." value="vnf-topology-operation-input." /> 

+</set><return status='success'>

+	<parameter name="error-code" value="200" />

+</return></block></method></service-logic>

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml
new file mode 100644
index 00000000..f44c8d2f
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml
@@ -0,0 +1,15 @@
+<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-delete' mode='sync'>

+<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>

+<return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value='Other'>

+<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome></switch><set>

+	<parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>

+	<parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>

+	<parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>

+	<parameter name="service-data." value="" /> 

+</set><set>

+<parameter name="ack-final" value="Y"/></set><return status='success'>

+	<parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml
new file mode 100644
index 00000000..db0f8cba
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml
@@ -0,0 +1,105 @@
+<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-operation' mode='sync'>

+<block atomic="true"><record plugin="com.att.sdnctl.sli.recording.FileRecorder">

+<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>

+<parameter name="field1" value="__TIMESTAMP__"/>

+<parameter name="field2" value="svc-topology-operation"/>

+<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"/>

+<parameter name="field4" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>

+<parameter name="field5" value="`$vnf-topology-operation-input.service-information.service-instance-id`"/>

+<parameter name="field6" value="`$vnf-topology-operation-input.request-information.request-id`"/>

+<parameter name="field7" value="`$vnf-topology-operation-input.request-information.request-action`"/>

+<parameter name="field8" value="`$vnf-topology-operation-input.request-information.source`"/>

+<parameter name="field9" value="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"/>

+<parameter name="field10" value="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"/>

+<parameter name="field11" value="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"/>

+<parameter name="field12" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"/>

+<parameter name="field13" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"/>

+<parameter name="field14" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/>

+<parameter name="field15" value="`$vnf-topology-operation-input.vnf-request-information.tenant`"/>

+<parameter name="field16" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"/>

+<parameter name="field17" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"/>

+<parameter name="field18" value="`$preload-data.oper-status.order-status`"/></record><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='false'>

+<return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='request.vnf-name not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='No preload data found to match vnf-name'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='vnf-name is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='false'>

+<return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='request.vnf-type not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='No preload data found to match vnf-type'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='vnf-type is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"><outcome value='0'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.sdnc-request-header.svc-action`">

+<!--

+leaf svc-action { 

+	type enumeration { 

+		enum "reserve";

+		enum "assign";

+		enum "activate";  // equal to commit

+		enum "delete";	  // equal to commit

+		enum "changeassign";

+		enum "changedelete";

+		enum "rollback";

+	}

+}

+-->

+

+<outcome value='assign'><block>

+<block atomic="true">

+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-assign' mode='sync' ></call></block></outcome><outcome value='changeassign'><block>

+<block atomic="true">

+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' ></call></block></outcome><outcome value='activate'><block>

+<block atomic="true">

+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-activate' mode='sync' ></call></block></outcome><outcome value='rollback'><block>

+<block atomic="true">

+<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='svc-action not recognized'/>

+</return></outcome></switch></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml
new file mode 100644
index 00000000..cbb1be63
--- /dev/null
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml
@@ -0,0 +1,13 @@
+<service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-rollback' mode='sync'>

+<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>

+<return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value="`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`"/></return></outcome></switch><switch test="`$service-data.oper-status.order-status == PendingCreate`"><outcome value='false'><return status='failure'>

+	<parameter name='error-code' value='400'/>

+	<parameter name='error-message' value='Invalid order-status'/></return></outcome></switch><set>

+	<parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>

+	<parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>

+	<parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>

+	<parameter name="service-data." value="" /> 

+</set><return status='success'>

+	<parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml
deleted file mode 100644
index 7510eb67..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-assign.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'><method rpc='vnf-topology-assign' mode='sync'>
-<block atomic="true"><get-resource plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="vf-module"
-        key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
-            and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
-        local-only="false"
-        pfx="tmp.AnAI.vfmodule" ><outcome value='failure'>
-<return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'Encountered error while querying vf-module from AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome><outcome value='not-found'>
-<return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'vf-module not found in AnAI with vf-module-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' and generic-vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/></return></outcome></get-resource><call module='VNF-API' rpc='vnf-topology-assign-vfmodule' mode='sync' ></call><switch test="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><outcome value=''><set>
-<parameter name='service-data.vnf-topology-information.vnf-assignments.vnf-networks_length' value='0' />
-</set></outcome></switch><for index="i" start="0" end="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks_length`"><save plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="vf-module:relationship-list"
-        key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
-            and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
-    force="true"
-    local-only="false">
-
-    <parameter name="relationship-list.relationship[0].related-to" value="l3-network" />
-    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="l3-network.network-id" />
-    <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`" /><outcome value='failure'>
-<block atomic='true'><delete plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="vf-module:relationship-list"
-    key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
-        AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id
-        AND related-to = l3-network"
-    force="true"
-    local-only="false"></delete><return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'Encountered error while saving vf-module l3-network relationship in AnAI with network-id = ' + $service-data.vnf-topology-information.vnf-assignments.vnf-networks[$i].network-id`"/></return></block></outcome></save></for><update plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="vf-module"
-        key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
-            and generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id"
-        local-only="false" >
-    <parameter name="orchestration-status" value="pending-create" /><outcome value='failure'>
-<block atomic="true">
-<delete plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="vf-module:relationship-list"
-    key="vf-module.vf-module-id = $vnf-topology-operation-input.vnf-request-information.vnf-id
-        AND generic-vnf.vnf-id = $vnf-topology-operation-input.vnf-request-information.generic-vnf-id
-        AND related-to = l3-network"
-    force="true"
-    local-only="false"></delete><return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>
-    <parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>
-<parameter name="ack-final" value="Y"/></set><return status='success'>
-    <parameter name="error-code" value="200" /></return></block></method></service-logic>
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml
deleted file mode 100644
index 515b7d3f..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-changedelete.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'><method rpc='vnf-topology-changedelete' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="'$service-data.oper-status.order-status == Active'">
-
-<!--
-leaf order-status {
-    type enumeration {
-        enum "Active";
-        enum "PendingAssignment";
-        enum "PendingCreate";
-        enum "PendingUpdate";
-        enum "Deleted";
-    }
-}
---><outcome value='false'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='Invalid last-order-status'/></return></outcome></switch><update plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf"
-        key="vnf-id = $vnf-topology-operation-input.vnf-request-information.vnf-id"
-    force="true"
-    local-only="false" >
-    <parameter name="orchestration-status" value="pending-delete" />
-</update><set>
-    <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
-    <parameter name="service-data.oper-status.order-status" value="PendingDelete"/></set><set>
-    <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
-    <parameter name="service-data." value="vnf-topology-operation-input." />
-</set><return status='success'>
-    <parameter name="error-code" value="200" />
-</return></block></method></service-logic>
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml
deleted file mode 100644
index 582c5133..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-delete.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'><method rpc='vnf-topology-delete' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value='Other'>
-<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome><outcome value=''><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-clli`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='Either aic-cloud-region or aic-clli must be present'/></return></outcome><outcome value='Other'>
-<block>
-<delete plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
-    resource="generic-vnf-l3-network"
-    key="DELETE FROM GENERIC_VNF_L3_NETWORK WHERE vnf_id = $service-data.vnf-id"
-    force="true" >
-
-<outcome value='failure'>
-<set>
-    <parameter name="error-code" value="500"/>
-    <parameter name="error-message" value="An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource"/></set></outcome></delete><delete plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
-    resource="generic-vnf-vserver"
-    key="DELETE FROM GENERIC_VNF_VSERVER where vnf_id = $service-data.vnf-id"
-    force="true" >
-
-<outcome value='failure'>
-<set>
-    <parameter name="error-code" value="500"/>
-    <parameter name="error-message" value="An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource"/></set></outcome></delete><delete plugin="org.openecomp.sdnc.sli.resource.sql.SqlResource"
-    resource="generic-vnf"
-    key="DELETE FROM GENERIC_VNF where vnf_id = $service-data.vnf-id"
-    local-only="true"
-    force="true" >
-
-<outcome value='failure'>
-<set>
-    <parameter name="error-code" value="500"/>
-    <parameter name="error-message" value="An error occurred while deleting generic-vnf, generic-vnf-l3-netweork or generic-vnf-vserver from GammaResource"/></set></outcome></delete><delete plugin="org.openecomp.sdnc.sli.aai.AAIService"
-    resource="generic-vnf"
-    key="generic-vnf.vnf-id = $service-data.vnf-id"
-    local-only="false"
-    force="true" >
-
-<outcome value='failure'>
-<return status='failure'>
-    <parameter name='error-code' value='500'/>
-    <parameter name='error-message' value="`'Failed to delete generic-vnf from AnAI with vnf-id = '+ $service-data.vnf-id`"/></return></outcome></delete></block></outcome></switch></outcome></switch><set>
-    <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
-    <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>
-    <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
-    <parameter name="service-data.vnf-topology-information." value="" />
-</set><set>
-<parameter name="ack-final" value="Y"/></set><return status='success'>
-    <parameter name="error-code" value="200" /></return></block></method></service-logic>
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml
deleted file mode 100644
index fcd44d00..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-operation.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'><method rpc='vnf-topology-operation' mode='sync'>
-<block atomic="true"><record plugin="org.openecomp.sdnc.sli.recording.FileRecorder">
-<parameter name="file" value="/opt/opendaylight/current/data/log/svclogic.log"/>
-<parameter name="field1" value="__TIMESTAMP__"/>
-<parameter name="field2" value="svc-topology-operation"/>
-<parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-action`"/>
-<parameter name="field4" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>
-<parameter name="field5" value="`$vnf-topology-operation-input.service-information.service-instance-id`"/>
-<parameter name="field6" value="`$vnf-topology-operation-input.request-information.request-id`"/>
-<parameter name="field7" value="`$vnf-topology-operation-input.request-information.request-action`"/>
-<parameter name="field8" value="`$vnf-topology-operation-input.request-information.source`"/>
-<parameter name="field9" value="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"/>
-<parameter name="field10" value="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"/>
-<parameter name="field11" value="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"/>
-<parameter name="field12" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"/>
-<parameter name="field13" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"/>
-<parameter name="field14" value="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"/>
-<parameter name="field15" value="`$vnf-topology-operation-input.vnf-request-information.tenant`"/>
-<parameter name="field16" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"/>
-<parameter name="field17" value="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"/>
-<parameter name="field18" value="`$preload-data.oper-status.order-status`"/></record><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-name == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-name`"><outcome value='false'>
-<return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='request.vnf-name not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='No preload data found to match vnf-name'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vnf-name is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type`"><outcome value='Other'><switch test="`$preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='Other'><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-type == $preload-data.vnf-topology-information.vnf-topology-identifier.vnf-type`"><outcome value='false'>
-<return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='request.vnf-type not found in preload-data'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='No preload data found to match vnf-type'/></return></outcome></switch></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vnf-type is required'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id`"><outcome value='0'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='vf-modules vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.sdnc-request-header.svc-action`">
-<!--
-leaf svc-action {
-    type enumeration {
-        enum "reserve";
-        enum "assign";
-        enum "activate";  // equal to commit
-        enum "delete";      // equal to commit
-        enum "changeassign";
-        enum "changedelete";
-        enum "rollback";
-    }
-}
--->
-
-<outcome value='assign'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-assign' mode='sync' ></call></block></outcome><outcome value='changeassign'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-changeassign' mode='sync' ></call></block></outcome><outcome value='activate'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-activate' mode='sync' ></call></block></outcome><outcome value='rollback'><block>
-<block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-id`"><outcome value='0'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-id cannot be NULL or 0'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-name`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-name cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.generic-vnf-type`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='generic-vnf-type cannot be NULL'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='changedelete'><block atomic="true">
-<switch test="`$vnf-topology-operation-input.vnf-request-information.aic-cloud-region`"><outcome value='other'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/></return></outcome></switch><switch test="`$vnf-topology-operation-input.vnf-request-information.aic-clli`"><outcome value=''><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='aic-cloud-region can not be present for 1604 VNF changedelete'/></return></outcome></switch><call module='VNF-API' rpc='vnf-topology-changedelete' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='svc-action not recognized'/>
-</return></outcome></switch></block></method></service-logic>
diff --git a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml
deleted file mode 100644
index 3533e238..00000000
--- a/platform-logic/vnfapi/src/main/xml/dg-vnf-topology-rollback.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-  						reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-       http://www.apache.org/licenses/LICENSE-2.0
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<service-logic xmlns="http://www.openecomp.org/sdnc/svclogic"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'><method rpc='vnf-topology-rollback' mode='sync'>
-<block atomic="true"><switch test="`$service-data.oper-status.order-status == PendingCreate`">
-
-<!--
-leaf order-status {
-    type enumeration {
-        enum "Active";
-        enum "PendingAssignment";
-        enum "PendingCreate";
-        enum "PendingUpdate";
-        enum "Deleted";
-    }
-}
---><outcome value='true'><block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>
-<return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value="`'vnf-id = ' + $vnf-topology-operation-input.vnf-request-information.vnf-id + ' not found in config tree'`"/></return></outcome></switch><switch test="`$service-data.oper-status.order-status == PendingCreate`"><outcome value='false'><return status='failure'>
-    <parameter name='error-code' value='400'/>
-    <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch><set>
-    <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>
-    <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>
-    <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
-    <parameter name="service-data." value="" />
-</set><return status='success'>
-    <parameter name="error-code" value="200" /></return></block></outcome></switch></block></method></service-logic>