AT&T 1712 and 1802 release code

[so.git] / bpmn / MSOInfrastructureBPMN / src / test / groovy / org / openecomp / mso / bpmn / infrastructure / scripts / DoCreateNetworkInstanceRollbackTest.groovy

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy
index b22431a..8c7afc9 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/test/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoCreateNetworkInstanceRollbackTest.groovy
@@ -8,7 +8,7 @@ import org.camunda.bpm.engine.RepositoryService
 import org.camunda.bpm.engine.impl.persistence.entity.ExecutionEntity\r
 import org.camunda.bpm.engine.impl.pvm.process.ProcessDefinitionImpl\r
 import org.camunda.bpm.engine.repository.ProcessDefinition\r
-import org.camunda.bpm.engine.runtime.Execution;\r
+import org.camunda.bpm.engine.delegate.DelegateExecution;\r
 import org.mockito.MockitoAnnotations\r
 import org.mockito.runners.MockitoJUnitRunner\r
 import org.mockito.internal.debugging.MockitoDebuggerImpl\r
@@ -89,13 +89,13 @@ class DoCreateNetworkInstanceRollbackTest  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -137,13 +137,13 @@ class DoCreateNetworkInstanceRollbackTest  {
       <network-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
          <network-type>CONTRAIL_EXTERNAL</network-type>\r
-         <onap-model-information>\r
+         <ecomp-model-information>\r
             <model-invariant-uuid>invariant-uuid</model-invariant-uuid>\r
             <model-customization-uuid>customization-uuid</model-customization-uuid>\r
             <model-uuid>uuid</model-uuid>\r
             <model-version>version</model-version>\r
             <model-name>CONTRAIL_EXTERNAL</model-name>\r
-         </onap-model-information>\r
+         </ecomp-model-information>\r
       </network-information>\r
       <network-request-information>\r
          <network-id>8abc633a-810b-4ca5-8b3a-09511d13a2ce</network-id>\r
@@ -165,7 +165,7 @@ class DoCreateNetworkInstanceRollbackTest  {
                        \r
                }\r
                \r
-               public void initializeVariables (Execution mockExecution) {\r
+               public void initializeVariables (DelegateExecution mockExecution) {\r
 \r
                        verify(mockExecution).setVariable(Prefix + "WorkflowException", null)\r
                        \r
@@ -216,7 +216,7 @@ class DoCreateNetworkInstanceRollbackTest  {
                        when(mockExecution.getVariable("URN_mso_adapters_sdnc_resource_endpoint")).thenReturn("http://localhost:28090/SDNCAdapterRpc")\r
                        \r
                        \r
-                       // preProcessRequest(Execution execution)                                               \r
+                       // preProcessRequest(DelegateExecution execution)                                               \r
                        DoCreateNetworkInstanceRollback DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()\r
                        DoCreateNetworkInstanceRollback.preProcessRequest(mockExecution)\r
                        \r
@@ -242,7 +242,7 @@ class DoCreateNetworkInstanceRollbackTest  {
                        when(mockExecution.getVariable(Prefix + "rollbackSDNCRequest")).thenReturn(rollbackSDNCRequest)\r
                        when(mockExecution.getVariable("URN_mso_adapters_network_rest_endpoint")).thenReturn("http://localhost:28090/networks/NetworkAdapter")\r
                        \r
-                       // preProcessRequest(Execution execution)\r
+                       // preProcessRequest(DelegateExecution execution)\r
                        DoCreateNetworkInstanceRollback DoCreateNetworkInstanceRollback = new DoCreateNetworkInstanceRollback()\r
                        DoCreateNetworkInstanceRollback.callPONetworkAdapter(mockExecution)\r
                        \r