Skip to content

Commit e8c32d6

Browse files
authored
Add support for vSphere 8.0 (#7046)
1 parent ee6ed21 commit e8c32d6

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@
1919
-- Schema upgrade from 4.17.2.0 to 4.18.0.0
2020
--;
2121

22+
-- Add support for VMware 8.0
23+
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', 1024, 0, 59, 64, 1, 1);
24+
INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) SELECT UUID(),'VMware', '8.0', guest_os_name, guest_os_id, utc_timestamp(), 0 FROM `cloud`.`guest_os_hypervisor` WHERE hypervisor_type='VMware' AND hypervisor_version='7.0.3.0';
25+
2226
-- Enable CPU cap for default system offerings;
2327
UPDATE `cloud`.`service_offering` so
2428
SET so.limit_cpu_use = 1

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@
173173
<cs.servlet.version>4.0.1</cs.servlet.version>
174174
<cs.tomcat-embed-core.version>10.0.22</cs.tomcat-embed-core.version>
175175
<cs.trilead.version>build-217-jenkins-27</cs.trilead.version>
176-
<cs.vmware.api.version>7.0</cs.vmware.api.version>
176+
<cs.vmware.api.version>8.0</cs.vmware.api.version>
177177
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
178178
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
179179
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>

vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualStorageObjectManagerMO.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public VStorageObject registerVirtualDisk(DatastoreFile datastoreFile, String na
5858
}
5959

6060
public VStorageObject retrieveVirtualDisk (ID id, ManagedObjectReference morDS) throws Exception {
61-
return _context.getService().retrieveVStorageObject(_mor, id, morDS);
61+
return _context.getService().retrieveVStorageObject(_mor, id, morDS, null);
6262
}
6363

6464
public VStorageObject createDisk(ManagedObjectReference morDS, Storage.ProvisioningType diskProvisioningType, long currentSizeInBytes, String datastoreFilepath, String filename) throws Exception {

0 commit comments

Comments
 (0)