Update DG namepaces

Added script src/main/scripts/updateDgNamespace.sh to update namespace
references in DG XML files, and used that script to update all DG XMLs.

Change-Id: I6ce75fcb5e1edee421560f6d539a7f0921fdf22a
Issue-ID: SDNC-95
Signed-off-by: Dan Timoney <dtimoney@att.com>
Former-commit-id: 51970f69236c65abee61f0099c8137c01e9fe26d

diff --git a/platform-logic/src/main/scripts/updateDgNamespace.sh b/platform-logic/src/main/scripts/updateDgNamespace.sh
new file mode 100755 (executable)
index 0000000..cb93c6b
--- /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 9f66d1d..2cf91a8 100644 (file)
--- 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 {
 \r
 <return status='failure'>\r
        <parameter name='error-code' value='400'/>\r
-       <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 25da4ee..14e33e1 100644 (file)
--- 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`'/>\r
 \r
  \r
-</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 33cc67a..92592d8 100644 (file)
--- 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`"/>\r
 \r
  \r
-</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 c1718dc..3f6033d 100644 (file)
--- 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`'/>\r
 \r
  \r
-</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 f0ae90d..e6c34ad 100644 (file)
--- 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`'/>\r
 \r
  \r
-</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 433ce35..2e212af 100644 (file)
--- 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'/>\r
        <parameter name="error-code" value="500" />\r
     <parameter name="error-message" value="Error in EIPAM unassign IP address on rollback." />\r
-</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 a1befe7..4873821 100644 (file)
--- 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'>\r
        <parameter name='error-code' value='400'/>\r
        <parameter name='error-message' value='svc-action not recognized'/>\r
-</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 b2754f5..24993b0 100644 (file)
--- 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'>\r
        <parameter name='error-code' value='400'/>\r
        <parameter name='error-message' value='svc-action not recognized'/>\r
-</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 70be5ba..9d2a53d 100644 (file)
--- 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>\r
        <parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>\r
 <parameter name="ack-final" value="Y"/></set><return status='success'>\r
-       <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 ddbd377..91885cb 100644 (file)
--- 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.' />\r
 </set><execute plugin='org.openecomp.sdnc.sli.SliPluginUtils.SliPluginUtils' method='printContext' >\r
 <parameter name='filename' value='/var/tmp/bgb-vnfapi-vfmodule.log' />\r
-</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 86a4632..ad94d52 100644 (file)
--- 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'/>\r
        <parameter name='error-message' value="Encountered error while updating vf-module orchestration-status in AnAI"/></return></block></outcome></update><set>\r
        <parameter name="service-data.oper-status.order-status" value="PendingCreate"/></set><set>\r
-<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 e64d8f9..e0afa6e 100644 (file)
--- 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>\r
        <parameter name="service-data." value="" /> \r
 </set><set>\r
-<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 acf2f17..92480d8 100644 (file)
--- 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'>\r
        <parameter name='error-code' value='400'/>\r
        <parameter name='error-message' value='svc-action not recognized'/>\r
-</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 5f4a12e..143a87d 100644 (file)
--- 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>\r
        <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>\r
        <parameter name="service-data." value="" /> \r
-</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 021fe9e..f03a7c7 100644 (file)
--- 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>\r
        <parameter name="service-data.oper-status.last-action" value="`$service-data.request-information.request-action`"/></set><set>\r
 <parameter name="ack-final" value="Y"/></set><return status='success'>\r
-       <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 f44c8d2..77b8555 100644 (file)
--- 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="" /> \r
 </set><set>\r
 <parameter name="ack-final" value="Y"/></set><return status='success'>\r
-       <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 a89ee7b..ae4d67b 100644 (file)
--- 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'>\r
-<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 1f8df4e..3335d7c 100644 (file)
--- 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'>\r
        <parameter name='error-code' value='400'/>\r
        <parameter name='error-message' value='svc-action not recognized'/>\r
-</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 cbb1be6..d39e92b 100644 (file)
--- 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>\r
        <parameter name="service-data." value="" /> \r
 </set><return status='success'>\r
-       <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>