AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVnfInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVnfInfraTest.java
index 391fc23..36e9f2b 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVnfInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/UpdateVnfInfraTest.java
@@ -26,6 +26,7 @@ import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdW
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockNodeQueryServiceInstanceById;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetDefaultCloudRegionByCloudRegionId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetPserverByVnfId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfsByVnfId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchGenericVnf;\r
@@ -76,9 +77,10 @@ public class UpdateVnfInfraTest extends WorkflowTest {
         * @throws Exception\r
         */\r
        @Test   \r
-       @Ignore // IGNORED FOR 1710 MERGE TO ONAP\r
+       @Ignore // 1802 merge\r
        @Deployment(resources = {\r
-               "process/UpdateVnfInfra.bpmn",          \r
+               "process/UpdateVnfInfra.bpmn",\r
+               "subprocess/RollbackVnf.bpmn",\r
                "subprocess/DoUpdateVfModule.bpmn",\r
                "subprocess/DoUpdateVnfAndModules.bpmn",\r
                "subprocess/PrepareUpdateAAIVfModule.bpmn",\r
@@ -91,7 +93,8 @@ public class UpdateVnfInfraTest extends WorkflowTest {
                "subprocess/FalloutHandler.bpmn",\r
                "subprocess/BuildingBlock/DecomposeService.bpmn",\r
                "subprocess/BuildingBlock/RainyDayHandler.bpmn",\r
-               "subprocess/BuildingBlock/ManualHandling.bpmn"\r
+               "subprocess/BuildingBlock/ManualHandling.bpmn",\r
+               "subprocess/BuildingBlock/AppCClient.bpmn"\r
                \r
                })\r
        public void sunnyDay() throws Exception {\r
@@ -102,7 +105,9 @@ public class UpdateVnfInfraTest extends WorkflowTest {
                MockGetServiceInstance("SDN-ETHERNET-INTERNET", "123456789", "MIS%252F1604%252F0026%252FSW_INTERNET", "GenericFlows/getServiceInstance.xml");\r
                //MockGetGenericVnfById_404("testVnfId");\r
                MockGetServiceResourcesCatalogData("995256d2-5a33-55df-13ab-12abad84e7ff", "1.0", "VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json");\r
+               MockGetServiceResourcesCatalogData("995256d2-5a33-55df-13ab-12abad84e7ff", "VIPR/getCatalogServiceResourcesDataForUpdateVnfInfra.json");\r
                MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");\r
+               MockGetDefaultCloudRegionByCloudRegionId("mdt1", "AAI/AAI_defaultCloudRegionByCloudRegionId.json", 200);\r
                MockPutGenericVnf(".*");\r
                MockAAIVfModule();\r
                MockPatchGenericVnf("skask");\r
@@ -114,7 +119,7 @@ public class UpdateVnfInfraTest extends WorkflowTest {
                MockDBUpdateVfModule(); \r
                MockGetPserverByVnfId("skask", "AAI/AAI_pserverByVnfId.json", 200);\r
                MockGetGenericVnfsByVnfId("skask", "AAI/AAI_genericVnfsByVnfId.json", 200);\r
-               MockSetInMaintFlagByVnfId("skask", 200);\r
+               MockSetInMaintFlagByVnfId("skask", "AAI/AAI_genericVnfsByVnfId.json", 200);\r
                MockPolicySkip();\r
                \r
                mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");\r
@@ -153,13 +158,7 @@ public class UpdateVnfInfraTest extends WorkflowTest {
        // Active Scenario\r
        private Map<String, Object> setupVariablesSunnyDayVID() {\r
                                Map<String, Object> variables = new HashMap<>();\r
-                               //try {\r
-                               //      variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
-                               //}\r
-                               //catch (Exception e) {\r
-                                       \r
-                               //}\r
-                               //variables.put("mso-request-id", "testRequestId");\r
+                               \r
                                variables.put("requestId", "testRequestId");                            \r
                                variables.put("isDebugLogEnabled", "true");                             \r
                                variables.put("serviceInstanceId", "f70e927b-6087-4974-9ef8-c5e4d5847ca4");\r