From 9a469dbb9c9f64d1906f66eed938f00c4568ffaa Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Wed, 4 Oct 2017 11:39:43 -0400
Subject: Remove crossedit on vnf-type

Removed cross edit on VNF_PROFILE.vnf_type from
preload-vnf-topology-operation DGs so that no setup is needed
via admin portal prior to loading preload data.

Change-Id: Idc9cc141d111d7964d02ea8f842d043105dc4a78
Issue-ID: SDNC-1
Signed-off-by: Dan Timoney <dtimoney@att.com>

Former-commit-id: b1cb1068b403f4343cd5e450f7c39399c142e6ef
---
 .../main/xml/VNF-API_preload-vnf-topology-operation.xml | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

(limited to 'platform-logic/vnfapi/src/main/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 5c0f25d6..6e84ef7d 100644
--- 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 {
 
 <outcome value='PreloadVNFRequest'><block atomic="true"><set>
 <parameter name="ack-final" value="Y"/></set><set only-if-unset="true">
-<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">
-<outcome value='not-found'>
-<return status='failure'>
-	<parameter name="error-code" value="404" />
-	<parameter name="error-message" value="preload vnf-type not found as valid vnf " /></return></outcome><outcome value='failure'>
-<return status='failure'>
-	<parameter name="error-code" value="404" />
-	<parameter name="error-message" value="preload vnf-type not found as valid vnf " /></return></outcome></get-resource><set>
+<parameter name="sql-resource-plugin" value="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource"/></set><set>
 <parameter name="preload-data." value="" />
 </set><set>
 <parameter name="preload-data." value="preload-vnf-topology-operation-input." />
 </set><set>
 	<parameter name="preload-data.oper-status.order-status" value="PendingAssignment"/></set><return status="success">
-	<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">
-<outcome value='success'>
-<return status='failure'>
-	<parameter name="error-code" value="3000" />
-	<parameter name="error-message" value="preload vnf-type cannot be deleted while vnf is in use" /></return></outcome></get-resource><set>
+	<parameter name="error-code" value="200" /></return></block></outcome><outcome value='DeletePreloadVNFRequest'><block atomic="true"><set>
 <parameter name="preload-data." value="" />
 </set><return status="success">
 	<parameter name="error-code" value="200" /></return></block></outcome><outcome value="Other">
@@ -40,4 +29,4 @@ leaf request-action {
 	<parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>
 
  
-</return></outcome></switch></block></method></service-logic>
+</return></outcome></switch></block></method></service-logic>
-- 
cgit 1.2.3-korg