AT&T 1712 and 1802 release code

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

diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/ReplaceVnfInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/ReplaceVnfInfraTest.java
index 64852df..f7cf3f4 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/ReplaceVnfInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/ReplaceVnfInfraTest.java
@@ -34,6 +34,7 @@ import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDBUpdateVfModule;
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteGenericVnf;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockDeleteVfModuleId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfById;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetDefaultCloudRegionByCloudRegionId;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithDepth;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetGenericVnfByIdWithPriority;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockGetServiceInstance;\r
@@ -102,9 +103,10 @@ public class ReplaceVnfInfraTest extends WorkflowTest {
         * @throws Exception\r
         */\r
        @Test   \r
-    @Ignore\r
+       @Ignore // 1802 merge\r
        @Deployment(resources = {\r
-               "process/ReplaceVnfInfra.bpmn",         \r
+               "process/ReplaceVnfInfra.bpmn", \r
+               "subprocess/RollbackVnf.bpmn",\r
                "subprocess/DoDeleteVfModule.bpmn",\r
                "subprocess/DoDeleteVnfAndModules.bpmn",\r
                "subprocess/DeleteAAIVfModule.bpmn",\r
@@ -133,7 +135,8 @@ public class ReplaceVnfInfraTest extends WorkflowTest {
                "subprocess/DoCreateVnfAndModulesRollback.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
@@ -152,19 +155,21 @@ public class ReplaceVnfInfraTest 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/getCatalogServiceResourcesDataForReplaceVnfInfra.json");\r
+               MockGetServiceResourcesCatalogData("995256d2-5a33-55df-13ab-12abad84e7ff", "VIPR/getCatalogServiceResourcesDataForReplaceVnfInfra.json");\r
                //MockGetGenericVnfByIdWithDepth("skask", 1, "VfModularity/GenericVnf.xml");\r
                //MockPutGenericVnf(".*");\r
+               MockGetDefaultCloudRegionByCloudRegionId("mdt1", "AAI/AAI_defaultCloudRegionByCloudRegionId.json", 200);\r
                MockAAIVfModule();\r
                MockPatchGenericVnf("a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
                MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", ".*");\r
-               //mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");        \r
-               //mockVNFPut("skask", "/supercool", 202);\r
-               //mockVNFPut("skask", "/lukewarm", 202);\r
-               //MockVNFAdapterRestVfModule();\r
-               //MockDBUpdateVfModule();       \r
-               //MockGetPserverByVnfId("skask", "AAI/AAI_pserverByVnfId.json", 200);\r
-               //MockGetGenericVnfsByVnfId("skask", "AAI/AAI_genericVnfsByVnfId.json", 200);\r
-               MockSetInMaintFlagByVnfId("skask", 200);\r
+               mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");  \r
+               mockVNFPut("skask", "/supercool", 202);\r
+               mockVNFPut("skask", "/lukewarm", 202);\r
+               MockVNFAdapterRestVfModule();\r
+               MockDBUpdateVfModule(); \r
+               MockGetPserverByVnfId("skask", "AAI/AAI_pserverByVnfId.json", 200);\r
+               MockGetGenericVnfsByVnfId("skask", "AAI/AAI_genericVnfsByVnfId.json", 200);\r
+               MockSetInMaintFlagByVnfId("skask", "AAI/AAI_genericVnfsByVnfId.json", 200);             \r
                MockPolicySkip();\r
                \r
                //mockSDNCAdapter("VfModularity/StandardSDNCSynchResponse.xml");\r