Merge "Remove test for Active on Delete"

[sdnc/oam.git] / platform-logic / vnfapi / src / main / xml / VNF-API_preload-vnf-topology-operation.xml

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml
index 5c0f25d..6e84ef7 100644 (file)
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml
@@ -13,24 +13,13 @@ leaf request-action {
 \r
 <outcome value='PreloadVNFRequest'><block atomic="true"><set>\r
 <parameter name="ack-final" value="Y"/></set><set only-if-unset="true">\r
-<parameter name="sql-resource-plugin" value="org.openecomp.sdnc.sli.resource.sql.SqlResource"/></set><get-resource plugin="`$sql-resource-plugin`" resource="vnf-profile" key="SELECT * from VNF_PROFILE WHERE vnf_type = $preload-vnf-topology-operation-input.vnf-topology-information.vnf-topology-identifier.vnf-type">\r
-<outcome value='not-found'>\r
-<return status='failure'>\r
-       <parameter name="error-code" value="404" />\r
-       <parameter name="error-message" value="preload vnf-type not found as valid vnf " /></return></outcome><outcome value='failure'>\r
-<return status='failure'>\r
-       <parameter name="error-code" value="404" />\r
-       <parameter name="error-message" value="preload vnf-type not found as valid vnf " /></return></outcome></get-resource><set>\r
+<parameter name="sql-resource-plugin" value="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource"/></set><set>\r
 <parameter name="preload-data." value="" />\r
 </set><set>\r
 <parameter name="preload-data." value="preload-vnf-topology-operation-input." />\r
 </set><set>\r
        <parameter name="preload-data.oper-status.order-status" value="PendingAssignment"/></set><return status="success">\r
-       <parameter name="error-code" value="200" /></return></block></outcome><outcome value='DeletePreloadVNFRequest'><block atomic="true"><get-resource plugin="`$sql-resource-plugin`" resource="generic-vnf" key="SELECT * FROM VNF_PROFILE vnf-type = $preload-vnf-topology-operation-input.vnf-topology-information.vnf-topology-identifier.vnf-type">\r
-<outcome value='success'>\r
-<return status='failure'>\r
-       <parameter name="error-code" value="3000" />\r
-       <parameter name="error-message" value="preload vnf-type cannot be deleted while vnf is in use" /></return></outcome></get-resource><set>\r
+       <parameter name="error-code" value="200" /></return></block></outcome><outcome value='DeletePreloadVNFRequest'><block atomic="true"><set>\r
 <parameter name="preload-data." value="" />\r
 </set><return status="success">\r
        <parameter name="error-code" value="200" /></return></block></outcome><outcome value="Other">\r
@@ -40,4 +29,4 @@ leaf request-action {
        <parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>\r
 \r
  \r
-</return></outcome></switch></block></method></service-logic>
+</return></outcome></switch></block></method></service-logic>\r