diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-10-26 11:06:40 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-10-26 11:10:31 -0400 |
| commit | 191aaa5c7057a62b98899c911e316fd7d364de21 (patch) | |
| tree | e13e9c1ac62948ff1d1c45d8a164bf62e6c0c780 /platform-logic/generic-resource-api/src/main/xml | |
| parent | 572beff15c4f21dd34b768f9c5815ad1d40f3bd5 (diff) | |
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
Diffstat (limited to 'platform-logic/generic-resource-api/src/main/xml')
36 files changed, 129 insertions, 129 deletions
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml index 1ec0b8a0..ad3c1436 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-activate.xml @@ -115,4 +115,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml index 3e557868..191556db 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-assign.xml @@ -233,4 +233,4 @@ value="`$brg-ar-assignments.`" /> <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></outcome></get-resource></block></method></service-logic>
\ No newline at end of file +</return></block></outcome></get-resource></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml index e8edc573..54c99cbf 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-create.xml @@ -97,4 +97,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml index af9e9190..671882ad 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-deactivate.xml @@ -115,4 +115,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml index cb4eac98..40effacd 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-delete.xml @@ -102,4 +102,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml index 74cc16b0..0a01dd9c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation-unassign.xml @@ -78,4 +78,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation.xml index 2434d1ab..90a9389c 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_brg-topology-operation.xml @@ -23,4 +23,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml index 0b34e574..fb62d6d5 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-allocate-network-role-subnet.xml @@ -20,7 +20,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
</return></outcome></execute><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 = $network-model.eipam-v4-address-plan and level = 1 and key_value = $tmp.level1-key-value ; "
pfx='pfx.eipam-pool-row'>
@@ -42,7 +42,7 @@ <parameter name="field5" value="`$tmp.level1-key-value`"/>
<parameter name="field6" value="`$tmp.eipam-pool-row.pool-id`"/>
<parameter name="field7" value="Level 1 subnet saved to DB."/></record><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
@@ -62,7 +62,7 @@ <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
</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
@@ -108,7 +108,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
</return></outcome></execute><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 = $network-model.eipam-v4-address-plan and level = 2 and parent_pool = $tmp.level1-key-value AND key_value = $tmp.level2-key-value ; "
pfx='pfx.eipam-pool-row'>
@@ -122,7 +122,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V4 subnet in EIPAM." />
</return></outcome></get-resource><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
@@ -142,7 +142,7 @@ <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
</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
@@ -157,7 +157,7 @@ <parameter name='error-code' value='500' />
<parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
</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
@@ -201,7 +201,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
</return></outcome></execute><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 = $network-model.eipam-v6-address-plan and level = 1 and key_value = $tmp.level1-key-value ; "
pfx='pfx.eipam-pool-row'>
@@ -215,7 +215,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
</return></outcome></get-resource><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
@@ -235,7 +235,7 @@ <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
</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
@@ -289,7 +289,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while allocating V4 subnet in EIPAM." />
</return></outcome></execute><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 = $network-model.eipam-v6-address-plan and level = 2 and parent_pool = $tmp.level1-key-value AND key_value = $tmp.level2-key-value ; "
pfx='pfx.eipam-pool-row'>
@@ -303,7 +303,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while looking for entry in EIPAM_IP_POOLS for V6 subnet in EIPAM." />
</return></outcome></get-resource><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
@@ -323,7 +323,7 @@ <parameter name='error-message' value='failed to update EIPAM_IP_SUBNETS table.' />
</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
@@ -338,7 +338,7 @@ <parameter name='error-message' value='failed to update EIPAM_IP_SUBNET_KEYS table.' />
</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
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml index fd63eb91..ae2bb75d 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_eipam-create-network-role-pool.xml @@ -12,7 +12,7 @@ <parameter name="tmp.v6-level2-key-name" value="NETWORK_ROLE:NETWORK_ID" /></set><switch test="`$tmp.region`"><outcome value="USA"><set>
<parameter name="tmp.region" value="US" />
</set></outcome></switch><switch test="`$network-model.use-ipv4`"><outcome value='Y'><block atomic='true'><switch test="`$eipam-ip-block.level`"><outcome value='1'><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 = $network-model.eipam-v4-address-plan and level = 1 and key_value = $tmp.level1-key-value ;"
pfx='tmp.eipam-pool-row'>
@@ -143,7 +143,7 @@ <parameter name="field8" value="`$eipam-ip-block.plans[$eipam-ip-block.plans_length].requests[0].pools[1].key-value`"/>
</record><set>
<parameter name="eipam-ip-block.plans_length" value="`$eipam-ip-block.plans_length + 1`" /></set></block></outcome></switch></block></outcome><outcome value=""></outcome><outcome value='N'></outcome></switch><switch test="`$network-model.use-ipv6`"><outcome value='Y'><block atomic='true'><switch test="`$eipam-ip-block.level`"><outcome value='1'><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 = $network-model.eipam-v6-address-plan and level = 1 and key_value = $tmp.level1-key-value ;"
pfx='tmp.eipam-pool-row'>
@@ -295,7 +295,7 @@ <parameter name="error-code" value="500"/>
<parameter name="error-message" value="An error occured while creating pool in EIPAM." />
</return></outcome></execute></outcome><outcome value='N'></outcome></switch></outcome></switch><switch test="`$network-model.use-ipv4`"><outcome value='Y'><block atomic='true'><switch test="`$tmp.create-v4-pool-flag`"><outcome value='Y'><block atomic='true'><switch test="`$eipam-ip-block.level`"><outcome value='1'><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_POOLS
SET
@@ -313,7 +313,7 @@ <parameter name='error-code' value='500' />
<parameter name='error-message' value='failed to update EIPAM_IP_POOLS .' />
</return></outcome><outcome value='Other'></outcome><outcome value='Other'></outcome></save></outcome><outcome value='2'><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_POOLS
SET
@@ -344,7 +344,7 @@ <parameter name="field10" value="`$tmp.network-id`"/>
<parameter name="field11" value="Saving to EIPAM_IP_POOLS table."/>
</record></block></outcome><outcome value='N'></outcome></switch></block></outcome><outcome value=""></outcome><outcome value='N'></outcome></switch><switch test="`$network-model.use-ipv6`"><outcome value='Y'><block atomic='true'><switch test="`$tmp.create-v6-pool-flag`"><outcome value='Y'><block atomic='true'><switch test="`$eipam-ip-block.level`"><outcome value='1'><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_POOLS
SET
@@ -362,7 +362,7 @@ <parameter name='error-code' value='500' />
<parameter name='error-message' value='failed to update EIPAM_IP_POOLS .' />
</return></outcome></save></outcome><outcome value='2'><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_POOLS
SET
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml index b00bc79a..f74af961 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_generate-unique-name.xml @@ -10,7 +10,7 @@ </return></outcome></switch><set>
<parameter name='tmp.gun.sql' value="`'SELECT * from GENERIC_RESOURCE_NAME WHERE type = $generate-unique-name-input.name-table-type'
+ ' AND name = $generate-unique-name-input.supplied-name'`" />
-</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="`$tmp.gun.sql`" pfx='tmp.gun.namedb'>
<outcome value='failure'>
@@ -22,7 +22,7 @@ <parameter name='tmp.gun.sql' value="`'insert into GENERIC_RESOURCE_NAME values ( '
+ ' $generate-unique-name-input.name-table-type , $generate-unique-name-input.supplied-name )'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
@@ -62,7 +62,7 @@ <parameter name='tmp.gun.sql' value="`'SELECT * from ' + $generate-unique-name-input.index-table-name
+ ' WHERE ' + $generate-unique-name-input.index-table-prefix-column + ' = '
+ '$generate-unique-name-input.prefix'`" />
-</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="`$tmp.gun.sql`" pfx='tmp.gun.prefixdb'>
<outcome value='success'>
@@ -116,7 +116,7 @@ </set><set>
<parameter name='tmp.gun.sql' value="`'SELECT * from GENERIC_RESOURCE_NAME WHERE type = $generate-unique-name-input.name-table-type'
+ ' AND name = $tmp.gun.generated-name'`" />
-</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="`$tmp.gun.sql`" pfx='tmp.gun.namedb'>
<outcome value='failure'>
@@ -143,7 +143,7 @@ + ' set index_number = ' + $tmp.gun.index-string + ' where '
+ $generate-unique-name-input.index-table-prefix-column
+ ' = $generate-unique-name-input.prefix'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
@@ -154,7 +154,7 @@ + '(' + $generate-unique-name-input.index-table-prefix-column + ', index_number) values ('
+ ' $generate-unique-name-input.prefix , ' + $tmp.gun.index-string + ')'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
@@ -163,7 +163,7 @@ <parameter name='tmp.gun.sql' value="`'insert into GENERIC_RESOURCE_NAME values ( '
+ ' $generate-unique-name-input.name-table-type , $tmp.gun.generated-name )'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
@@ -209,7 +209,7 @@ </set><set>
<parameter name='tmp.gun.sql' value="`'SELECT * from GENERIC_RESOURCE_NAME WHERE type = $generate-unique-name-input.name-table-type'
+ ' AND name = $tmp.gun.generated-name'`" />
-</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="`$tmp.gun.sql`" pfx='tmp.gun.namedb'>
<outcome value='failure'>
@@ -236,7 +236,7 @@ + ' set index_number = ' + $tmp.gun.index-string + ' where '
+ $generate-unique-name-input.index-table-prefix-column
+ ' = $generate-unique-name-input.prefix'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
@@ -247,7 +247,7 @@ + '(' + $generate-unique-name-input.index-table-prefix-column + ', index_number) values ('
+ ' $generate-unique-name-input.prefix , ' + $tmp.gun.index-string + ')'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
@@ -256,7 +256,7 @@ <parameter name='tmp.gun.sql' value="`'insert into GENERIC_RESOURCE_NAME values ( '
+ ' $generate-unique-name-input.name-table-type , $tmp.gun.generated-name )'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.gun.sql`" pfx='pfx'>
<outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml index 9bef4ee9..c8593b71 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-activate.xml @@ -19,7 +19,7 @@ </return></outcome><outcome value='Other'>
<for index='sidx' start='0' end='`$aai.l3-network.subnets.subnet_length`' >
<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_SUBNETS where entity_id = $aai.l3-network.subnets.subnet[$sidx].subnet-id ; "
pfx='tmp.eipam-subnet-row'>
@@ -40,7 +40,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'
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml index 6f03a145..94726cae 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-assign.xml @@ -2,7 +2,7 @@ <block atomic="true"><switch test='`$network-model.is-bound-to-vpn`'> <outcome value='Y'> <block atomic="true"> -<get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +<get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key='SELECT * from VPN_BINDINGS WHERE network_customization_uuid = $network-topology-operation-input.network-information.onap-model-information.model-customization-uuid' pfx='vpn-bindings[]'> @@ -84,7 +84,7 @@ <parameter name="target" value="$role"/> <parameter name="replacement" value="`$network-model.network-role`"/> -</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix = $tmp.network-name-prefix' pfx='db.network-name-prefix'> @@ -98,7 +98,7 @@ <outcome value='Other'> <block atomic="true"><set> <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="update NETWORK_INSTANCE_NAME_INDEX set index_number = $tmp.index-number where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix " @@ -110,7 +110,7 @@ <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" /> </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set> <parameter name='tmp.index-number' value='1' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)" force='false' pfx='pfx'> <outcome value='failure'> @@ -135,7 +135,7 @@ <parameter name="target" value="$role"/> <parameter name="replacement" value="`$network-model.network-role`"/> -</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix = $tmp.network-name-prefix' pfx='db.network-name-prefix'> @@ -149,7 +149,7 @@ <outcome value='Other'> <block atomic="true"><set> <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="update NETWORK_INSTANCE_NAME_INDEX set index_number = $tmp.index-number where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix " @@ -161,7 +161,7 @@ <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" /> </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set> <parameter name='tmp.index-number' value='1' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)" force='false' pfx='pfx'> <outcome value='failure'> @@ -186,7 +186,7 @@ <parameter name="target" value="$role"/> <parameter name="replacement" value="`$network-model.network-role`"/> -</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix = $tmp.network-name-prefix' pfx='db.network-name-prefix'> @@ -200,7 +200,7 @@ <outcome value='Other'> <block atomic="true"><set> <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="update NETWORK_INSTANCE_NAME_INDEX set index_number = $tmp.index-number where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix " @@ -212,7 +212,7 @@ <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" /> </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set> <parameter name='tmp.index-number' value='1' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)" force='false' pfx='pfx'> <outcome value='failure'> @@ -237,7 +237,7 @@ <parameter name="target" value="$role"/> <parameter name="replacement" value="`$network-model.network-role`"/> -</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix = $tmp.network-name-prefix' pfx='db.network-name-prefix'> @@ -251,7 +251,7 @@ <outcome value='Other'> <block atomic="true"><set> <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="update NETWORK_INSTANCE_NAME_INDEX set index_number = $tmp.index-number where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix " @@ -263,7 +263,7 @@ <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" /> </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set> <parameter name='tmp.index-number' value='1' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)" force='false' pfx='pfx'> <outcome value='failure'> @@ -288,7 +288,7 @@ <parameter name="target" value="$role"/> <parameter name="replacement" value="`$network-model.network-role`"/> -</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</execute><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key='SELECT * from NETWORK_INSTANCE_NAME_INDEX WHERE network_instance_name_prefix = $tmp.network-name-prefix' pfx='db.network-name-prefix'> @@ -302,7 +302,7 @@ <outcome value='Other'> <block atomic="true"><set> <parameter name='tmp.index-number' value='`$db.network-name-prefix.index-number+1`' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="update NETWORK_INSTANCE_NAME_INDEX set index_number = $tmp.index-number where network_instance_name_prefix = $db.network-name-prefix.network-instance-name-prefix " @@ -314,7 +314,7 @@ <parameter name="error-message" value="Failed to update SERVICE_INSTANCE_NAME_INDEX table" /> </return></outcome></save></block></outcome><outcome value=''><block atomic="true"><set> <parameter name='tmp.index-number' value='1' /> -</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL' +</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL' key="insert into NETWORK_INSTANCE_NAME_INDEX values ( $tmp.network-name-prefix , 1)" force='false' pfx='pfx'> <outcome value='failure'> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml index cc4291ca..dc919889 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-deactivate.xml @@ -19,7 +19,7 @@ </return></outcome><outcome value='Other'>
<for index='sidx' start='0' end='`$aai.l3-network.subnets.subnet_length`' >
<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_SUBNETS where entity_id = $aai.l3-network.subnets.subnet[$sidx].subnet-id ; "
pfx='tmp.eipam-subnet-row'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml index 79c75355..b987c540 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-unassign.xml @@ -1,5 +1,5 @@ <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='GENERIC-RESOURCE-API' version='${project.version}'><method rpc='network-topology-operation-unassign' mode='sync'>
-<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 NETWORK_MODEL WHERE customization_uuid = $service-data.networks.network[$nidx].network-data.network-information.onap-model-information.model-customization-uuid
and service_uuid = $service-data.networks.network[$nidx].network-data.service-information.onap-model-information.model-uuid'
pfx='network-model'>
@@ -11,7 +11,7 @@ <parameter name="pidx-len" value="0" />
</set><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.network_id = $network-topology-operation-input.network-information.network-id and s.entity_id = k.entity_id ; "
pfx='tmp.eipam-subnet-row[]'>
@@ -69,7 +69,7 @@ <parameter name='tmp.plan-name' value='`$network-model.eipam-v4-address-plan`' />
</set><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 p, EIPAM_IP_SUBNETS s, EIPAM_IP_SUBNET_KEYS k
WHERE p.level = 2
@@ -91,7 +91,7 @@ <parameter name="tmp.level1inuse" value="true" />
</set></block></outcome><outcome value="not-found"><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 p, EIPAM_IP_SUBNETS s, EIPAM_IP_SUBNET_KEYS k
WHERE p.level = 1
@@ -130,7 +130,7 @@ <parameter name='tmp.plan-name' value='`$network-model.eipam-v6-address-plan`' />
</set><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 p, EIPAM_IP_SUBNETS s, EIPAM_IP_SUBNET_KEYS k
WHERE p.level = 2
@@ -152,7 +152,7 @@ <parameter name="tmp.level1inuse" value="true" />
</set></block></outcome><outcome value="not-found"><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 p, EIPAM_IP_SUBNETS s, EIPAM_IP_SUBNET_KEYS k
WHERE p.level = 1
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml index 13e2583a..653e68a8 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml @@ -198,4 +198,4 @@ </return>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_policy-update-notify-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_policy-update-notify-operation.xml index 8fdcad08..c1b4ccde 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_policy-update-notify-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_policy-update-notify-operation.xml @@ -8,7 +8,7 @@ <parameter name='tmp.sql' value="`'insert into POLICY_UPDATE_NOTIFICATION (policy_name,version_id,update_type) values ( '
+ ' $policy-update-notify-operation-input.policy-name , $policy-update-notify-operation-input.version-id , $policy-update-notify-operation-input.update-type )'`" />
-</set><save plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set><save plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key="`$tmp.sql`" pfx='pfx'>
</save><execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
<parameter name='templateFileName' value="`$prop.restapi.templateDir + '/' + $prop.restapi.pm.getpolicy.templatefile`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml index 42d14127..9454f4fc 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_process-eipam-pools.xml @@ -132,7 +132,7 @@ <outcome value='Y'>
<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_SUBNETS s, EIPAM_IP_SUBNET_KEYS k WHERE s.plan_name = $network-model.eipam-v4-address-plan and s.entity_id = k.entity_id and k.level = 1 and k.key_value = $tmp.level1-key-value ; "
pfx='tmp.eipam-subnet-row'>
@@ -270,7 +270,7 @@ <outcome value='Y'>
<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_SUBNETS s, EIPAM_IP_SUBNET_KEYS k WHERE s.plan_name = $network-model.eipam-v6-address-plan and s.entity_id = k.entity_id and k.level = 1 and k.key_value = $tmp.level1-key-value ; "
pfx='tmp.eipam-subnet-row'>
@@ -458,7 +458,7 @@ <outcome value='Y'>
<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_SUBNETS s, EIPAM_IP_SUBNET_KEYS k WHERE s.plan_name = $network-model.eipam-v4-address-plan and s.entity_id = k.entity_id and k.level = 2 and k.key_value = $tmp.level2-key-value ; "
pfx='tmp.eipam-subnet-row'>
@@ -691,7 +691,7 @@ <outcome value='Y'>
<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_SUBNETS s, EIPAM_IP_SUBNET_KEYS k WHERE s.plan_name = $network-model.eipam-v6-address-plan and s.entity_id = k.entity_id and k.level = 2 and k.key_value = $tmp.level2-key-value ; "
pfx='tmp.eipam-subnet-row'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml index 66a710a6..ec375552 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_service-topology-operation-assign.xml @@ -19,7 +19,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="The requested service is pending deletion" />
-</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 SERVICE_MODEL WHERE service_uuid = $service-topology-operation-input.service-information.onap-model-information.model-uuid'
pfx='db.service-model'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml index cb4fffe7..b0104542 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-activate.xml @@ -115,4 +115,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml index 997f7593..419a32cb 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-assign.xml @@ -323,4 +323,4 @@ </get-resource> </block> </method> -</service-logic>
\ No newline at end of file +</service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml index 4db2f611..5c0b9a48 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-create.xml @@ -96,4 +96,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml index 935d925f..dc24e034 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-deactivate.xml @@ -114,4 +114,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml index c92fa402..893e959b 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-delete.xml @@ -101,4 +101,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml index c5755e95..eaab7f29 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation-unassign.xml @@ -77,4 +77,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml index 0ea81c87..277b74d0 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_tunnelxconn-topology-operation.xml @@ -23,4 +23,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml index 3486129d..a695f198 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-brg-input.xml @@ -50,7 +50,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="brg-topology-operation-input.brg-request-input.vlan-tag is a required input" />
-</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 ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $brg-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'
pfx='ar-model'>
@@ -113,4 +113,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml index 3780fade..b84050d6 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-contrail-route-input.xml @@ -67,7 +67,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="contrail-route-topology-operation-input.contrail-route-request-input.contrail-applied-service-info.service-instance-id is a required input" />
-</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 ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $contrail-route-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'
pfx='ar-model'>
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 1f950e64..043c4940 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 @@ -136,7 +136,7 @@ <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.onap-model-information.model-uuid" pfx="service-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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" />
@@ -152,7 +152,7 @@ </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.onap-model-information.model-customization-uuid and service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="network-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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">
<return status="failure">
<parameter name="ack-final" value="Y" />
@@ -172,7 +172,7 @@ </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.onap-model-information.model-uuid" pfx="service-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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" />
@@ -188,7 +188,7 @@ </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.onap-model-information.model-customization-uuid and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="network-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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">
<return status="failure">
<parameter name="ack-final" value="Y" />
@@ -282,7 +282,7 @@ <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.onap-model-information.model-uuid" pfx="service-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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" />
@@ -298,7 +298,7 @@ </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.onap-model-information.model-customization-uuid and service_uuid = $service-data.service-information.onap-model-information.model-uuid" pfx="network-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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">
<return status="failure">
<parameter name="ack-final" value="Y" />
@@ -318,7 +318,7 @@ </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.onap-model-information.model-uuid" pfx="service-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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" />
@@ -334,7 +334,7 @@ </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.onap-model-information.model-customization-uuid and service_uuid = $network-topology-operation-input.service-information.onap-model-information.model-uuid" pfx="network-model">
+ <get-resource plugin="org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource" resource="SQL" 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">
<return status="failure">
<parameter name="ack-final" value="Y" />
@@ -426,4 +426,4 @@ </return>
</block>
</method>
-</service-logic>
\ No newline at end of file +</service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml index f0b3a0ef..9a766540 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-security-zone-input.xml @@ -62,7 +62,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="security-zone-operation-input.security-zone-request-input.untrusted-network-role is a required input" />
-</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 ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $security-zone-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'
pfx='ar-model'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml index 6db0fd57..11d99729 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-tunnelxconn-input.xml @@ -40,7 +40,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="tunnelxconn-topology-operation-input.tunnelxconn-request-input.vlan-tag is a required input" />
-</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 ALLOTTED_RESOURCE_MODEL WHERE customization_uuid = $tunnelxconn-topology-operation-input.allotted-resource-information.onap-model-information.model-customization-uuid'
pfx='ar-model'>
@@ -103,4 +103,4 @@ <parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
<parameter name="error-message" value="`$error-message`" />
-</return></block></method></service-logic>
\ No newline at end of file +</return></block></method></service-logic> diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml index 5d967079..90ff55d3 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-activate.xml @@ -73,7 +73,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />
-</return></outcome></update><update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource'
+</return></outcome></update><update resource='SQL' force='true' plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource'
key='UPDATE EIPAM_IP_ASSIGNMENTS SET status = "ACTIVE" WHERE info = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id'>
<outcome value='failure'>
<return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml index a2c19632..0a00be95 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-assign.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 'CreateVfModuleInstance'" />
-</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 = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'
pfx='db.vf-module-model'>
@@ -146,7 +146,7 @@ </set><set>
<parameter name='tmp.vf-module-topology.vf-module-parameters.'
value='vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.' />
-</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 VF_MODULE_TO_VFC_MAPPING WHERE vf_module_customization_uuid = $vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid'
pfx='db.vf-module-to-vfc-mapping[]'>
@@ -162,7 +162,7 @@ <parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm_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'>
@@ -210,7 +210,7 @@ </return></outcome><outcome value='success'>
<set>
<parameter name='tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index]' value='`$generate-unique-name-output.generated-name`' />
-</set></outcome></call></block></for><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set></outcome></call></block></for><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[]'>
@@ -287,7 +287,7 @@ <block atomic="true"><for index='ip-version-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-information-items.network-information-item_length`' >
<switch test='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-information-items.network-information-item[$ip-version-index].use-dhcp`'>
<outcome value='N'>
-<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 EIPAM_IP_SUBNETS WHERE network_id = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-id
AND address_family = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-networks.vm-network[$network-role-index].network-information-items.network-information-item[$ip-version-index].ip-version'
pfx='db.eipam-ip-subnets[]'>
@@ -307,7 +307,7 @@ </return></outcome></get-resource><set>
<parameter name='max-level' value='-1' />
</set><for index='subnets-index' start='0' end='`$db.eipam-ip-subnets_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 EIPAM_IP_SUBNET_KEYS WHERE entity_id = $db.eipam-ip-subnets[$subnets-index].entity-id'
pfx='db.eipam-ip-subnet-keys[]'>
@@ -328,7 +328,7 @@ <parameter name='max-level' value='`$db.eipam-ip-subnet-keys[$keys-index].level`' />
<parameter name='selected-entity-id' value='`$db.eipam-ip-subnet-keys[$keys-index].entity-id`' />
<parameter name='selected-plan-name' value='`$db.eipam-ip-subnets[$subnets-index].plan-name`' />
-</set></outcome></switch></block></for><get-resource plugin='org.onap.ccsdk.sli.adaptors.sli.resource.sql.SqlResource' resource='SQL'
+</set></outcome></switch></block></for><get-resource plugin='org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource' resource='SQL'
key='SELECT * from EIPAM_IP_SUBNET_KEYS WHERE entity_id = $selected-entity-id order by level'
pfx='db.eipam-ip-subnet-keys[]'>
@@ -428,7 +428,7 @@ <outcome value='true'>
<block atomic="true"><set>
<parameter name='tmp.status' value="`'PENDING_DELETE_' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id`" />
-</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 = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id" ><outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -450,7 +450,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service- <outcome value='true'>
<block atomic="true"><set>
<parameter name='tmp.status' value="`'PENDING_DELETE_' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id`" />
-</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 = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id" ><outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -482,7 +482,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service- <outcome value='true'>
<block atomic="true"><set>
<parameter name='tmp.status' value="`'PENDING_DELETE_' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id`" />
-</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 = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id" ><outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -504,7 +504,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service- <outcome value='true'>
<block atomic="true"><set>
<parameter name='tmp.status' value="`'PENDING_DELETE_' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id`" />
-</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 = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id" ><outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -523,7 +523,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service- <parameter name="error-message" value="`'No vf-module found in AAI for vf module ID ' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-id`" />
</return></block></outcome></save></for></for><for index='vm-type-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm_length`' >
<for index='vm-index' start='0' end='`$tmp.vf-module-topology.vf-module-assignments.vms.vm[$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.vnfs.vnf[$vnf-index].vnf-id
AND ecomp_service_instance_id = $service-data.service-information.service-instance-id
AND vm_name = $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index]' ><outcome value='failure'>
@@ -533,7 +533,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service- <parameter name="field2" value="GENERIC-RESOURCE-API.vf-module-topology-operation-assign:REQID"/>
<parameter name="field3" value="`$vf-module-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, vm_name, cloud_region_id, cloud_owner) VALUES ( $service-data.vnfs.vnf[$vnf-index].vnf-id , $service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-topology.vnf-topology-identifier-structure.vnf-name , $service-data.service-information.service-instance-id , $tmp.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index] , $tmp.vf-module-topology.aic-cloud-region , 'Rackspace')" ><outcome value='failure'>
<record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
<parameter name="logger" value="message-log"/>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml index 79351b24..2525dce5 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation-unassign.xml @@ -58,7 +58,7 @@ </return></outcome><outcome value='Other'>
<block atomic="true"></block></outcome></switch><set>
<parameter name='tmp.status' value="`'PENDING_DELETE_' + $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id`" />
-</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 = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-topology-identifier.vf-module-id" ><outcome value='failure'>
<return status='failure'>
<parameter name='ack-final' value='Y'/>
@@ -75,7 +75,7 @@ key="UPDATE EIPAM_IP_ASSIGNMENTS set status = $tmp.status WHERE info = $service- <parameter name="error-message" value="Error in EIPAM unassign IP address" />
</return></outcome></execute><for silentFailure='true' index='vm-type-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm_length`' >
<for silentFailure='true' index='vm-index' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[$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.vnfs.vnf[$vnf-index].vnf-id
AND ecomp_service_instance_id = $service-data.service-information.service-instance-id
AND vm_name = $service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$vf-module-index].vf-module-data.vf-module-topology.vf-module-assignments.vms.vm[$vm-type-index].vm-names.vm-name[$vm-index]' ><outcome value='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml index 73291628..86ec7d7e 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vnf-topology-operation-assign.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 'CreateVnfInstance'" />
-</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_MODEL WHERE customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
pfx='db.vf-model'>
@@ -182,7 +182,7 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="`'Unable to find aic-clli in AAI for aic-cloud-region ' + $vnf-topology-operation-input.vnf-request-input.aic-cloud-region`" />
-</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_TO_NETWORK_ROLE_MAPPING WHERE vf_customization_uuid = $vnf-topology-operation-input.vnf-information.onap-model-information.model-customization-uuid'
pfx='db.vf-network-role-mapping[]'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml b/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml index a28aa0cc..4eff2d0f 100755 --- a/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml +++ b/platform-logic/generic-resource-api/src/main/xml/SUBNET-API_managed-network-notification.xml @@ -17,7 +17,7 @@ <parameter name="status" value="ACTIVE" />
</save><set>
- <parameter name="eipam-ip-block.status" value="ACTIVE" /></set><save plugin="org.onap.ccsdk.sli.adaptors.sli.resource.mdsal.ConfigResource" resource="eipam-ip-block">
+ <parameter name="eipam-ip-block.status" value="ACTIVE" /></set><save plugin="org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource" resource="eipam-ip-block">
<parameter name="eipam-ip-block.status" value="ACTIVE" /></save><execute plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' method='setStatusMethod' >
<parameter name="key1" value="SUCCESS: eipam-ip-block.status is ACTIVE."/></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="SDNC_COMPLETED" />
@@ -31,7 +31,7 @@ <parameter name="status" value="ERROR" />
</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="ActivateSubnet failure, need to manually activate in EIPAM."/></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">
@@ -62,7 +62,7 @@ <parameter name="status" value="DEALLOCATED" />
</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="Failure from NCS and deletePool 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">
@@ -79,7 +79,7 @@ <parameter name="status" value="ERROR" />
</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="Failure from NCS and deletePool 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">
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'
|