/*- \r
* ============LICENSE_START======================================================= \r
- * OPENECOMP - MSO \r
+ * ONAP - SO \r
* ================================================================================ \r
* Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. \r
* ================================================================================ \r
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
* @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
"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
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
\r
// Active Scenario\r
private Map<String, Object> setupVariablesSunnyDayVID() {\r
- Map<String, Object> variables = new HashMap<String, Object>();\r
+ Map<String, Object> variables = new HashMap<>();\r
//try {\r
// variables.put("bpmnRequest", FileUtil.readResourceFile("__files/CreateVfModule_VID_request.json"));\r
//}\r