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 / DeleteVfModuleInfraTest.java
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 4c478e6..ba375f5 100644 (file)
--- 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;\r
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;\r
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockPatchVfModuleId;\r
+import static org.openecomp.mso.bpmn.mock.StubResponseAAI.MockVNFAdapterRestVfModule;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseDatabase.mockUpdateRequestDB;\r
 import static org.openecomp.mso.bpmn.mock.StubResponseVNFAdapter.mockVNFDelete;\r
 \r
@@ -53,32 +55,40 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
        private final CallbackSet callbacks = new CallbackSet();\r
        \r
        private static final String EOL = "\n";\r
-\r
+       \r
        private final String vnfAdapterDeleteCallback = \r
                        "<deleteVfModuleResponse>" + EOL +\r
                        "    <vnfId>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnfId>" + EOL +\r
                        "    <vfModuleId>973ed047-d251-4fb9-bf1a-65b8949e0a73</vfModuleId>" + EOL +\r
                        "    <vfModuleDeleted>true</vfModuleDeleted>" + EOL +\r
                        "    <messageId>{{MESSAGE-ID}}</messageId>" + EOL +\r
-                       "       <vfModuleOutputs>" + EOL +  \r
-                       "        <entry>" + EOL +\r
-                       "        <key>policyKey1_contrail_network_policy_fqdn</key>" + EOL +\r
-                       " <value>MSOTest:DefaultPolicyFQDN1</value>" + EOL +\r
-                       "</entry>" + EOL +\r
-                       "<entry>" + EOL +\r
-                       "<key>policyKey2_contrail_network_policy_fqdn</key>" + EOL +\r
-                       "<value>MSOTest:DefaultPolicyFQDN2</value>" + EOL +\r
-                       "</entry>" + EOL +\r
-                       "        <entry>" + EOL +\r
-                       "        <key>oam_management_v4_address</key>" + EOL +\r
-                       " <value>1234</value>" + EOL +\r
-                       "</entry>" + EOL +\r
-                       "        <entry>" + EOL +\r
-                       "        <key>oam_management_v6_address</key>" + EOL +\r
-                       " <value>1234</value>" + EOL +\r
-                       "</entry>" + EOL +\r
-                       "</vfModuleOutputs>" + EOL +\r
                        "</deleteVfModuleResponse>" + EOL;\r
+\r
+       //private final String vnfAdapterDeleteCallback = \r
+               //      "<deleteVfModuleResponse>" + EOL +\r
+       //              "    <vnfId>a27ce5a9-29c4-4c22-a017-6615ac73c721</vnfId>" + EOL +\r
+       //              "    <vfModuleId>973ed047-d251-4fb9-bf1a-65b8949e0a73</vfModuleId>" + EOL +\r
+       //              "    <vfModuleDeleted>true</vfModuleDeleted>" + EOL +\r
+       //              "    <messageId>{{MESSAGE-ID}}</messageId>" + EOL +\r
+       //              "       <vfModuleOutputs>" + EOL +  \r
+       //              "        <entry>" + EOL +\r
+       //              "        <key>policyKey1_contrail_network_policy_fqdn</key>" + EOL +\r
+       //              " <value>MSOTest:DefaultPolicyFQDN1</value>" + EOL +\r
+       //              "</entry>" + EOL +\r
+       //              "<entry>" + EOL +\r
+       //              "<key>policyKey2_contrail_network_policy_fqdn</key>" + EOL +\r
+       //              "<value>MSOTest:DefaultPolicyFQDN2</value>" + EOL +\r
+       //              "</entry>" + EOL +\r
+       //              "        <entry>" + EOL +\r
+       //              "        <key>oam_management_v4_address</key>" + EOL +\r
+       //              " <value>1234</value>" + EOL +\r
+       //              "</entry>" + EOL +\r
+       //              "        <entry>" + EOL +\r
+       //              "        <key>oam_management_v6_address</key>" + EOL +\r
+       //              " <value>1234</value>" + EOL +\r
+       //              "</entry>" + EOL +\r
+       //              "</vfModuleOutputs>" + EOL +\r
+       //              "</deleteVfModuleResponse>" + EOL;\r
                                \r
        private final String vnfAdapterDeleteCallbackFail = \r
                        "<vfModuleException>" + EOL +\r
