X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=bpmn%2FMSOInfrastructureBPMN%2Fsrc%2Ftest%2Fjava%2Forg%2Fopenecomp%2Fmso%2Fbpmn%2Finfrastructure%2FDeleteVfModuleInfraTest.java;h=ba375f5d78465b3b77ce044df68cd1db6bcea64b;hb=51561d7bd318444d44565fa27ad095ddefb6c761;hp=4c478e61431aa12c3fb072e6b5c1af201ec9cebe;hpb=6310dbd5b69ecd9e5b87cd31a7420c4ff3d4f36d;p=so.git
diff --git a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
index 4c478e6143..ba375f5d78 100644
--- a/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
+++ b/bpmn/MSOInfrastructureBPMN/src/test/java/org/openecomp/mso/bpmn/infrastructure/DeleteVfModuleInfraTest.java
@@ -29,6 +29,8 @@ import static com.github.tomakehurst.wiremock.client.WireMock.put;
import static com.github.tomakehurst.wiremock.client.WireMock.stubFor;
import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockVNFAdapterRestVfModule;
import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;
import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFDelete;
@@ -53,32 +55,40 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
private final CallbackSet callbacks = new CallbackSet();
private static final String EOL = "\n";
-
+
private final String vnfAdapterDeleteCallback =
"" + EOL +
" a27ce5a9-29c4-4c22-a017-6615ac73c721" + EOL +
" 973ed047-d251-4fb9-bf1a-65b8949e0a73" + EOL +
" true" + EOL +
" {{MESSAGE-ID}}" + EOL +
- " " + EOL +
- " " + EOL +
- " policyKey1_contrail_network_policy_fqdn" + EOL +
- " MSOTest:DefaultPolicyFQDN1" + EOL +
- "" + EOL +
- "" + EOL +
- "policyKey2_contrail_network_policy_fqdn" + EOL +
- "MSOTest:DefaultPolicyFQDN2" + EOL +
- "" + EOL +
- " " + EOL +
- " oam_management_v4_address" + EOL +
- " 1234" + EOL +
- "" + EOL +
- " " + EOL +
- " oam_management_v6_address" + EOL +
- " 1234" + EOL +
- "" + EOL +
- "" + EOL +
"" + EOL;
+
+ //private final String vnfAdapterDeleteCallback =
+ // "" + EOL +
+ // " a27ce5a9-29c4-4c22-a017-6615ac73c721" + EOL +
+ // " 973ed047-d251-4fb9-bf1a-65b8949e0a73" + EOL +
+ // " true" + EOL +
+ // " {{MESSAGE-ID}}" + EOL +
+ // " " + EOL +
+ // " " + EOL +
+ // " policyKey1_contrail_network_policy_fqdn" + EOL +
+ // " MSOTest:DefaultPolicyFQDN1" + EOL +
+ // "" + EOL +
+ // "" + EOL +
+ // "policyKey2_contrail_network_policy_fqdn" + EOL +
+ // "MSOTest:DefaultPolicyFQDN2" + EOL +
+ // "" + EOL +
+ // " " + EOL +
+ // " oam_management_v4_address" + EOL +
+ // " 1234" + EOL +
+ // "" + EOL +
+ // " " + EOL +
+ // " oam_management_v6_address" + EOL +
+ // " 1234" + EOL +
+ // "" + EOL +
+ // "" + EOL +
+ // "" + EOL;
private final String vnfAdapterDeleteCallbackFail =
"" + EOL +
@@ -97,13 +107,16 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
public DeleteVfModuleInfraTest() throws IOException {
callbacks.put("sdncChangeDelete", sdncAdapterDeleteCallback);
callbacks.put("sdncDelete", sdncAdapterDeleteCallback);
- callbacks.put("vnfDelete", vnfAdapterDeleteCallback);
+ callbacks.put("vnfDelete", FileUtil.readResourceFile(
+ "__files/DeleteVfModuleCallbackResponse.xml"));
+ //callbacks.put("vnfDelete", vnfAdapterDeleteCallback);
callbacks.put("vnfDeleteFail", vnfAdapterDeleteCallbackFail);
}
@Test
+ @Ignore // 1802 merge
@Deployment(resources = {
- "process/Infrastructure/DeleteVfModuleInfra.bpmn",
+ "process/DeleteVfModuleInfra.bpmn",
"subprocess/DoDeleteVfModule.bpmn",
"subprocess/PrepareUpdateAAIVfModule.bpmn",
"subprocess/UpdateAAIVfModule.bpmn",
@@ -114,7 +127,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
"subprocess/CompleteMsoProcess.bpmn",
"subprocess/FalloutHandler.bpmn"
})
- @Ignore
+
public void TestDeleteVfModuleSuccess() throws Exception {
// delete the Base Module
// vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c721, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a73
@@ -155,7 +168,10 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
.withHeader("Content-Type", "text/xml")
.withBodyFile("DeleteGenericVNFV1/sdncAdapterResponse.xml")));
- mockVNFDelete(".*", "/.*", 202);
+ //mockVNFDelete("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73", 202);
+ MockDoDeleteVfModule_DeleteVNFSuccess();
+ MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");
+ // MockVNFAdapterRestVfModule();
// MockAAIGenericVnfSearch();
// MockAAIVfModulePUT(false);
// MockAAIDeleteGenericVnf();
@@ -519,7 +535,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
String businessKey = UUID.randomUUID().toString();
String deleteVfModuleRequest =
FileUtil.readResourceFile("__files/DeleteVfModule_VID_request.json");
- //Map variables = new HashMap();
+ //Map variables = new HashMap<>();
//variables.put("isDebugLogEnabled","true");
// variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");
@@ -530,7 +546,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
TestAsyncResponse asyncResponse = invokeAsyncProcess("DeleteVfModuleInfra",
"v1", businessKey, deleteVfModuleRequest, variables);
WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);
- String responseBody = response.getResponse();
+ String responseBody = response.getContent();
System.out.println("Workflow (Synch) Response:\n" + responseBody);
// "changedelete" operation not required for deleting a Vf Module
@@ -575,5 +591,15 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
}
-
+ public static void MockDoDeleteVfModule_DeleteVNFSuccess() {
+ stubFor(delete(urlMatching("/vnfs/v1/vnfs/.*/vf-modules/.*"))
+ .willReturn(aResponse()
+ .withStatus(202)
+ .withHeader("Content-Type", "application/xml")));
+ stubFor(delete(urlMatching("/vnfs/v1/volume-groups/78987"))
+ .willReturn(aResponse()
+ .withStatus(202)
+ .withHeader("Content-Type", "application/xml")));
+ }
+
}