diff options
Diffstat (limited to 'platform-logic')
20 files changed, 32 insertions, 19 deletions
diff --git a/platform-logic/src/main/scripts/updateDgNamespace.sh b/platform-logic/src/main/scripts/updateDgNamespace.sh new file mode 100755 index 00000000..cb93c6be --- /dev/null +++ b/platform-logic/src/main/scripts/updateDgNamespace.sh @@ -0,0 +1,13 @@ +#! /bin/bash + +updateFile() { +sed -i .orig -e ' +s/\(xmlns=.\)http:\/\/www\.onap\.org\/sdnctl\/svclogic/\1http:\/\/www\.onap\.org\/sdnc\/svclogic/g +s/\(xsi:schemaLocation=.\)http:\/\/www\.openecomp\.org\/sdnctl\/svclogic/\1http:\/\/www\.onap\.org\/sdnc\/svclogic/g +' $1 +} + +for file in $@ +do + updateFile $file +done diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml index 9f66d1db..2cf91a8d 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-operation.xml @@ -67,4 +67,4 @@ leaf svc-action { <return status='failure'>
<parameter name='error-code' value='400'/>
- <parameter name='error-message' value='request-action is not found'/></return></outcome></switch></block></method></service-logic>
\ No newline at end of file + <parameter name='error-message' value='request-action is not found'/></return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml index 25da4eec..14e33e18 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-network-topology-operation.xml @@ -17,4 +17,4 @@ <parameter name='error-message' value='Invalid Request `$preload-network-topology-operation-input.request-information.request-action`'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml index 33cc67a3..92592d88 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml @@ -28,4 +28,4 @@ <parameter name='error-message' value="`'Invalid Request, ' + $preload-vf-module-topology-operation-input.request-information.request-action`"/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml index c1718dce..3f6033d4 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml @@ -28,4 +28,4 @@ <parameter name='error-message' value='Invalid Request `$preload-vnf-instance-topology-operation-input.request-information.request-action`'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml index f0ae90dc..e6c34ad4 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-topology-operation.xml @@ -40,4 +40,4 @@ leaf request-action { <parameter name='error-message' value='Invalid Request `$preload-vnf-topology-operation-input.request-information.request-action`'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml index 433ce351..2e212afe 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_rollback-eipam-ip-assignment.xml @@ -19,4 +19,4 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="Error in EIPAM unassign IP address on rollback." />
-</return></outcome></execute></block></method></service-logic>
\ No newline at end of file +</return></outcome></execute></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml index a1befe7f..48738216 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-operation.xml @@ -45,4 +45,4 @@ leaf svc-action { <outcome value='assign'><call module='VNF-API' rpc='vf-module-topology-assign' mode='sync' ></call></outcome><outcome value='changeassign'><call module='VNF-API' rpc='vf-module-topology-changeassign' mode='sync' ></call></outcome><outcome value='activate'><call module='VNF-API' rpc='vf-module-topology-activate' mode='sync' ></call></outcome><outcome value='rollback'><call module='VNF-API' rpc='vf-module-topology-rollback' mode='sync' ></call></outcome><outcome value='delete'><call module='VNF-API' rpc='vf-module-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
<parameter name='error-code' value='400'/>
<parameter name='error-message' value='svc-action not recognized'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml index b2754f52..24993b0d 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-operation.xml @@ -23,4 +23,4 @@ <outcome value='assign'><call module='VNF-API' rpc='vnf-instance-topology-assign' mode='sync' ></call></outcome><outcome value='changeassign'><call module='VNF-API' rpc='vnf-instance-topology-changeassign' mode='sync' ></call></outcome><outcome value='activate'><call module='VNF-API' rpc='vnf-instance-topology-activate' mode='sync' ></call></outcome><outcome value='rollback'><call module='VNF-API' rpc='vnf-instance-topology-rollback' mode='sync' ></call></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-instance-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
<parameter name='error-code' value='400'/>
<parameter name='error-message' value='svc-action not recognized'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml index 70be5ba5..9d2a53d7 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-assign.xml @@ -51,4 +51,4 @@ <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>
<parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>
<parameter name="ack-final" value="Y"/></set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file + <parameter name="error-code" value="200" /></return></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml index ddbd3776..91885cbf 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign-vfmodule.xml @@ -341,4 +341,4 @@ <parameter name='service-data.vnf-topology-information.' value='tmp.vnf-topology.' />
</set><execute plugin='org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils' method='printContext' >
<parameter name='filename' value='/var/tmp/bgb-vnfapi-vfmodule.log' />
-</execute></block></method></service-logic>
\ No newline at end of file +</execute></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign.xml index 86a46326..ad94d52a 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-assign.xml @@ -54,4 +54,4 @@ <parameter name='error-code' value='500'/>
<parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>
<parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>
-<parameter name="ack-final" value="Y"/></set></block></method></service-logic>
\ No newline at end of file +<parameter name="ack-final" value="Y"/></set></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-delete.xml index e64d8f91..e0afa6ee 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-delete.xml @@ -10,4 +10,4 @@ <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
<parameter name="service-data." value="" />
</set><set>
-<parameter name="ack-final" value="Y"/></set></block></method></service-logic>
\ No newline at end of file +<parameter name="ack-final" value="Y"/></set></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-operation.xml index acf2f17a..92480d85 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-operation.xml @@ -38,4 +38,4 @@ leaf svc-action { <call module='VNF-API' rpc='vnf-topology-automated-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-automated-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
<parameter name='error-code' value='400'/>
<parameter name='error-message' value='svc-action not recognized'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-rollback.xml index 5f4a12e9..143a87dc 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-automated-rollback.xml @@ -9,4 +9,4 @@ <parameter name="service-data.oper-status.order-status" value="Deleted"/></set><set>
<parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
<parameter name="service-data." value="" />
-</set></block></method></service-logic>
\ No newline at end of file +</set></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml index 021fe9e1..f03a7c7a 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-changeassign.xml @@ -78,4 +78,4 @@ leaf order-status { <parameter name="service-data.oper-status.order-status" value="PendingUpdate"/></set><set>
<parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
<parameter name="ack-final" value="Y"/></set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file + <parameter name="error-code" value="200" /></return></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml index f44c8d2f..77b8555a 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-delete.xml @@ -12,4 +12,4 @@ <parameter name="service-data." value="" />
</set><set>
<parameter name="ack-final" value="Y"/></set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file + <parameter name="error-code" value="200" /></return></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml index a89ee7bf..ae4d67bd 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-operation.xml @@ -1,2 +1,2 @@ <service-logic xmlns='http://www.openecomp.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.openecomp.org/sdnc/svclogic ./svclogic.xsd' module='VNF-API' version='${project.version}'><method rpc='vnf-topology-operation' mode='sync'>
-<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.use-preload`"><outcome value='Y'><call module='VNF-API' rpc='vnf-topology-preload-operation' mode='sync' ></call></outcome><outcome value=''><call module='VNF-API' rpc='vnf-topology-preload-operation' mode='sync' ></call></outcome><outcome value='N'><call module='VNF-API' rpc='vnf-topology-automated-operation' mode='sync' ></call></outcome></switch></block></method></service-logic>
\ No newline at end of file +<block atomic="true"><switch test="`$vnf-topology-operation-input.vnf-request-information.use-preload`"><outcome value='Y'><call module='VNF-API' rpc='vnf-topology-preload-operation' mode='sync' ></call></outcome><outcome value=''><call module='VNF-API' rpc='vnf-topology-preload-operation' mode='sync' ></call></outcome><outcome value='N'><call module='VNF-API' rpc='vnf-topology-automated-operation' mode='sync' ></call></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-preload-operation.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-preload-operation.xml index 1f8df4e9..3335d7c6 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-preload-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-preload-operation.xml @@ -83,4 +83,4 @@ leaf svc-action { <parameter name='error-message' value='aic-cloud-region cannot be NULL'/></return></outcome></switch></block><call module='VNF-API' rpc='vnf-topology-rollback' mode='sync' ></call></block></outcome><outcome value='delete'><call module='VNF-API' rpc='vnf-topology-delete' mode='sync' ></call></outcome><outcome value='Other'><return status='failure'>
<parameter name='error-code' value='400'/>
<parameter name='error-message' value='svc-action not recognized'/>
-</return></outcome></switch></block></method></service-logic>
\ No newline at end of file +</return></outcome></switch></block></method></service-logic> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml index cbb1be63..d39e92b5 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-rollback.xml @@ -10,4 +10,4 @@ <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>
<parameter name="service-data." value="" />
</set><return status='success'>
- <parameter name="error-code" value="200" /></return></block></method></service-logic>
\ No newline at end of file + <parameter name="error-code" value="200" /></return></block></method></service-logic> |