1 files changed, 15 insertions, 15 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_subnet-allocated-notification.xml b/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_subnet-allocated-notification.xml
index 984d4edf..f5f75cff 100755
--- a/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_subnet-allocated-notification.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_subnet-allocated-notification.xml
@@ -16,7 +16,7 @@
 	<parameter name="input.ip-address" value="`$eipam-ip-block.ip-address`" />
 	<parameter name="input.mask" value="`$eipam-ip-block.prefix-length`" /><outcome value="success">
 <block><save 
-	plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 	resource='SQL'
 	key="UPDATE EIPAM_IP_SUBNETS
              SET status = 'PENDING-ACTIVE'
@@ -24,7 +24,7 @@
     force='true'
         pfx='pfx.eipam-subnet-row'>
 </save><set>
-	<parameter name="eipam-ip-block.status" value="PENDING-ACTIVE" /></set><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+	<parameter name="eipam-ip-block.status" value="PENDING-ACTIVE" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
 	<parameter name="eipam-ip-block.status" value="PENDING-ACTIVE" /></save> <return status="success">
  
 </return></block></outcome><outcome value="Other"> 
@@ -45,7 +45,7 @@
 </return></block></outcome><outcome value="Other"> 
 
 <block><save 
-	plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 	resource='SQL'
 	key="UPDATE EIPAM_IP_SUBNETS
              SET status = 'ERROR'
@@ -53,7 +53,7 @@
     force='true'
         pfx='pfx.eipam-subnet-row'>
 </save><set>
-	<parameter name="eipam-ip-block.status" value="ERROR" /></set><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+	<parameter name="eipam-ip-block.status" value="ERROR" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
 	<parameter name="eipam-ip-block.status" value="ERROR" /></save><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
 <parameter name="key1" value="IpBlockInstall failure and pool deletion failed in EIPAM, need to manually delete."/></execute><update plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource="vpe" key="vnf-id = $data-change-notification-input.key-data[0].key-value" pfx="vpe-after">
 	<parameter name="operational-state" value="NCS_IP_SUBNET_INSTALL_ERROR" />
@@ -72,7 +72,7 @@
               <parameter name="error-message" value="Unknown Address Plan - not supported!" />
 </return></outcome><outcome value='true'>
 <block atomic='true'><get-resource
-        plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * FROM EIPAM_IP_POOLS where plan_name = $eipam-ip-block.plan-name and level = 2 and key_value = $tmp.level2-key-value ;"
         pfx='tmp.eipam-pool-row'>
@@ -109,7 +109,7 @@
   		<parameter name="error-code" value="500" />
               <parameter name="error-message" value="Unknown EIPAM pool - not found in DB!" />
 </return></block></outcome></get-resource><!--initial subnet should exists--><get-resource
-        plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * from EIPAM_IP_SUBNETS s, EIPAM_IP_SUBNET_KEYS k WHERE s.plan_name = $eipam-ip-block.plan-name and s.entity_id = k.entity_id and k.level = 2 and k.key_value = $tmp.level2-key-value and s.address_family = $tmp.version ; "
         pfx='pfx.eipam-initial-subnet'>
@@ -124,7 +124,7 @@
 	<parameter name="error-code" value="500"/>
 	<parameter name="error-message" value="Initial subnet not found, cannot auto extend." />
 	</return></outcome></get-resource><!--check if new subnet already exists, possibly from previous attempt.--><get-resource
-        plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="SELECT * from EIPAM_IP_SUBNETS s WHERE s.plan_name = $eipam-ip-block.plan-name and s.entity_id = $eipam-ip-block.entity-id and s.ip_address = $eipam-ip-block.ip-address ; "
         pfx='pfx.eipam-subnet-with-same-ip'>
@@ -150,7 +150,7 @@
 	<parameter name="error-message" value="'Error retrieving l3-network with network-id=' + $pfx.eipam-initial-subnet.network-id + 'from AnAI'" /></return></outcome></get-resource><set>
 <parameter name='eipam-ip-block.request-id' value="`$eipam-ip-block.entity-id + '-' + $aai.l3-network.contrail-network-fqdn`" />
 </set><save
-        plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNETS
              SET
@@ -171,7 +171,7 @@
 	<parameter name="error-message" value="Insert to DB table EIPAM_IP_SUBNETS failed." />
 	</return></outcome><outcome value='success'>
 </outcome></save><save
-        plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
              SET
@@ -187,7 +187,7 @@
 	<parameter name="error-code" value="500"/>
 	<parameter name="error-message" value="Insert to DB table EIPAM_IP_SUBNET_KEYS failed." />
 	</return></outcome></save><save
-        plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+        plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
         resource='SQL'
         key="INSERT EIPAM_IP_SUBNET_KEYS
              SET
@@ -311,7 +311,7 @@
 <block>
 <set>
 	<parameter name="eipam-ip-block.status" value="ERROR" /></set><save 
-	plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 	resource='SQL'
 	key="UPDATE EIPAM_IP_SUBNETS
              SET status = 'ERROR'
@@ -330,7 +330,7 @@
 	</return></outcome></save><delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" 
 	resource="subnet" 
 	key="l3-network.network-id = $pfx.eipam-initial-subnet.network-id
-				AND subnet.subnet-id = $eipam-ip-block.entity-id"></delete><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+				AND subnet.subnet-id = $eipam-ip-block.entity-id"></delete><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
 	<parameter name="eipam-ip-block.status" value="ERROR" /></save><return status='failure'>
 	<parameter name='eipam-ip-block.request-id' value="`$eipam-ip-block.entity-id + '-' + $aai.l3-network.contrail-network-fqdn`" />
 	<parameter name="error-code" value="500" />
@@ -364,7 +364,7 @@
 <parameter name="field7" value="`$eipam-ip-block.prefix-length`"/>
 <parameter name="field8" value="`$eipam-ip-block.status`"/>
 <parameter name="field9" value="`$tmp.key-value`"/></record><save 
-	plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 	resource='SQL'
 	key="UPDATE EIPAM_IP_SUBNETS
              SET status = 'ERROR'
@@ -399,7 +399,7 @@
 	<parameter name='eipam-ip-block.request-id' value="`$eipam-ip-block.entity-id + '-' + $aai.l3-network.contrail-network-fqdn`" />
 	<parameter name="error-code" value="500" />
 	<parameter name="error-message" value="'Cannot save subnet status to Created with l3 network-id=' + $pfx.eipam-initial-subnet.network-id + ' And subnet-id=' + $eipam-ip-block.entity-id  + ' in AnAI'" /></return></block></outcome></update><save 
-	plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 	resource='SQL'
 	key="UPDATE EIPAM_IP_SUBNETS
              SET status = 'CREATED'
@@ -421,7 +421,7 @@
 	<parameter name="error-code" value="500"/>
 	<parameter name="error-message" value="An error occured while activating subnet in EIPAM." />
 	</return></outcome></execute><save 
-	plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' 
+	plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' 
 	resource='SQL'
 	key="UPDATE EIPAM_IP_SUBNETS
              SET status = 'ACTIVE'