Remove test for Active on Delete

[sdnc/oam.git] / platform-logic / vnfapi / src / main / xml / VNF-API_vnf-topology-delete.xml

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
index 69ad5fc..fd5319d 100644 (file)
--- 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
@@ -1,15 +1,13 @@
 <service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-delete' mode='sync'>\r
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>\r
+<block atomic="true">\r
+<switch test="`$vnf-topology-operation-input.vnf-request-information.vnf-id == $service-data.vnf-id`"><outcome value='false'>\r
 <return status='failure'>\r
        <parameter name='error-code' value='400'/>\r
-       <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'>\r
-<switch test="`$service-data.oper-status.order-status == Active`"><outcome value='false'><return status='failure'>\r
-       <parameter name='error-code' value='400'/>\r
-       <parameter name='error-message' value='Invalid order-status'/></return></outcome></switch></outcome></switch><set>\r
+       <parameter name='error-message' value='vnf-id not found'/></return></outcome></switch><set>\r
        <parameter name="service-data.oper-status.last-order-status" value="`$service-data.oper-status.order-status`"/></set><set>\r
        <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>\r
        <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>\r
        <parameter name="service-data." value="" /> \r
 </set><set>\r
 <parameter name="ack-final" value="Y"/></set><return status='success'>\r
-       <parameter name="error-code" value="200" /></return></block></method></service-logic>
+       <parameter name="error-code" value="200" /></return></block></method></service-logic>\r