From 7629aef322c86ae2824d431f444267b46c16af7d Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Wed, 20 Sep 2017 18:00:14 -0400 Subject: Update DG namepaces - fixed Fixed 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: Idc9867007fbf46e17b336ed8bb33fdd08670a6ea Issue-ID: SDNC-95 Signed-off-by: Dan Timoney Former-commit-id: fafd0e6f7408803ae2a1fc0bef2a8a06cc08f2e6 --- .../xml/VNF-API_generate-l3network-network-id.xml | 10 +-- .../xml/VNF-API_generate-subnets-subnet-id.xml | 10 +-- .../main/xml/VNF-API_network-topology-assign.xml | 76 +++++++++++----------- .../xml/VNF-API_network-topology-changeassign.xml | 44 ++++++------- .../main/xml/VNF-API_network-topology-delete.xml | 16 ++--- .../xml/VNF-API_network-topology-operation.xml | 2 +- .../main/xml/VNF-API_network-topology-rollback.xml | 14 ++-- .../VNF-API_preload-network-topology-operation.xml | 2 +- ...NF-API_preload-vf-module-topology-operation.xml | 2 +- ...API_preload-vnf-instance-topology-operation.xml | 2 +- .../xml/VNF-API_preload-vnf-topology-operation.xml | 2 +- .../xml/VNF-API_rollback-eipam-ip-assignment.xml | 2 +- .../xml/VNF-API_vf-module-topology-activate.xml | 6 +- ...-API_vf-module-topology-assign-vnf-networks.xml | 10 +-- .../main/xml/VNF-API_vf-module-topology-assign.xml | 14 ++-- .../VNF-API_vf-module-topology-changeassign.xml | 14 ++-- .../main/xml/VNF-API_vf-module-topology-delete.xml | 4 +- .../xml/VNF-API_vf-module-topology-operation.xml | 2 +- .../xml/VNF-API_vf-module-topology-rollback.xml | 4 +- .../xml/VNF-API_vnf-instance-topology-activate.xml | 6 +- ...I_vnf-instance-topology-assign-vnf-networks.xml | 10 +-- .../xml/VNF-API_vnf-instance-topology-assign.xml | 14 ++-- .../VNF-API_vnf-instance-topology-changeassign.xml | 14 ++-- .../xml/VNF-API_vnf-instance-topology-delete.xml | 4 +- .../VNF-API_vnf-instance-topology-operation.xml | 2 +- .../xml/VNF-API_vnf-instance-topology-rollback.xml | 4 +- .../src/main/xml/VNF-API_vnf-topology-activate.xml | 6 +- .../xml/VNF-API_vnf-topology-assign-vfmodule.xml | 10 +-- .../src/main/xml/VNF-API_vnf-topology-assign.xml | 12 ++-- ...-API_vnf-topology-automated-assign-vfmodule.xml | 10 +-- .../xml/VNF-API_vnf-topology-automated-assign.xml | 12 ++-- .../xml/VNF-API_vnf-topology-automated-delete.xml | 2 +- .../VNF-API_vnf-topology-automated-operation.xml | 2 +- .../VNF-API_vnf-topology-automated-rollback.xml | 2 +- .../main/xml/VNF-API_vnf-topology-changeassign.xml | 12 ++-- .../main/xml/VNF-API_vnf-topology-changedelete.xml | 4 +- .../src/main/xml/VNF-API_vnf-topology-delete.xml | 2 +- .../main/xml/VNF-API_vnf-topology-operation.xml | 2 +- .../xml/VNF-API_vnf-topology-preload-operation.xml | 2 +- .../src/main/xml/VNF-API_vnf-topology-rollback.xml | 2 +- 40 files changed, 185 insertions(+), 185 deletions(-) (limited to 'platform-logic/vnfapi/src') diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml index a08a7a26..efe7d6b8 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-l3network-network-id.xml @@ -17,24 +17,24 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> - + - - + diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml index 5903707d..dca7e0fa 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_generate-subnets-subnet-id.xml @@ -17,25 +17,25 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> - + - - + diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml index 5e787c7c..4d690175 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-assign.xml @@ -17,13 +17,13 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> - - @@ -60,7 +60,7 @@ - @@ -69,14 +69,14 @@ - - @@ -97,11 +97,11 @@ - - @@ -119,18 +119,18 @@ - - - - - @@ -170,7 +170,7 @@ - - - - - - - @@ -229,21 +229,21 @@ - - - @@ -251,12 +251,12 @@ - - @@ -264,14 +264,14 @@ - - @@ -279,7 +279,7 @@ - @@ -293,7 +293,7 @@ - @@ -301,35 +301,35 @@ - - - - - - @@ -341,14 +341,14 @@ - - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml index 006c65d6..4525ffa8 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-changeassign.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - - @@ -145,7 +145,7 @@ - @@ -213,7 +213,7 @@ - @@ -254,7 +254,7 @@ - @@ -273,7 +273,7 @@ - @@ -291,7 +291,7 @@ - @@ -316,7 +316,7 @@ - @@ -330,7 +330,7 @@ - @@ -344,7 +344,7 @@ - @@ -359,7 +359,7 @@ - @@ -373,7 +373,7 @@ - @@ -387,7 +387,7 @@ - @@ -404,7 +404,7 @@ - @@ -423,7 +423,7 @@ - @@ -436,7 +436,7 @@ - @@ -449,7 +449,7 @@ - @@ -465,7 +465,7 @@ - @@ -477,7 +477,7 @@ - @@ -497,7 +497,7 @@ - @@ -508,7 +508,7 @@ - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml index fd31513d..ab266a10 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-delete.xml @@ -17,10 +17,10 @@ ============LICENSE_END========================================================= --> - - + @@ -31,14 +31,14 @@ - - @@ -49,14 +49,14 @@ - - @@ -67,7 +67,7 @@ - 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 2cf91a8d..5d97ce1e 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 @@ -1,4 +1,4 @@ - + diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml index 83c181a9..61c87906 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_network-topology-rollback.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - @@ -30,13 +30,13 @@ - - @@ -48,14 +48,14 @@ - - @@ -63,7 +63,7 @@ - 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 14e33e18..3c1c5a3b 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 @@ -1,4 +1,4 @@ - + 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 92592d88..966f66b9 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vf-module-topology-operation.xml @@ -1,4 +1,4 @@ - + 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 3f6033d4..97e4a18e 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_preload-vnf-instance-topology-operation.xml @@ -1,4 +1,4 @@ - + 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 e6c34ad4..5c0f25d6 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 @@ -1,4 +1,4 @@ - + - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> @@ -28,7 +28,7 @@ - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml index 808fffd8..ec0af290 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign-vnf-networks.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> @@ -37,7 +37,7 @@ - @@ -52,7 +52,7 @@ - @@ -90,7 +90,7 @@ - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml index 99d52408..ad23cacb 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-assign.xml @@ -17,10 +17,10 @@ ============LICENSE_END========================================================= --> - - + - - - - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> - - - @@ -52,7 +52,7 @@ - - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml index 10a265aa..78cec6a3 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-delete.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> 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 48738216..dbe31b26 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 @@ -1,4 +1,4 @@ - + diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml index d5e27b1f..3629a9a0 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vf-module-topology-rollback.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml index 88a2c634..e301b31f 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-activate.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> @@ -28,7 +28,7 @@ - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml index acee4ff1..0190de74 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign-vnf-networks.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> @@ -38,7 +38,7 @@ - @@ -53,7 +53,7 @@ - @@ -91,7 +91,7 @@ - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml index 047f9cb5..05a551df 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-assign.xml @@ -17,10 +17,10 @@ ============LICENSE_END========================================================= --> - - + @@ -31,23 +31,23 @@ - - - - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml index ff828b7b..d9b504ba 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-changeassign.xml @@ -17,12 +17,12 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> - @@ -31,7 +31,7 @@ - @@ -39,7 +39,7 @@ - @@ -49,14 +49,14 @@ - - diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml index a7fc602f..b474eec8 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-delete.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> 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 24993b0d..daaab9ce 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 @@ -1,4 +1,4 @@ - + diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml index 9b185f90..8f2d84d7 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-instance-topology-rollback.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> diff --git a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml index 1b5ad0c8..be610231 100644 --- a/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml +++ b/platform-logic/vnfapi/src/main/xml/VNF-API_vnf-topology-activate.xml @@ -17,9 +17,9 @@ ============LICENSE_END========================================================= --> - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> @@ -52,7 +52,7 @@ leaf order-status { - - + xsi:schemaLocation="http://www.onap.org/sdnc/svclogic ./svclogic.xsd" module='VNF-API' version='${project.version}'> - - - - + @@ -16,7 +16,7 @@ leaf order-status { } --> - + 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 ae4d67bd..803d5a50 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 @@ - + 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 3335d7c6..55c81ad3 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 @@ -1,4 +1,4 @@ - + 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 d39e92b5..00136539 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 @@ -1,4 +1,4 @@ - + -- cgit 1.2.3-korg