Code Review / so.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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 a28e95a..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
@@ -286,6 +301,67 @@ public class CreateVfModuleInfraTest extends WorkflowTest {
                                return variables;\r
                                \r
                        }\r
+                       /**\r
+                        * Sunny day VID scenario with no preloads.\r
+                        * \r
+                        * @throws Exception\r
+                        */\r
+                       @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
+                                       "subprocess/VnfAdapterRestV1.bpmn",\r
+                                       "subprocess/ConfirmVolumeGroupTenant.bpmn",\r
+                                       "subprocess/GenericNotificationService.bpmn",\r
+                                       "subprocess/ConfirmVolumeGroupName.bpmn",\r
+                                       "subprocess/CreateAAIVfModule.bpmn",\r
+                                       "subprocess/UpdateAAIVfModule.bpmn",\r
+                                       "subprocess/UpdateAAIGenericVnf.bpmn",\r
+                                       "subprocess/CompleteMsoProcess.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
+                                       FileUtil.readResourceFile("__files/CreateVfModule_VID_request_userParam.json");\r
+                               \r
+                               Map<String, Object> variables = setupVariablesSunnyDayVID();            \r
+                               \r
+                               TestAsyncResponse asyncResponse = invokeAsyncProcess("CreateVfModuleInfra",\r
+                                       "v1", businessKey, createVfModuleRequest, variables);\r
+                                               \r
+                               WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);\r
+                               \r
+                               String responseBody = response.getContent();\r
+                               System.out.println("Workflow (Synch) Response:\n" + responseBody);\r
+                               \r
+                               injectSDNCCallbacks(callbacks, "assign, query");\r
+                               injectVNFRestCallbacks(callbacks, "vnfCreate");\r
+                               injectSDNCCallbacks(callbacks, "activate");\r
+                               \r
+                               // TODO add appropriate assertions\r
+                               \r
+                               waitForProcessEnd(businessKey, 10000);\r
+                               checkVariable(businessKey, "CreateVfModuleSuccessIndicator", true);\r
+                               \r
+                               logEnd();\r
+                       }\r
                \r
        \r
 }\r
Service Orchestrator