Merge "Reorder modifiers"

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java
index 390882e..1e865df 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/CreateVfModuleInfraTest.java
@@ -21,11 +21,13 @@
 package org.openecomp.mso.bpmn.infrastructure;\r
 \r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfsByVnfId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockAAIVfModule;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockSDNCAdapterVfModule;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockVNFAdapterRestVfModule;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDBUpdateVfModule;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseAPPC.MockAppcError;\r
 \r
 import java.io.IOException;\r
 import java.util.HashMap;\r
@@ -41,6 +43,7 @@ import org.openecomp.mso.bpmn.mock.FileUtil;
 /**\r
  * Unit test cases for CreateVfModuleInfra.bpmn\r
  */\r
+@Ignore\r
 public class CreateVfModuleInfraTest extends WorkflowTest {\r
        \r
        private final CallbackSet callbacks = new CallbackSet();\r
@@ -65,6 +68,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
        @Test   \r
        @Deployment(resources = {\r
                        "process/CreateVfModuleInfra.bpmn",\r
+                       "subprocess/BuildingBlock/AppCClient.bpmn",\r
                        "subprocess/DoCreateVfModule.bpmn",\r
                        "subprocess/GenericGetVnf.bpmn",\r
                        "subprocess/SDNCAdapterV1.bpmn",\r
@@ -76,18 +80,21 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                        "subprocess/UpdateAAIVfModule.bpmn",\r
                        "subprocess/UpdateAAIGenericVnf.bpmn",\r
                        "subprocess/CompleteMsoProcess.bpmn",\r
-                       "subprocess/FalloutHandler.bpmn"\r
+                       "subprocess/FalloutHandler.bpmn",\r
+                       "subprocess/BuildingBlock/AppCClient.bpmn"\r
                })\r
        public void sunnyDayVIDWithPreloads() throws Exception {\r
                                \r
                logStart();\r
                \r
                MockAAIVfModule();\r
+               MockGetGenericVnfsByVnfId("skask","__files/AAI/AAI_genericVnfGet.json",200);\r
                MockPatchGenericVnf("skask");\r
                MockPatchVfModuleId("skask", ".*");\r
                MockSDNCAdapterVfModule();              \r
                MockVNFAdapterRestVfModule();\r
                MockDBUpdateVfModule();\r
+               MockAppcError();\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
                String createVfModuleRequest =\r
@@ -100,7 +107,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                \r
                WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);\r
                \r
-               String responseBody = response.getResponse();\r
+               String responseBody = response.getContent();\r
                System.out.println("Workflow (Synch) Response:\n" + responseBody);\r
                \r
                injectSDNCCallbacks(callbacks, "assign, query");\r
@@ -123,6 +130,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
        @Test   \r
        @Deployment(resources = {\r
                        "process/CreateVfModuleInfra.bpmn",\r
+                       "subprocess/BuildingBlock/AppCClient.bpmn",\r
                        "subprocess/DoCreateVfModule.bpmn",\r
                        "subprocess/GenericGetVnf.bpmn",\r
                        "subprocess/SDNCAdapterV1.bpmn",\r
@@ -134,18 +142,21 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                        "subprocess/UpdateAAIVfModule.bpmn",\r
                        "subprocess/UpdateAAIGenericVnf.bpmn",\r
                        "subprocess/CompleteMsoProcess.bpmn",\r
-                       "subprocess/FalloutHandler.bpmn"\r
+                       "subprocess/FalloutHandler.bpmn",\r
+                       "subprocess/BuildingBlock/AppCClient.bpmn"\r
                })\r
        public void sunnyDayVIDNoPreloads() throws Exception {\r
                                \r
                logStart();\r
                \r
                MockAAIVfModule();\r
+               MockGetGenericVnfsByVnfId("skask","__files/AAI/AAI_genericVnfGet.json",200);\r
                MockPatchGenericVnf("skask");\r
                MockPatchVfModuleId("skask", ".*");\r
                MockSDNCAdapterVfModule();              \r
                MockVNFAdapterRestVfModule();\r
                MockDBUpdateVfModule();\r
+               MockAppcError();\r
                \r
                String businessKey = UUID.randomUUID().toString();\r
                String createVfModuleRequest =\r
@@ -158,7 +169,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                \r
                WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);\r
                \r
-               String responseBody = response.getResponse();\r
+               String responseBody = response.getContent();\r
                System.out.println("Workflow (Synch) Response:\n" + responseBody);\r
                \r
                injectSDNCCallbacks(callbacks, "assign, query");\r
@@ -208,6 +219,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                @Ignore\r
                @Deployment(resources = {\r
                                "process/CreateVfModuleInfra.bpmn",\r
+                               "subprocess/BuildingBlock/AppCClient.bpmn",\r
                                "subprocess/DoCreateVfModule.bpmn",\r
                                "subprocess/GenericGetVnf.bpmn",\r
                                "subprocess/SDNCAdapterV1.bpmn",\r
@@ -220,7 +232,8 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                "subprocess/UpdateAAIVfModule.bpmn",\r
                                "subprocess/UpdateAAIGenericVnf.bpmn",\r
                                "subprocess/CompleteMsoProcess.bpmn",\r
-                               "subprocess/FalloutHandler.bpmn"\r
+                               "subprocess/FalloutHandler.bpmn",\r
+                               "subprocess/BuildingBlock/AppCClient.bpmn"\r
                        })\r
                \r
                public void sunnyDayVIDWithVolumeGroupAttach() throws Exception {\r
@@ -229,11 +242,13 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                        \r
 \r
                        MockAAIVfModule();\r
+                       MockGetGenericVnfsByVnfId("skask","__files/AAI/AAI_genericVnfGet.json",200);\r
                        MockPatchGenericVnf("skask");\r
                        MockPatchVfModuleId("skask", ".*");\r
                        MockSDNCAdapterVfModule();              \r
                        MockVNFAdapterRestVfModule();\r
                        MockDBUpdateVfModule();\r
+                       MockAppcError();\r
                        \r
                        String businessKey = UUID.randomUUID().toString();\r
                        String createVfModuleRequest =\r
@@ -246,7 +261,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                        \r
                        WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);\r
                        \r
-                       String responseBody = response.getResponse();\r
+                       String responseBody = response.getContent();\r
                        System.out.println("Workflow (Synch) Response:\n" + responseBody);\r
                        \r
                        injectSDNCCallbacks(callbacks, "assign, query");\r
@@ -294,6 +309,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                        @Test   \r
                        @Deployment(resources = {\r
                                        "process/CreateVfModuleInfra.bpmn",\r
+                                       "subprocess/BuildingBlock/AppCClient.bpmn",\r
                                        "subprocess/DoCreateVfModule.bpmn",\r
                                        "subprocess/GenericGetVnf.bpmn",\r
                                        "subprocess/SDNCAdapterV1.bpmn",\r
@@ -305,18 +321,21 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                        "subprocess/UpdateAAIVfModule.bpmn",\r
                                        "subprocess/UpdateAAIGenericVnf.bpmn",\r
                                        "subprocess/CompleteMsoProcess.bpmn",\r
-                                       "subprocess/FalloutHandler.bpmn"\r
+                                       "subprocess/FalloutHandler.bpmn",\r
+                                       "subprocess/BuildingBlock/AppCClient.bpmn"\r
                                })\r
                        public void sunnyDayVIDMultipleUserParamValues() throws Exception {\r
                                                \r
                                logStart();\r
                                \r
                                MockAAIVfModule();\r
+                               MockGetGenericVnfsByVnfId("skask","__files/AAI/AAI_genericVnfGet.json",200);\r
                                MockPatchGenericVnf("skask");\r
                                MockPatchVfModuleId("skask", ".*");\r
                                MockSDNCAdapterVfModule();              \r
                                MockVNFAdapterRestVfModule();\r
                                MockDBUpdateVfModule();\r
+                               MockAppcError();\r
                                \r
                                String businessKey = UUID.randomUUID().toString();\r
                                String createVfModuleRequest =\r
@@ -329,7 +348,7 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                                \r
                                WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);\r
                                \r
-                               String responseBody = response.getResponse();\r
+                               String responseBody = response.getContent();\r
                                System.out.println("Workflow (Synch) Response:\n" + responseBody);\r
                                \r
                                injectSDNCCallbacks(callbacks, "assign, query");\r