Merge "Reorder modifiers"

[so.git] / bpmn / MSOInfrastructureBPMN / src / test / java / org / openecomp / mso / bpmn / infrastructure / UpdateNetworkInstanceTest.java

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceTest.java
index 5b5e4e5..80a4518 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateNetworkInstanceTest.java
@@ -33,6 +33,7 @@ import java.util.Map;
 
 import org.camunda.bpm.engine.test.Deployment;
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -63,7 +64,7 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
         */
 
        @Test
-       //@Ignore
+       @Ignore // 1802 merge
        @Deployment(resources = {"process/UpdateNetworkInstance.bpmn",
                                                         "subprocess/DoUpdateNetworkInstance.bpmn",
                                         "subprocess/FalloutHandler.bpmn",
@@ -81,8 +82,8 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
                mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");
                MockNetworkAdapterRestPut("UpdateNetworkV2/updateNetworkResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4");
                MockGetNetworkCloudRegion("CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml", "RDM2WAGPLCP");
-               MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", "1");
-               MockPutNetworkIdWithDepth("UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "1");
+               MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", "all");
+               MockPutNetworkIdWithDepth("UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "all");
                MockGetNetworkVpnBinding("UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", "85f015d0-2e32-4c30-96d2-87a1a27f8017");
                MockGetNetworkVpnBinding("UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", "c980a6ef-3b88-49f0-9751-dbad8608d0a6");
                MockGetNetworkPolicy("UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", "cee6d136-e378-4678-a024-2cd15f0ee0cg");
@@ -98,7 +99,7 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
                System.out.println("----------------------------------------------------------");
                System.out.println("- got workflow response -");
                System.out.println("----------------------------------------------------------");
-               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
            assertEquals("true", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_Success"));
            Assert.assertNotNull("UPDNI_CompleteMsoProcessRequest - ", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_CompleteMsoProcessRequest"));
@@ -113,7 +114,7 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
        }
 
        @Test
-       //@Ignore
+       @Ignore // 1802 merge
        @Deployment(resources = {"process/UpdateNetworkInstance.bpmn",
                                         "subprocess/DoUpdateNetworkInstance.bpmn",
                                         "subprocess/FalloutHandler.bpmn",
@@ -131,8 +132,8 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
                mockSDNCAdapterTopology("UpdateNetworkV2mock/sdncUpdateNetworkTopologySimResponse.xml", "SvcAction>changeassign");
                MockNetworkAdapterRestPut("UpdateNetworkV2/updateNetworkResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4");
                MockGetNetworkCloudRegion("CreateNetworkV2/cloudRegion25_AAIResponse_Success.xml", "RDM2WAGPLCP");
-               MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", "1");
-               MockPutNetworkIdWithDepth("UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "1");
+               MockGetNetworkByIdWithDepth("49c86598-f766-46f8-84f8-8d1c1b10f9b4", "UpdateNetworkV2/updateNetwork_queryNetworkId_AAIResponse_Success.xml", "all");
+               MockPutNetworkIdWithDepth("UpdateNetworkV2/updateNetwork_updateContrail_AAIResponse_Success.xml", "49c86598-f766-46f8-84f8-8d1c1b10f9b4", "all");
                MockGetNetworkVpnBinding("UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", "85f015d0-2e32-4c30-96d2-87a1a27f8017");
                MockGetNetworkVpnBinding("UpdateNetworkV2/updateNetwork_queryVpnBinding_AAIResponse_Success.xml", "c980a6ef-3b88-49f0-9751-dbad8608d0a6");
                MockGetNetworkPolicy("UpdateNetworkV2/updateNetwork_queryNetworkPolicy_AAIResponse_Success.xml", "cee6d136-e378-4678-a024-2cd15f0ee0cg");
@@ -145,7 +146,7 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
                Map<String, String> variables = setupVariablesVIPER1();
                //WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstance", variables);
                executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstance", variables);
-               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
            assertEquals("true", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_Success"));
            Assert.assertNotNull("UPDNI_CompleteMsoProcessRequest - ", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_CompleteMsoProcessRequest"));
@@ -195,7 +196,7 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
                Map<String, String> variables = setupVariablesMissingNetworkId();
                //WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstance", variables);
                executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstance", variables);
-               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
            assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_Success"));
            Assert.assertNotNull("UPDNI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_FalloutHandlerRequest"));
@@ -259,7 +260,7 @@ public class UpdateNetworkInstanceTest extends WorkflowTest {
                Map<String, String> variables = setupVariablesVID1();
                //WorkflowResponse workflowResponse = executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstance", variables);
                executeAsyncWorkflow(processEngineRule, "UpdateNetworkInstance", variables);
-               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceID());
+               //waitForWorkflowToFinish(processEngineRule, workflowResponse.getProcessInstanceId());
 
            assertEquals("false", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_Success"));
            Assert.assertNotNull("UPDNI_FalloutHandlerRequest - ", getVariable(processEngineRule, "UpdateNetworkInstance", "UPDNI_FalloutHandlerRequest"));