vnf spin up gr api vnf s base module fails

map object representations of json back to json strings
marshal all objects to json strings before sending
all input params converted to Map<String, Object>
Updated userParams map from HashMap<String, String> to Map<String,
Object> as HashMap<String, String> userParams was causing VNF spin up
to fail. Input json in Userparams was not accepted as a valid json
format. Updated other files that were affected by this change.

Change-Id: I0c00fc00c4c11b54ace4df7be8d5bfc80d41d130
Issue-ID: SO-1582
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

7 files changed, 43 insertions, 43 deletions

diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterAsyncImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterAsyncImplTest.java
index 4f1c2c8707..3ebaea9c2c 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterAsyncImplTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterAsyncImplTest.java
@@ -76,7 +76,7 @@ public class MsoVnfAdapterAsyncImplTest extends BaseRestTestUtils {
 		String vnfName = "DEV-VF-1802-it3-pwt3-v6-vSAMP10a-addon2-Replace-1001/stackId";
 		String notificationUrl = "http://localhost:"+wireMockPort+"/notify/adapterNotify/updateVnfNotificationRequest";
 		instance.createVnfA("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
-				"volumeGroupHeatStackId|1", new HashMap<String, String>(), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, "messageId",
+				"volumeGroupHeatStackId|1", new HashMap<String, Object>(), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, "messageId",
 				msoRequest, notificationUrl);
 
 		verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
@@ -86,7 +86,7 @@ public class MsoVnfAdapterAsyncImplTest extends BaseRestTestUtils {
 	public void createVNFTest_Exception() throws Exception {
 		String notificationUrl = "http://localhost:"+wireMockPort+"/notify/adapterNotify/updateVnfNotificationRequest";
 		instance.createVnfA("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",
-				"volumeGroupHeatStackId|1", new HashMap<String, String>(), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, "messageId",
+				"volumeGroupHeatStackId|1", new HashMap<String, Object>(), Boolean.FALSE, Boolean.TRUE, Boolean.FALSE, "messageId",
 				null, notificationUrl);
 
 		verify(1,postRequestedFor(urlEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")));
@@ -99,7 +99,7 @@ public class MsoVnfAdapterAsyncImplTest extends BaseRestTestUtils {
 		msoRequest.setRequestId("12345");
 		msoRequest.setServiceInstanceId("12345");
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
 				(containing("messageId"))
@@ -116,7 +116,7 @@ public class MsoVnfAdapterAsyncImplTest extends BaseRestTestUtils {
 		msoRequest.setRequestId("12345");
 		msoRequest.setServiceInstanceId("12345");
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		stubFor(post(urlPathEqualTo("/notify/adapterNotify/updateVnfNotificationRequest")).withRequestBody
 				(containing("messageId"))
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterImplTest.java
index 849c0811b0..be3b54e23f 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterImplTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfAdapterImplTest.java
@@ -104,7 +104,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("MTN13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -124,7 +124,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -144,7 +144,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -164,7 +164,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -181,7 +181,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -195,7 +195,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		expectedException.expect(VnfException.class);
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -211,7 +211,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -230,7 +230,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -250,7 +250,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -268,7 +268,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -300,7 +300,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -337,7 +337,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "XVFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", null, map,
@@ -355,7 +355,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -375,7 +375,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		expectedException.expect(VnfException.class);
 		MsoRequest msoRequest = getMsoRequest();
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",
 				"volumeGroupHeatStackId|1", "baseVfHeatStackId", "vfModuleStackId",
@@ -388,7 +388,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		expectedException.expect(VnfNotFound.class);
 		MsoRequest msoRequest = getMsoRequest();
 		mockOpenStackResponseAccess(wireMockPort);
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -405,7 +405,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
 				.willReturn(aResponse().withHeader("Content-Type", "application/json")
 						.withStatus(HttpStatus.SC_INTERNAL_SERVER_ERROR)));
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -422,7 +422,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		stubFor(get(urlPathEqualTo("/mockPublicUrl/stacks/volumeGroupHeatStackId"))
 				.willReturn(aResponse().withHeader("Content-Type", "application/json")
 						.withStatus(HttpStatus.SC_NOT_FOUND)));
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -438,7 +438,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		mockOpenStackGetStackVfModule_200();
 		mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
 		mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_INTERNAL_SERVER_ERROR,"OpenstackResponse_Stack_Created_VfModule.json");
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -454,7 +454,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		mockOpenStackGetStackVfModule_200();
 		mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
 		mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_NOT_FOUND,"OpenstackResponse_Stack_Created_VfModule.json");
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -470,7 +470,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 		mockOpenStackGetStackVfModule_200();
 		mockOpenstackGetWithResponse("/mockPublicUrl/stacks/volumeGroupHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
 		mockOpenstackGetWithResponse("/mockPublicUrl/stacks/baseVfHeatStackId",HttpStatus.SC_OK,"OpenstackResponse_Stack_Created_VfModule.json");
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -489,7 +489,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		VfModuleCustomization vfModuleCustomization = getVfModuleCustomization();
 		vfModuleCustomization.getVfModule().getModuleHeatTemplate().setParameters(new HashSet<>());
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
@@ -509,7 +509,7 @@ public class MsoVnfAdapterImplTest extends BaseRestTestUtils {
 
 		VfModuleCustomization vfModuleCustomization = getVfModuleCustomization();
 		vfModuleCustomization.getVfModule().getModuleHeatTemplate().setParameters(new HashSet<>());
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		instance.updateVfModule("MTN13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", vnfName, "VFMOD",
 				"volumeGroupHeatStackId", "baseVfHeatStackId", "vfModuleStackId",
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java
index addc12a5d3..44843900fc 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfCloudifyAdapterImplTest.java
@@ -265,7 +265,7 @@ public class MsoVnfCloudifyAdapterImplTest extends BaseRestTestUtils {
 		msoRequest.setRequestId("12345");
 		msoRequest.setServiceInstanceId("12345");
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		map.put("key1", "value1");
 		try {
 			instance.createVnf("mdt1", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "vSAMP12", "VFMOD",
@@ -282,7 +282,7 @@ public class MsoVnfCloudifyAdapterImplTest extends BaseRestTestUtils {
 		msoRequest.setRequestId("12345");
 		msoRequest.setServiceInstanceId("12345");
 
-		Map<String, String> map = new HashMap<>();
+		Map<String, Object> map = new HashMap<>();
 		
 		map.put("key1", "value1");
 		try {
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java
index 1fd3ffc90a..75cea9eafc 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java
@@ -66,7 +66,7 @@ public class MsoVnfMulticloudAdapterImplTest extends BaseRestTestUtils{
     @Test
     public void createVfModule() throws Exception {
         //expectedException.expect(VnfException.class);
-        Map<String, String> stackInputs = new HashMap<>();
+        Map<String, Object> stackInputs = new HashMap<>();
         stackInputs.put("oof_directives", "{}");
         stackInputs.put("sdnc_directives", "{}");
         stackInputs.put("generic_vnf_id", "genVNFID");
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImplTest.java
index a422680d00..0cd3d1a61d 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImplTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfPluginAdapterImplTest.java
@@ -56,7 +56,7 @@ public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
     public void createVfModule_ModelCustUuidIsNull() throws Exception {
         expectedException.expect(VnfException.class);
         MsoRequest msoRequest = getMsoRequest();
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
         msoVnfPluginAdapter.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
                 "volumeGroupHeatStackId|1", "baseVfHeatStackId", null, map,
@@ -68,7 +68,7 @@ public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
     public void createVfModule_ModelCustUuidIsNotFound() throws Exception {
         expectedException.expect(VnfException.class);
         MsoRequest msoRequest = getMsoRequest();
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
         msoVnfPluginAdapter.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
                 "volumeGroupHeatStackId|1", "baseVfHeatStackId", "88a6ca3ee0394ade9403f075db23167e", map,
@@ -80,7 +80,7 @@ public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
     public void createVfModule_VduException() throws Exception {
         expectedException.expect(VnfException.class);
         MsoRequest msoRequest = getMsoRequest();
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
         msoVnfPluginAdapter.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
                 "volumeGroupHeatStackId|1", "baseVfHeatStackId", "9b339a61-69ca-465f-86b8-1c72c582b8e8", map,
@@ -94,7 +94,7 @@ public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
         mockOpenStackGetStackVfModule_200();
 
         MsoRequest msoRequest = getMsoRequest();
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
         msoVnfPluginAdapter.createVfModule("MTN13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
                 null, "baseVfHeatStackId", "9b339a61-69ca-465f-86b8-1c72c582b8e8", map,
@@ -107,7 +107,7 @@ public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
         expectedException.expect(VnfException.class);
         mockOpenStackResponseAccess(wireMockPort);
         MsoRequest msoRequest = getMsoRequest();
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
         msoVnfPluginAdapter.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
                 "volumeGroupHeatStackId|1", "baseVfHeatStackId", "9b339a61-69ca-465f-86b8-1c72c582b8e8", map,
@@ -125,7 +125,7 @@ public class MsoVnfPluginAdapterImplTest extends BaseRestTestUtils {
                         .withBodyFile("OpenstackResponse_Stack_Created_VfModule.json")
                         .withStatus(HttpStatus.SC_OK)));
         MsoRequest msoRequest = getMsoRequest();
-        Map<String, String> map = new HashMap<>();
+        Map<String, Object> map = new HashMap<>();
         map.put("key1", "value1");
         msoVnfPluginAdapter.createVfModule("mtn13", "88a6ca3ee0394ade9403f075db23167e", "vnf", "1", "", vnfName, "", "VFMOD",
                 "volumeGroupHeatStackId", "baseVfHeatStackId", "9b339a61-69ca-465f-86b8-1c72c582b8e8", map,
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VnfAdapterRestTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VnfAdapterRestTest.java
index c502620920..343b6245e6 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VnfAdapterRestTest.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VnfAdapterRestTest.java
@@ -169,7 +169,7 @@ public class VnfAdapterRestTest extends BaseRestTestUtils {
 		MsoRequest msoReq = new MsoRequest();
 		boolean failIfExists = true;
 		Boolean enableBridge = null;
-		Map<String, String> vfModuleParams = new HashMap<String, String>();
+		Map<String, Object> vfModuleParams = new HashMap<>();
 
 
 		vfModuleParams.put("vf_module_id", VF_MODULE_ID);
@@ -236,7 +236,7 @@ public class VnfAdapterRestTest extends BaseRestTestUtils {
 		MsoRequest msoReq = new MsoRequest();
 		boolean failIfExists = true;
 		boolean enableBridge = false;
-		Map<String, String> vfModuleParams = new HashMap<String, String>();
+		Map<String, Object> vfModuleParams = new HashMap<>();
 
 		vfModuleParams.put("vf_module_id", VF_MODULE_ID);
 		vfModuleParams.put("vnf_id", AAI_VNF_ID);
@@ -385,7 +385,7 @@ public class VnfAdapterRestTest extends BaseRestTestUtils {
 		msoRequest.setRequestId(MSO_REQUEST_ID);
 		msoRequest.setServiceInstanceId(MSO_SERVICE_INSTANCE_ID);
 		
-		Map<String, String> vfModuleParams = new HashMap<String, String>();
+		Map<String, Object> vfModuleParams = new HashMap<>();
 
 		vfModuleParams.put("exn_direct_net_fqdn", EXN_DIRECT_NET_FQDN);
 		vfModuleParams.put("exn_hsl_net_fqdn", EXN_HSL_NET_FQDN);
@@ -511,7 +511,7 @@ public class VnfAdapterRestTest extends BaseRestTestUtils {
 		MsoRequest msoReq = new MsoRequest();
 		boolean failIfExists = true;
 		boolean enableBridge = false;
-		Map<String, String> vfModuleParams = new HashMap<String, String>();
+		Map<String, Object> vfModuleParams = new HashMap<>();
 
 		vfModuleParams.put("vf_module_id", VF_MODULE_ID);
 		vfModuleParams.put("vnf_id", AAI_VNF_ID);
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VolumeGroupAdapterCommon.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VolumeGroupAdapterCommon.java
index 68982799f1..d0d06aed6c 100644
--- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VolumeGroupAdapterCommon.java
+++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/VolumeGroupAdapterCommon.java
@@ -56,7 +56,7 @@ public class VolumeGroupAdapterCommon extends BaseRestTestUtils {
         request.setModelCustomizationUuid(MODEL_CUSTOMIZATION_UUID);
         request.setSkipAAI(true);
         request.setVolumeGroupStackId(VOUME_GROUP_NAME);
-        Map<String, String> volumeGroupParams = getVolumeGroupParamsMap();
+        Map<String, Object> volumeGroupParams = getVolumeGroupParamsMap();
         request.setVolumeGroupParams(volumeGroupParams);
         MsoRequest msoReq = getMsoRequest();
         request.setMsoRequest(msoReq);
@@ -104,7 +104,7 @@ public class VolumeGroupAdapterCommon extends BaseRestTestUtils {
         request.setFailIfExists(true);
         request.setEnableBridge(false);
         request.setSuppressBackout(true);
-        Map<String, String> volumeGroupParams = getVolumeGroupParamsMap();
+        Map<String, Object> volumeGroupParams = getVolumeGroupParamsMap();
         request.setVolumeGroupParams(volumeGroupParams);
         MsoRequest msoReq = getMsoRequest();
         request.setMsoRequest(msoReq);
@@ -112,8 +112,8 @@ public class VolumeGroupAdapterCommon extends BaseRestTestUtils {
         return request;
     }
 
-    private Map<String, String> getVolumeGroupParamsMap() {
-        Map<String, String> volumeGroupParams =  new HashMap<>();
+    private Map<String, Object> getVolumeGroupParamsMap() {
+        Map<String, Object> volumeGroupParams =  new HashMap<>();
         volumeGroupParams.put("fsb_volume_type_0","volume_type");
         volumeGroupParams.put("fsb_volume_image_name_1","vol_img_1");
         volumeGroupParams.put("fsb_volume_image_name_0","vol_img_0");