Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fixed two flaky tests in dmestore-service #2

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fixed two flaky tests in dmestore-service #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dmestore-service/src/main/java/com/huawei/dmestore/services/VmfsAccessServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -1705,7 +1706,7 @@ private String volumeDeleteGetTaskId(Map<String, Object> params) {
private ResponseEntity hostUnmapping(Map<String, Object> params) throws DmeException {
String hostId = ToolUtils.getStr(params.get(HOST_ID));
Object volumeIds = params.get(VOLUMEIDS);
Map<String, Object> requestbody = new HashMap<>();
Map<String, Object> requestbody = new LinkedHashMap<>();
requestbody.put(HOST_ID, hostId);
requestbody.put(VOLUME_IDS, volumeIds);
ResponseEntity responseEntity = dmeAccessService.access(DmeConstants.DME_HOST_UNMAPPING_URL, HttpMethod.POST,
Expand Down
3 changes: 2 additions & 1 deletion dmestore-service/src/main/java/com/huawei/dmestore/services/VmfsOperationServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -178,7 +179,7 @@ private Map<String, Object> getCustomizeVolumeTuning(Map<String, Object> params)

@Override
public void expandVmfs(Map<String, String> volumemap) throws DmeException {
Map<String, Object> reqBody = new HashMap<>(DEFAULT_CAPACITY);
Map<String, Object> reqBody = new LinkedHashMap<>(DEFAULT_CAPACITY);
List<String> volumeIds = new ArrayList<>(DEFAULT_CAPACITY);

String volumeId = volumemap.get("volume_id");
Expand Down
3 changes: 2 additions & 1 deletion dmestore-service/src/test/java/com/huawei/dmestore/services/VmfsAccessServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -432,7 +433,7 @@ void unmountVmfBefore() throws Exception {
String listStr1 = gson.toJson(clusters);
when(vcsdkUtils.getMountClustersByDsObjectId(dataStoreId, mappeddmegroups)).thenReturn(listStr1);
String unmappingUrl = "/rest/blockservice/v1/volumes/host-unmapping";
Map<String, Object> requestbody = new HashMap<>();
Map<String, Object> requestbody = new LinkedHashMap<>();
requestbody.put("host_id", hostId);
requestbody.put("volume_ids", volumeIds);
ResponseEntity responseEntity1 = new ResponseEntity(taskStr, null, HttpStatus.ACCEPTED);
Expand Down