@@ -97,13 +107,16 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
        public DeleteVfModuleInfraTest() throws IOException {\r
                callbacks.put("sdncChangeDelete", sdncAdapterDeleteCallback);\r
                callbacks.put("sdncDelete", sdncAdapterDeleteCallback);\r
-               callbacks.put("vnfDelete", vnfAdapterDeleteCallback);\r
+               callbacks.put("vnfDelete", FileUtil.readResourceFile(\r
+                               "__files/DeleteVfModuleCallbackResponse.xml"));\r
+               //callbacks.put("vnfDelete", vnfAdapterDeleteCallback);\r
                callbacks.put("vnfDeleteFail", vnfAdapterDeleteCallbackFail);\r
        }\r
 \r
        @Test\r
+       @Ignore // 1802 merge\r
        @Deployment(resources = {\r
-                       "process/Infrastructure/DeleteVfModuleInfra.bpmn",\r
+                       "process/DeleteVfModuleInfra.bpmn",\r
                        "subprocess/DoDeleteVfModule.bpmn",\r
                        "subprocess/PrepareUpdateAAIVfModule.bpmn",\r
                        "subprocess/UpdateAAIVfModule.bpmn",\r
@@ -114,7 +127,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                        "subprocess/CompleteMsoProcess.bpmn",\r
                        "subprocess/FalloutHandler.bpmn"\r
                })\r
-       @Ignore\r
+       \r
        public void  TestDeleteVfModuleSuccess() throws Exception {\r
                // delete the Base Module\r
                // vnf-id=a27ce5a9-29c4-4c22-a017-6615ac73c721, vf-module-id=973ed047-d251-4fb9-bf1a-65b8949e0a73\r
@@ -155,7 +168,10 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                                  .withHeader("Content-Type", "text/xml")\r
                                  .withBodyFile("DeleteGenericVNFV1/sdncAdapterResponse.xml")));\r
                \r
-               mockVNFDelete(".*", "/.*", 202);\r
+               //mockVNFDelete("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73", 202);\r
+               MockDoDeleteVfModule_DeleteVNFSuccess();\r
+               MockPatchVfModuleId("a27ce5a9-29c4-4c22-a017-6615ac73c721", "973ed047-d251-4fb9-bf1a-65b8949e0a73");\r
+       //      MockVNFAdapterRestVfModule();\r
 //             MockAAIGenericVnfSearch();\r
 //             MockAAIVfModulePUT(false);\r
 //             MockAAIDeleteGenericVnf();\r
@@ -519,7 +535,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                String businessKey = UUID.randomUUID().toString();\r
                String deleteVfModuleRequest =\r
                                FileUtil.readResourceFile("__files/DeleteVfModule_VID_request.json");\r
-               //Map<String, Object> variables = new HashMap<String, Object>();        \r
+               //Map<String, Object> variables = new HashMap<>();      \r
                \r
                //variables.put("isDebugLogEnabled","true");\r
 //             variables.put("mso-request-id", "a27ce5a9-29c4-4c22-a017-6615ac73c721");\r
@@ -530,7 +546,7 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                TestAsyncResponse asyncResponse = invokeAsyncProcess("DeleteVfModuleInfra",\r
                                "v1", businessKey, deleteVfModuleRequest, variables);\r
                WorkflowResponse response = receiveResponse(businessKey, asyncResponse, 10000);\r
-               String responseBody = response.getResponse();\r
+               String responseBody = response.getContent();\r
                System.out.println("Workflow (Synch) Response:\n" + responseBody);\r
 \r
                // "changedelete" operation not required for deleting a Vf Module\r
@@ -575,5 +591,15 @@ public class DeleteVfModuleInfraTest extends WorkflowTest {
                                \r
                        }\r
 \r
-       \r
+                       public static void MockDoDeleteVfModule_DeleteVNFSuccess() {\r
+                               stubFor(delete(urlMatching("/vnfs/v1/vnfs/.*/vf-modules/.*"))\r
+                                               .willReturn(aResponse()\r
+                                               .withStatus(202)\r
+                                               .withHeader("Content-Type", "application/xml")));\r
+                               stubFor(delete(urlMatching("/vnfs/v1/volume-groups/78987"))\r
+                                               .willReturn(aResponse()\r
+                                               .withStatus(202)\r
+                                               .withHeader("Content-Type", "application/xml")));\r
+                       }\r
+\r
 }\r
Service Orchestrator