1 files changed, 50 insertions, 50 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
index 49735fdc..b11b8417 100755
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input.xml
@@ -53,21 +53,21 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="network-topology-operation-input.network-request-input.network-id not found in service-data" />
-</return></outcome></switch></block></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-invariant-uuid`'>
+</return></outcome></switch></block></outcome></switch></block></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="network-information.ecomp-model-information.model-invariant-uuid is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid`'>
+    <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="network-information.ecomp-model-information.model-customization-uuid is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-uuid`'>
+    <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="network-information.ecomp-model-information.model-uuid is a required input" />
+    <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
 </return></outcome></switch><switch test='`$network-topology-operation-input.network-request-input.tenant`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
@@ -78,22 +78,22 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.ecomp-model-information.model-uuid`'>
+</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>
 <outcome value=''><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
   pfx='service-model'><outcome value='not-found'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid
-  and service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
   pfx='network-model'>
 
 <outcome value='not-found'>
@@ -101,32 +101,32 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource></block></outcome><outcome value='Other'><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
   pfx='service-model'>
 
 <outcome value='not-found'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid
-  and service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
   pfx='network-model'>
 
 <outcome value='not-found'>
@@ -134,15 +134,15 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource></block></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
@@ -153,21 +153,21 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="service-information.network-information.network-id is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-invariant-uuid`'>
+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="network-information.ecomp-model-information.model-invariant-uuid is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid`'>
+    <parameter name="error-message" value="network-information.onap-model-information.model-invariant-uuid is a required input" />
+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="network-information.ecomp-model-information.model-customization-uuid is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.ecomp-model-information.model-uuid`'>
+    <parameter name="error-message" value="network-information.onap-model-information.model-customization-uuid is a required input" />
+</return></outcome></switch><switch test='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="network-information.ecomp-model-information.model-uuid is a required input" />
+    <parameter name="error-message" value="network-information.onap-model-information.model-uuid is a required input" />
 </return></outcome></switch><switch test='`$network-topology-operation-input.network-request-input.tenant`'>
 <outcome value=''><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
@@ -178,22 +178,22 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="service-information.network-request-information.aic-cloud-region is a required input" />
-</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.ecomp-model-information.model-uuid`'>
+</return></outcome></switch><switch test='`$network-topology-operation-input.service-information.onap-model-information.model-uuid`'>
 <outcome value=''><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $service-data.service-information.onap-model-information.model-uuid'
   pfx='service-model'><outcome value='not-found'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid
-  and service_uuid = $service-data.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $service-data.service-information.onap-model-information.model-uuid'
   pfx='network-model'>
 
 <outcome value='not-found'>
@@ -201,32 +201,32 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource></block></outcome><outcome value='Other'><block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from SERVICE_MODEL WHERE service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
   pfx='service-model'>
 
 <outcome value='not-found'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
-    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    <parameter name="error-message" value="`'No service model found for service UUID ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
-  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid
-  and service_uuid = $network-topology-operation-input.service-information.ecomp-model-information.model-uuid'
+  key='SELECT * from NETWORK_MODEL WHERE customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid
+  and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid'
   pfx='network-model'>
 
 <outcome value='not-found'>
@@ -234,15 +234,15 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome><outcome value='failure'>
 <return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="`'No network model found for customization UUID ' 
-    + $network-topology-operation-input.network-information.ecomp-model-information.model-customization-uuid +
-    ' and model-uuid ' + $network-topology-operation-input.service-information.ecomp-model-information.model-uuid`" />
+    + $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid +
+    ' and model-uuid ' + $network-topology-operation-input.service-information.onap-model-information.model-uuid`" />
 </return></outcome></get-resource></block></outcome></switch></block></outcome><outcome value='Other'><return status='failure'>
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />