Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,8 @@ public Map<String, String> listDetailsKeyPairs(long resourceId, List<String> key
sc.setParameters("name", keys.toArray());

List<R> results = search(sc, null);
return results.stream().collect(Collectors.toMap(R::getName, R::getValue));
// Like listDetailsKeyPairs(long), a name stored more than once keeps the last value instead of failing
return results.stream().collect(Collectors.toMap(R::getName, R::getValue, (first, second) -> second));
}

public Map<String, Boolean> listDetailsVisibility(long resourceId) {
Expand All @@ -145,7 +146,7 @@ public Pair<Map<String, String>, Map<String, String>> listDetailsKeyPairsWithVis
Map<Boolean, Map<String, String>> partitioned = results.stream()
.collect(Collectors.partitioningBy(
R::isDisplay,
Collectors.toMap(R::getName, R::getValue)
Collectors.toMap(R::getName, R::getValue, (first, second) -> second)
));
return new Pair<>(partitioned.get(true), partitioned.get(false));
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnitRunner;

import com.cloud.utils.Pair;
import com.cloud.utils.db.SearchBuilder;
import com.cloud.utils.db.SearchCriteria;

Expand Down Expand Up @@ -108,6 +109,51 @@ public void testListDetailsKeyPairsEmptyResult() {
assertTrue(result.isEmpty());
}

private TestDetailVO mockDetail(String name, String value, boolean display) {
TestDetailVO detail = mock(TestDetailVO.class);
when(detail.getName()).thenReturn(name);
when(detail.getValue()).thenReturn(value);
when(detail.isDisplay()).thenReturn(display);
return detail;
}

@Test
public void testListDetailsKeyPairsWithNameStoredTwice() {
// A VM can end up with two kvm.vnc.address rows, which made the console endpoint fail with "Duplicate key"
List<TestDetailVO> mockResults = Arrays.asList(mockDetail("kvm.vnc.address", "10.0.0.1", true),
mockDetail("kvm.vnc.port", "5900", true), mockDetail("kvm.vnc.address", "10.0.0.1", true));
doReturn(mockResults).when(testDetailsDao).search(any(SearchCriteria.class), isNull());

Map<String, String> result = testDetailsDao.listDetailsKeyPairs(1L, Arrays.asList("kvm.vnc.address", "kvm.vnc.port"));

assertEquals(2, result.size());
assertEquals("10.0.0.1", result.get("kvm.vnc.address"));
assertEquals("5900", result.get("kvm.vnc.port"));
}

@Test
public void testListDetailsKeyPairsKeepsLastValueOfNameStoredTwice() {
List<TestDetailVO> mockResults = Arrays.asList(mockDetail("key1", "old", true), mockDetail("key1", "new", true));
doReturn(mockResults).when(testDetailsDao).search(any(SearchCriteria.class), isNull());

Map<String, String> result = testDetailsDao.listDetailsKeyPairs(1L, Arrays.asList("key1"));

assertEquals("new", result.get("key1"));
}

@Test
public void testListDetailsKeyPairsWithVisibilityWithNameStoredTwice() {
List<TestDetailVO> mockResults = Arrays.asList(mockDetail("key1", "old", true), mockDetail("key2", "value2", false),
mockDetail("key1", "new", true));
doReturn(mockResults).when(testDetailsDao).search(any(SearchCriteria.class), isNull());

Pair<Map<String, String>, Map<String, String>> result = testDetailsDao.listDetailsKeyPairsWithVisibility(1L);

assertEquals(1, result.first().size());
assertEquals("new", result.first().get("key1"));
assertEquals("value2", result.second().get("key2"));
}

protected static class TestDetailsDao extends ResourceDetailsDaoBase<TestDetailVO> {
@Override
public void addDetail(long resourceId, String key, String value, boolean display) {
Expand Down