Skip to content

schema,engine-schema: explicit VMware 8.0.0.2, 8.0.0.3 support, logs #8444

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
shwstppr merged 3 commits into from
Jan 9, 2024
Merged

schema,engine-schema: explicit VMware 8.0.0.2, 8.0.0.3 support, logs #8444

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
b85d8df
schema: add vmware 8.0.0.2 support explicitly
shwstppr Jan 4, 2024
9e3edb2
add logs
shwstppr Jan 4, 2024
0936580
add 8.0c
shwstppr Jan 8, 2024
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
10 changes: 8 additions & 2 deletions engine/schema/src/main/java/com/cloud/hypervisor/dao/HypervisorCapabilitiesDaoImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,17 @@ public HypervisorCapabilitiesVO findByHypervisorTypeAndVersion(HypervisorType hy
sc.setParameters("hypervisorType", hypervisorType);
sc.setParameters("hypervisorVersion", hypervisorVersion);
HypervisorCapabilitiesVO result = findOneBy(sc);
String parentVersion = CloudStackVersion.getVMwareParentVersion(hypervisorVersion);
if (result != null || !HypervisorType.VMware.equals(hypervisorType) ||
CloudStackVersion.getVMwareParentVersion(hypervisorVersion) == null) {
parentVersion == null) {
return result;
}
sc.setParameters("hypervisorVersion", CloudStackVersion.getVMwareParentVersion(hypervisorVersion));
if (s_logger.isDebugEnabled()) {
s_logger.debug(String.format("Hypervisor capabilities for hypervisor: %s, version: %s can not be found. " +
"Trying to find capabilities for the parent version: %s",
hypervisorType, hypervisorVersion, parentVersion));
}
sc.setParameters("hypervisorVersion", parentVersion);
return findOneBy(sc);
}

Expand Down
4 changes: 4 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41810to41900.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,3 +319,7 @@ CREATE TABLE `cloud_usage`.`bucket_statistics` (

-- Add remover account ID to quarantined IPs table.
CALL `cloud`.`IDEMPOTENT_ADD_COLUMN`('cloud.quarantined_ips', 'remover_account_id', 'bigint(20) unsigned DEFAULT NULL COMMENT "ID of the account that removed the IP from quarantine, foreign key to `account` table"');

-- Explicitly add support for VMware 8.0b (8.0.0.2), 8.0c (8.0.0.3)
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0.0.2', 1024, 0, 59, 64, 1, 1);
INSERT IGNORE INTO `cloud`.`hypervisor_capabilities` (uuid, hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, max_hosts_per_cluster, storage_motion_supported, vm_snapshot_enabled) values (UUID(), 'VMware', '8.0.0.3', 1024, 0, 59, 64, 1, 1);