1710 Rebase - Second Attempt

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

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 a3165f7..3e1c498 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
@@ -43,6 +43,7 @@ import org.junit.Assert;
 import org.junit.Test;\r
 import org.openecomp.mso.bpmn.common.WorkflowTest;\r
 import org.openecomp.mso.bpmn.core.WorkflowException;\r
+import org.openecomp.mso.bpmn.mock.FileUtil;\r
 \r
 /**\r
  * Unit test for DoDeleteVfModule.bpmn.\r
@@ -77,7 +78,8 @@ public class DoDeleteVfModuleTest extends WorkflowTest {
        public DoDeleteVfModuleTest() throws IOException {\r
                callbacks.put("sdncChangeDelete", sdncAdapterDeleteCallback);\r
                callbacks.put("sdncDelete", sdncAdapterDeleteCallback);\r
-               callbacks.put("vnfDelete", vnfAdapterDeleteCallback);\r
+               callbacks.put("vnfDelete", FileUtil.readResourceFile(\r
+                               "__files/DeleteVfModuleCallbackResponse.xml"));\r
                callbacks.put("vnfDeleteFail", vnfAdapterDeleteCallbackFail);\r
        }\r
        \r
@@ -182,12 +184,13 @@ public class DoDeleteVfModuleTest extends WorkflowTest {
                variables.put("vfModuleName", "STMTN5MMSC21-MMSC::module-0-0");\r
                variables.put("sdncVersion", "1610");\r
                variables.put("isVidRequest", "true");\r
+               variables.put("retainResources", false);\r
                String vfModuleModelInfo = "{" + "\"modelType\": \"vnf\"," +\r
-                               "\"modelInvariantId\": \"ff5256d2-5a33-55df-13ab-12abad84e7ff\"," + \r
-                               "\"modelNameVersionId\": \"fe6478e5-ea33-3346-ac12-ab121484a3fe\"," +\r
+                               "\"modelInvariantUuid\": \"ff5256d2-5a33-55df-13ab-12abad84e7ff\"," + \r
+                               "\"modelUuid\": \"fe6478e5-ea33-3346-ac12-ab121484a3fe\"," +\r
                                "\"modelName\": \"vSAMP12\"," +\r
                                "\"modelVersion\": \"1.0\"," + \r
-                               "\"modelCustomizationId\": \"MODEL-ID-1234\"," + \r
+                               "\"modelCustomizationUuid\": \"MODEL-ID-1234\"," + \r
                                "}";\r
                variables.put("vfModuleModelInfo", vfModuleModelInfo);\r
                        \r