From 191aaa5c7057a62b98899c911e316fd7d364de21 Mon Sep 17 00:00:00 2001
From: Dan Timoney <dtimoney@att.com>
Date: Thu, 26 Oct 2017 11:06:40 -0400
Subject: Fix error in SqlResource name

Fix error in SqlResource package name

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

Former-commit-id: f514c5cd6b4e5071b8f0340d83f9870eba273939
---
 .../xml/VNF-API_preload-vf-module-topology-operation.xml     |  2 +-
 .../xml/VNF-API_preload-vnf-instance-topology-operation.xml  |  2 +-
 .../src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml    |  2 +-
 .../xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml   | 12 ++++++------
 4 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'platform-logic/vnfapi/src/main/xml')

diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
index f5efcc61..c19b0969 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml
@@ -1,6 +1,6 @@
 <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="preload-vf-module-topology-operation" mode="sync"><block atomic="true"><switch test="`$preload-vf-module-topology-operation-input.request-information.request-action`">
 
-<outcome value='PreloadVfModuleRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" 
+<outcome value='PreloadVfModuleRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" 
 	resource="vnf-profile" key="SELECT * from VNF_PROFILE where vnf_type = $preload-vf-module-topology-operation-input.vf-module-topology-information.vf-module-identifiers.vf-module-model-id">
 <outcome value='not-found'>
 <return status='failure'>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
index a8929f27..5b0e0f0c 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml
@@ -1,6 +1,6 @@
 <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="preload-vnf-instance-topology-operation" mode="sync"><block atomic="true"><switch test="`$preload-vnf-instance-topology-operation-input.request-information.request-action`">
 
-<outcome value='PreloadVnfInstanceRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" 
+<outcome value='PreloadVnfInstanceRequest'><block atomic="true"><get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" 
 	resource="vnf-profile" key="SELECT * from VNF_PROFILE where vnf_type = $preload-vnf-instance-topology-operation-input.vnf-instance-topology-information.vnf-instance-identifiers.vnf-model-id">
 <outcome value='not-found'>
 <return status='failure'>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
index f2059764..e400b420 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml
@@ -5,7 +5,7 @@
 <parameter name='service-data.service-information.service-type' 
 	value='NOT_APPLICABLE' />
 	
-</set><update plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"
+</set><update plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
 	key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status 
 		WHERE info = $vnf-topology-operation-input.vnf-request-information.vnf-id" ><outcome value='failure'>
 <return status='failure'>
diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
index 28a77e88..00a4dc97 100644
--- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
+++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml
@@ -7,7 +7,7 @@
 	<parameter name='ack-final' value='Y'/>
 	<parameter name="error-code" value="500" />
     <parameter name="error-message" value="If svc-action is 'assign' then request-action must be 'VNFActivateRequest'" />
-</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</return></outcome></switch><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODULE_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'
   pfx='db.vf-module-model'>
 
@@ -59,7 +59,7 @@
 <block atomic="true"><set>
 <parameter name='tmp.vnf-topology.vnf-assignments.availability-zones[$az-index].availability-zone'
   value='`$aai.cloud-region.availability-zones.availability-zone[$az-index].availability-zone-name`' />
-</set></block></for></block><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set></block></for></block><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vnf-topology-operation-input.vnf-request-information.model-customization-uuid'
   pfx='db.vf-module-to-vfc-mapping[]'>
 
@@ -75,7 +75,7 @@
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms_length'
   value='`$db.vf-module-to-vfc-mapping_length`' />
 </set><for index='vm-type-index' start='0' end='`$db.vf-module-to-vfc-mapping_length`' >
-<block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+<block atomic="true"><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VFC_MODEL WHERE customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'
   pfx='db.vfc-model'>
 
@@ -122,7 +122,7 @@
 </set></outcome></call></block></for><set>
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names_length'
   value='`$db.vf-module-to-vfc-mapping[$vm-type-index].vm-count`' />
-</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='SELECT * from VFC_TO_NETWORK_ROLE_MAPPING WHERE vfc_customization_uuid = $db.vf-module-to-vfc-mapping[$vm-type-index].vfc-customization-uuid'
   pfx='db.vfc-to-network-role-mapping[]'>
 
@@ -308,7 +308,7 @@
 <parameter name='tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-networks[$network-role-index].network-ips-v6[$ip-count-index].ip-address-ipv6'
    value='`$eipam-ip-block.plans[$plans-index].requests[$rqst-index].ip-prefix`' /></set></outcome></switch></for></block></for></block></for></outcome></switch></for></for><for index='vm-type-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms_length`' >
 <for index='vm-index' start='0' end='`$tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-count`' >
-<block atomic="true"><delete plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+<block atomic="true"><delete plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
   key='DELETE from VIPR_CONFIGURATION WHERE vnf_id = $service-data.vnf-id
      AND ecomp_service_instance_id = $vnf-topology-operation-input.service-information.service-instance-id
      AND vm_name = $tmp.vnf-topology.vnf-assignments.vnf-vms[$vm-type-index].vm-names[$vm-index].vm-name' ><outcome value='failure'>
@@ -318,7 +318,7 @@
 <parameter name="field2" value="VNF-API.vnf-topology-automated-assign-vfmodule:REQID"/>
 <parameter name="field3" value="`$vnf-topology-operation-input.sdnc-request-header.svc-request-id`"/>
 <parameter name="field4" value="Failed to insert VIPR_CONFIGURATION record"/>
-</record></outcome></delete><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource" resource="SQL"
+</record></outcome></delete><save plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL"
 	key="INSERT INTO VIPR_CONFIGURATION (vnf_id, 
 		vnf_name, 
 		ecomp_service_instance_id, 
-- 
cgit 1.2.3-korg