Merge "removed qualifiers that no longer exist"

[so.git] / adapters / mso-openstack-adapters / src / test / java / org / onap / so / adapters / vnf / VolumeGroupAdapterCommon.java

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 d817736..d0d06ae 100644 (file)
--- 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
@@ -25,17 +25,14 @@ import org.onap.so.adapters.vnfrest.DeleteVolumeGroupRequest;
 import org.onap.so.adapters.vnfrest.RollbackVolumeGroupRequest;
 import org.onap.so.adapters.vnfrest.UpdateVolumeGroupRequest;
 import org.onap.so.adapters.vnfrest.VolumeGroupRollback;
-import org.onap.so.cloud.CloudConfig;
 import org.onap.so.entity.MsoRequest;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
 import java.util.Map;
 
 public class VolumeGroupAdapterCommon extends BaseRestTestUtils {
 
-    @Autowired
-    protected CloudConfig cloudConfig;
+
 
     protected static final String MSO_REQUEST_ID = "62265093-277d-4388-9ba6-449838ade586";
     protected static final String MSO_SERVICE_INSTANCE_ID = "4147e06f-1b89-49c5-b21f-4faf8dc9805a";
@@ -59,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);
@@ -93,7 +90,6 @@ public class VolumeGroupAdapterCommon extends BaseRestTestUtils {
     }
 
     protected CreateVolumeGroupRequest buildCreateVfModuleRequest() {
-        cloudConfig.getIdentityService("MTN13").setIdentityUrl("http://localhost:" + wireMockPort + "/v2.0");
         CreateVolumeGroupRequest request = new CreateVolumeGroupRequest();
         request.setCloudSiteId(CLOUDSITE_ID);
         request.setTenantId(TENANT_ID);
@@ -108,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);
@@ -116,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");