Use generic req mapping for CM requests

Do not pass specially preprocessed ServiceRequestParameter to msoToJson mapping for Instance Management requests.

Issue-ID: SO-2168
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: Ic6bdd624bd03c7c03213248781dc5e554331feed

1 files changed, 13 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
index 5306888570..e4532cd8d7 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/RequestHandlerUtilsTest.java
@@ -27,6 +27,7 @@ import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlMatching;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 import static org.onap.so.logger.HttpHeadersConstants.ONAP_REQUEST_ID;
@@ -150,6 +151,18 @@ public class RequestHandlerUtilsTest extends BaseTest {
 
     }
 
+    @Test
+    public void test_mapJSONtoMSOStyleCustomWorkflowRequest() throws IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.setSerializationInclusion(Include.NON_NULL);
+        String testRequest = inputStream("/CustomWorkflowRequest.json");
+        String resultString =
+                requestHandlerUtils.mapJSONtoMSOStyle(testRequest, null, true, Action.inPlaceSoftwareUpdate);
+        ServiceInstancesRequest sir = mapper.readValue(resultString, ServiceInstancesRequest.class);
+        assertEquals(sir.getRequestDetails().getCloudConfiguration().getTenantId(), "88a6ca3ee0394ade9403f075db23167e");
+        assertNotEquals(sir.getRequestDetails().getRequestParameters().getUserParams().size(), 0);
+    }
+
 
     @Test
     public void test_mapJSONtoMSOStyleUsePreload() throws IOException {