AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteNetworkInstanceTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteNetworkInstanceTest.java
index ca04d6f..06eb79c 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteNetworkInstanceTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteNetworkInstanceTest.java
@@ -83,11 +83,11 @@ public class DeleteNetworkInstanceTest extends WorkflowTest {
                // setup simulators\r
                mockSDNCAdapterTopology("DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml", "SvcAction>delete");\r
                MockNetworkAdapter("bdc5efe8-404a-409b-85f6-0dcc9eebae30", 200, "deleteNetworkResponse_Success.xml");\r
-               MockGetNetworkByIdWithDepth("bdc5efe8-404a-409b-85f6-0dcc9eebae30", "DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml", "1");\r
+               MockGetNetworkByIdWithDepth("bdc5efe8-404a-409b-85f6-0dcc9eebae30", "DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml", "all");\r
                mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
                MockGetCloudRegion("RDM2WAGPLCP", 200, "DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml");\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                variables.put("mso-request-id", "testRequestId");\r
                variables.put("requestId", "testRequestId");\r
                variables.put("isBaseVfModule", "true");\r
@@ -153,14 +153,14 @@ public class DeleteNetworkInstanceTest extends WorkflowTest {
                mockSDNCAdapterTopology("DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml", "SvcAction>unassign");\r
                mockSDNCAdapterTopology("DeleteNetworkV2mock/sdncDeleteNetworkTopologySimResponse.xml", "SvcAction>deactivate");\r
                MockNetworkAdapter("bdc5efe8-404a-409b-85f6-0dcc9eebae30", 200, "deleteNetworkResponse_Success.xml");\r
-               MockGetNetworkByIdWithDepth("bdc5efe8-404a-409b-85f6-0dcc9eebae30", "DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml", "1");\r
+               MockGetNetworkByIdWithDepth("bdc5efe8-404a-409b-85f6-0dcc9eebae30", "DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml", "all");\r
                mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
                MockGetCloudRegion("RDM2WAGPLCP", 200, "DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml");\r
 \r
                String networkModelInfo = "  {\"modelName\": \"modelName\", " + '\n' +\r
                                          "   \"networkType\": \"modelName\" }";\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");\r
                variables.put("msoRequestId", "testRequestId");\r
                variables.put("requestId", "testRequestId");\r
@@ -229,14 +229,14 @@ public class DeleteNetworkInstanceTest extends WorkflowTest {
                mockSDNCAdapterTopology("CreateNetworkV2mock/sdncCreateNetworkTopologySimResponse.xml", "SvcAction>activate");\r
                MockNetworkAdapter("bdc5efe8-404a-409b-85f6-0dcc9eebae30", 200, "deleteNetworkResponse_Success.xml");\r
                MockNetworkAdapterContainingRequest("createNetworkRequest", 200, "CreateNetworkV2/createNetworkResponse_Success.xml");\r
-               MockGetNetworkByIdWithDepth     ("bdc5efe8-404a-409b-85f6-0dcc9eebae30", "DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml", "1");\r
+               MockGetNetworkByIdWithDepth     ("bdc5efe8-404a-409b-85f6-0dcc9eebae30", "DeleteNetworkV2/deleteNetworkAAIResponse_Success.xml", "all");\r
                mockUpdateRequestDB(200, "Database/DBUpdateResponse.xml");\r
                MockGetCloudRegion("RDM2WAGPLCP", 200, "DeleteNetworkV2/cloudRegion30_AAIResponse_Success.xml");\r
 \r
                String networkModelInfo = "  {\"modelCustomizationId\": \"uuid-nrc-001-1234\", " + '\n' +\r
                 "   \"modelInvariantId\": \"was-ist-das-001-1234\" }";\r
 \r
-               Map<String, String> variables = new HashMap<String, String>();\r
+               Map<String, String> variables = new HashMap<>();\r
                variables.put("testMessageId", "88f65519-9a38-4c4b-8445-9eb4a5a5af56");\r
                variables.put("msoRequestId", "testRequestId");\r
                variables.put("requestId", "testRequestId");\r