Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

server: fix available hypervisors listing for a zone #10738

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

Merged
yadvr merged 2 commits into from
Apr 24, 2025
Merged

server: fix available hypervisors listing for a zone #10738

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7188f28
server: fix available hypervisors listing for a zone
shwstppr Apr 16, 2025
4c6aa55
fix
shwstppr Apr 17, 2025
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
19 changes: 10 additions & 9 deletions 19 server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import java.util.Locale;
import java.util.Map;
import java.util.Random;
import java.util.Set;
import java.util.stream.Collectors;

import javax.inject.Inject;
Expand Down Expand Up @@ -60,10 +59,8 @@
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.utils.identity.ManagementServerNode;

import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.ObjectUtils;

import org.springframework.stereotype.Component;

import com.cloud.agent.AgentManager;
Expand Down Expand Up @@ -175,6 +172,7 @@
import com.cloud.storage.dao.VolumeDao;
import com.cloud.user.Account;
import com.cloud.user.AccountManager;
import com.cloud.utils.StringUtils;
import com.cloud.utils.Ternary;
import com.cloud.utils.UriUtils;
import com.cloud.utils.component.Manager;
Expand All @@ -201,7 +199,6 @@
import com.cloud.utils.ssh.SSHCmdHelper;
import com.cloud.utils.ssh.SshException;
import com.cloud.vm.UserVmManager;
import com.cloud.utils.StringUtils;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachine.State;
Expand Down Expand Up @@ -3266,12 +3263,16 @@

@Override
public List<HypervisorType> listAvailHypervisorInZone(final Long zoneId) {
List<VMTemplateVO> systemVMTemplates = _templateDao.listAllReadySystemVMTemplates(zoneId);
final Set<HypervisorType> hypervisors = new HashSet<>();
for (final VMTemplateVO systemVMTemplate : systemVMTemplates) {
hypervisors.add(systemVMTemplate.getHypervisorType());
final SearchCriteria<String> sc = _hypervisorsInDC.create();

Check warning on line 3266 in server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java#L3266 

Added line #L3266 was not covered by tests
if (zoneId != null) {
sc.setParameters("dataCenter", zoneId);

Check warning on line 3268 in server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java#L3268 

Added line #L3268 was not covered by tests
}
return new ArrayList<>(hypervisors);
sc.setParameters("type", Host.Type.Routing);

Check warning on line 3270 in server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java#L3270 

Added line #L3270 was not covered by tests

return _hostDao.customSearch(sc, null).stream()

Check warning on line 3272 in server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java#L3272 

Added line #L3272 was not covered by tests
sureshanaparti marked this conversation as resolved.
Show resolved Hide resolved
// The search is not able to return list of enums, so getting
// list of hypervisors as strings and then converting them to enum
.map(HypervisorType::getType).collect(Collectors.toList());

Check warning on line 3275 in server/src/main/java/com/cloud/resource/ResourceManagerImpl.java

View check run for this annotation

Codecov / codecov/patch

server/src/main/java/com/cloud/resource/ResourceManagerImpl.java#L3275 

Added line #L3275 was not covered by tests
}

@Override
Expand Down
Loading
Morty Proxy This is a proxified and sanitized view of the page, visit original site.