Skip to content

server: add account-level setting: router.hypervisor.type #6101

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

Closed
weizhouapache wants to merge 3 commits into from
Closed

server: add account-level setting: router.hypervisor.type #6101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6172c39
server: add default hypervisor to supported hypervisor list of VRs
weizhouapache Mar 11, 2022
01f192f
Revert "server: add default hypervisor to supported hypervisor list o…
weizhouapache Mar 16, 2022
9b619bf
server: add account-level setting: router.hypervisor.type
weizhouapache Mar 16, 2022
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
9 changes: 8 additions & 1 deletion server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,14 @@ protected String getNoHypervisorsErrMsgDetails() {
protected List<HypervisorType> getHypervisors(final RouterDeploymentDefinition routerDeploymentDefinition) throws InsufficientServerCapacityException {
final DeployDestination dest = routerDeploymentDefinition.getDest();
List<HypervisorType> hypervisors = new ArrayList<HypervisorType>();
if (dest.getCluster() != null) {
HypervisorType routerHypervisorType = HypervisorType.None;
final String routerHypervisorTypeStr = VirtualNetworkApplianceManager.VirtualRouterHypervisorType.valueIn(routerDeploymentDefinition.getOwner().getId());
if (routerHypervisorTypeStr != null) {
routerHypervisorType = HypervisorType.getType(routerHypervisorTypeStr);
}
if (routerHypervisorType != HypervisorType.None) {
hypervisors.add(routerHypervisorType);
} else if (dest.getCluster() != null) {
if (dest.getCluster().getHypervisorType() == HypervisorType.Ovm) {
hypervisors.add(getClusterToStartDomainRouterForOvm(dest.getCluster().getPodId()));
} else {
Expand Down
4 changes: 4 additions & 0 deletions server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
static final String SetServiceMonitorCK = "network.router.EnableServiceMonitoring";
static final String RouterAlertsCheckIntervalCK = "router.alerts.check.interval";
static final String VirtualRouterServiceOfferingCK = "router.service.offering";
static final String VirtualRouterHypervisorTypeCK = "router.hypervisor.type";

static final String RouterHealthChecksConfigRefreshIntervalCK = "router.health.checks.config.refresh.interval";
static final String RouterHealthChecksResultFetchIntervalCK = "router.health.checks.results.fetch.interval";
Expand Down Expand Up @@ -77,6 +78,9 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA

static final ConfigKey<String> VirtualRouterServiceOffering = new ConfigKey<String>(String.class, VirtualRouterServiceOfferingCK, "Advanced", "",
"Uuid of the service offering used by virtual routers; if NULL - system offering will be used", true, ConfigKey.Scope.Account, null);
static final ConfigKey<String> VirtualRouterHypervisorType = new ConfigKey<String>(String.class, VirtualRouterHypervisorTypeCK, "Advanced", "",
"Hypervisor type used to create virtual routers, valid values are: XenServer, KVM, VMware, Hyperv, VirtualBox, Parralels, BareMetal, Ovm, LXC, Any; " +
"if NULL - virtual router will be created with same hypervisor as user vm", true, ConfigKey.Scope.Account, null);

// Health checks
static final ConfigKey<Boolean> RouterHealthChecksEnabled = new ConfigKey<Boolean>(Boolean.class, "router.health.checks.enabled", "Advanced", "true",
Expand Down
1 change: 1 addition & 0 deletions server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3236,6 +3236,7 @@ public ConfigKey<?>[] getConfigKeys() {
RouterVersionCheckEnabled,
SetServiceMonitor,
VirtualRouterServiceOffering,
VirtualRouterHypervisorType,
RouterAlertsCheckInterval,
RouterHealthChecksEnabled,
RouterHealthChecksBasicInterval,
Expand Down