Skip to content
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

Jump to bottom

Add support for vSphere 8.0 #7046

Merged
merged 2 commits into from Jan 18, 2023
Merged

Add support for vSphere 8.0 #7046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9605a
Add support for vSphere 8.0
rohityadavcloud Jan 4, 2023
e108439
fix build issue with new sdk
rohityadavcloud Jan 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql
View file
Open in desktop
Expand Up @@ -19,6 +19,10 @@
-- Schema upgrade from 4.17.2.0 to 4.18.0.0
--;

-- Add support for VMware 8.0
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);
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';

weizhouapache marked this conversation as resolved.
Show resolved Hide resolved
-- Enable CPU cap for default system offerings;
UPDATE `cloud`.`service_offering` so
SET so.limit_cpu_use = 1
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Expand Up @@ -173,7 +173,7 @@
<cs.servlet.version>4.0.1</cs.servlet.version>
<cs.tomcat-embed-core.version>10.0.22</cs.tomcat-embed-core.version>
<cs.trilead.version>build-217-jenkins-27</cs.trilead.version>
<cs.vmware.api.version>7.0</cs.vmware.api.version>
<cs.vmware.api.version>8.0</cs.vmware.api.version>
<cs.winrm4j.version>0.5.0</cs.winrm4j.version>
<cs.xapi.version>6.2.0-3.1</cs.xapi.version>
<cs.xmlrpc.version>3.1.3</cs.xmlrpc.version>
Expand Down
2 changes: 1 addition & 1 deletion vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/VirtualStorageObjectManagerMO.java
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@ public VStorageObject registerVirtualDisk(DatastoreFile datastoreFile, String na
}

public VStorageObject retrieveVirtualDisk (ID id, ManagedObjectReference morDS) throws Exception {
return _context.getService().retrieveVStorageObject(_mor, id, morDS);
return _context.getService().retrieveVStorageObject(_mor, id, morDS, null);
}

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