Change SDNC namespace

SDNC now uses the org:onap namespace, not org:openecomp.

Issue: SO-231
Change-Id: I434bcb6d2b330a0d536368a5f3d6b86615980314
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
index 80ec724..e89c64e 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
@@ -89,7 +89,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                        "</vfModuleException>" + EOL;\r
                                        \r
        private final String sdncAdapterDeleteCallback =\r
-               "<output xmlns=\"org:openecomp:sdnctl:l3api\">" + EOL +\r
+               "<output xmlns=\"org:onap:sdnctl:l3api\">" + EOL +\r
                "  <svc-request-id>{{REQUEST-ID}}</svc-request-id>" + EOL +\r
                "  <ack-final-indicator>Y</ack-final-indicator>" + EOL +\r
                "</output>" + EOL;\r
@@ -576,4 +576,4 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                        }\r
 \r
        \r
-}
\ No newline at end of file
+}

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java
index 18a5e07..1d0cb0c 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoCreateVfModuleRollbackTest.java
@@ -67,7 +67,7 @@ public class DoCreateVfModuleRollbackTest extends WorkflowTest {
                        "</vfModuleException>" + EOL;\r
                                \r
        private final String sdncAdapterDeleteCallback =\r
-               "<output xmlns=\"org:openecomp:sdnctl:l3api\">" + EOL +\r
+               "<output xmlns=\"org:onap:sdnctl:l3api\">" + EOL +\r
                "  <svc-request-id>{{REQUEST-ID}}</svc-request-id>" + EOL +\r
                "  <ack-final-indicator>Y</ack-final-indicator>" + EOL +\r
                "</output>" + EOL;\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java
index 488c532..c741dfd 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DoDeleteVfModuleTest.java
@@ -70,7 +70,7 @@ public class DoDeleteVfModuleTest extends WorkflowTest {
                        "</vfModuleException>" + EOL;\r
                                \r
        private final String sdncAdapterDeleteCallback =\r
-               "<output xmlns=\"org:openecomp:sdnctl:l3api\">" + EOL +\r
+               "<output xmlns=\"org:onap:sdnctl:l3api\">" + EOL +\r
                "  <svc-request-id>{{REQUEST-ID}}</svc-request-id>" + EOL +\r
                "  <ack-final-indicator>Y</ack-final-indicator>" + EOL +\r
                "</output>" + EOL;\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
index 4b3ac85..5e0b8c6 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/DeleteGenericVNFV1/sdncAdapterResponse.xml
@@ -1,7 +1,7 @@
 <sdncadapterworkflow:SDNCAdapterWorkflowResponse xmlns:sdncadapterworkflow="http://org.openecomp/mso/workflow/schema/v1">\r
        <sdncadapterworkflow:response-data>\r
                <tag0:RequestData xmlns:tag0="http://org.openecomp/workflow/sdnc/adapter/schema/v1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">\r
-               &lt;output xmlns="org:openecomp:sdnctl:vnf"&gt;&lt;svc-request-id&gt;1660b8da-0a94-442d-8ed5-ea079e3c67c8&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;vnf-information&gt;&lt;vnf-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/vnf-id&gt;&lt;/vnf-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;\r
+               &lt;output xmlns="org:onap:sdnctl:vnf"&gt;&lt;svc-request-id&gt;1660b8da-0a94-442d-8ed5-ea079e3c67c8&lt;/svc-request-id&gt;&lt;response-code&gt;200&lt;/response-code&gt;&lt;ack-final-indicator&gt;Y&lt;/ack-final-indicator&gt;&lt;vnf-information&gt;&lt;vnf-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/vnf-id&gt;&lt;/vnf-information&gt;&lt;service-information&gt;&lt;service-type&gt;a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb&lt;/service-type&gt;&lt;service-instance-id&gt;8925b50d-de67-44c1-b984-e7ce7b0f4dae&lt;/service-instance-id&gt;&lt;subscriber-name&gt;notsurewecare&lt;/subscriber-name&gt;&lt;/service-information&gt;&lt;/output&gt;\r
                </tag0:RequestData>\r
        </sdncadapterworkflow:response-data>\r
-</sdncadapterworkflow:SDNCAdapterWorkflowResponse>
\ No newline at end of file
+</sdncadapterworkflow:SDNCAdapterWorkflowResponse>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
index 410ba05..d81b7e8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryBRGCallback.xml
@@ -1,5 +1,5 @@
-<output xmlns="org:openecomp:sdnctl:vnf">\r
-<brg-topology  xmlns="org:openecomp:sdnctl:vnf">\r
+<output xmlns="org:onap:sdnctl:vnf">\r
+<brg-topology  xmlns="org:onap:sdnctl:vnf">\r
     <ecomp-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
index ac85be4..f770ec6 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/CreateVcpeResCustService/SDNCTopologyQueryTXCCallback.xml
@@ -1,5 +1,5 @@
-<output xmlns="org:openecomp:sdnctl:vnf">\r
-<tunnelxconn-topology  xmlns="org:openecomp:sdnctl:vnf">\r
+<output xmlns="org:onap:sdnctl:vnf">\r
+<tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">\r
     <ecomp-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
index 410ba05..d81b7e8 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceBRG/SDNCTopologyQueryCallback.xml
@@ -1,5 +1,5 @@
-<output xmlns="org:openecomp:sdnctl:vnf">\r
-<brg-topology  xmlns="org:openecomp:sdnctl:vnf">\r
+<output xmlns="org:onap:sdnctl:vnf">\r
+<brg-topology  xmlns="org:onap:sdnctl:vnf">\r
     <ecomp-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
index ac85be4..f770ec6 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VCPE/DoCreateAllottedResourceTXC/SDNCTopologyQueryCallback.xml
@@ -1,5 +1,5 @@
-<output xmlns="org:openecomp:sdnctl:vnf">\r
-<tunnelxconn-topology  xmlns="org:openecomp:sdnctl:vnf">\r
+<output xmlns="org:onap:sdnctl:vnf">\r
+<tunnelxconn-topology  xmlns="org:onap:sdnctl:vnf">\r
     <ecomp-model-information>\r
         <model-invariant-uuid>36e20198-c67a-464b-96d0-aaa99eb2639e</model-invariant-uuid>\r
         <model-uuid>5b9b15d0-5dd7-47dc-95b9-0440c340a3ba</model-uuid>\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
index 11022f6..b579f23 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyCreateCallback.xml
@@ -1,4 +1,4 @@
-       <output xmlns="org:openecomp:sdnctl:vnf">\r
+       <output xmlns="org:onap:sdnctl:vnf">\r
                <vnf-information>\r
                        <vnf-id>skask</vnf-id>                  \r
                </vnf-information>\r
@@ -13,4 +13,4 @@
                <instance-reference>\r
                        <object-path>restconf/SDNCObjectPath</object-path>\r
                </instance-reference>\r
-       </output>
\ No newline at end of file
+       </output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
index acea145..3cf0c81 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallback.xml
@@ -1,4 +1,4 @@
-<output xmlns="org:openecomp:sdnctl:vnf">\r
+<output xmlns="org:onap:sdnctl:vnf">\r
        <vnf-information>\r
                <vnf-id>skask</vnf-id>\r
        </vnf-information>\r
@@ -10,4 +10,4 @@
                <service-instance-id>0</service-instance-id>\r
                <service-type>SDN-MOBILITY</service-type>\r
        </service-information>\r
-</output>
\ No newline at end of file
+</output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
index bf2b3c0..df5004e 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeactivateCallbackNotFound.xml
@@ -1,4 +1,4 @@
-<output xmlns="org:openecomp:sdnctl:vnf">\r
+<output xmlns="org:onap:sdnctl:vnf">\r
        <vnf-information>\r
                <vnf-id>skask</vnf-id>\r
        </vnf-information>\r

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
index 11022f6..b579f23 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyDeleteCallback.xml
@@ -1,4 +1,4 @@
-       <output xmlns="org:openecomp:sdnctl:vnf">\r
+       <output xmlns="org:onap:sdnctl:vnf">\r
                <vnf-information>\r
                        <vnf-id>skask</vnf-id>                  \r
                </vnf-information>\r
@@ -13,4 +13,4 @@
                <instance-reference>\r
                        <object-path>restconf/SDNCObjectPath</object-path>\r
                </instance-reference>\r
-       </output>
\ No newline at end of file
+       </output>

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
index 11022f6..b579f23 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
+++ b/bpmn/MSOInfrastructureBPMN/src/test/resources/__files/VfModularity/SDNCTopologyUnassignCallback.xml
@@ -1,4 +1,4 @@
-       <output xmlns="org:openecomp:sdnctl:vnf">\r
+       <output xmlns="org:onap:sdnctl:vnf">\r
                <vnf-information>\r
                        <vnf-id>skask</vnf-id>                  \r
                </vnf-information>\r
@@ -13,4 +13,4 @@
                <instance-reference>\r
                        <object-path>restconf/SDNCObjectPath</object-path>\r
                </instance-reference>\r
-       </output>
\ No newline at end of file
+       </output>