You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@vcl.apache.org by ar...@apache.org on 2010/09/17 20:08:29 UTC
svn commit: r998230 - in
/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware:
VMware.pm vSphere_SDK.pm
Author: arkurth
Date: Fri Sep 17 18:08:29 2010
New Revision: 998230
URL: http://svn.apache.org/viewvc?rev=998230&view=rev
Log:
VCL-298
Removed code which overrode the vmdk controller type if it is set to IDE in the vmdk file and ESX is being used. It now leaves the value set to IDE and the vmx file is configured with this value. Added code to override the hardware version if it's set to 4 in the vmdk file, ESX is being used, and the controller type is IDE.
Modified:
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=998230&r1=998229&r2=998230&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm Fri Sep 17 18:08:29 2010
@@ -3057,8 +3057,6 @@ sub get_vm_disk_adapter_type {
return;
}
- my $vm_host_product_name = $self->get_vmhost_product_name() || return;
-
my $vmdk_controller_type;
if ($self->api->can("get_virtual_disk_controller_type") && ($vmdk_controller_type = $self->api->get_virtual_disk_controller_type($self->get_vmdk_file_path()))) {
@@ -3068,7 +3066,7 @@ sub get_vm_disk_adapter_type {
notify($ERRORS{'DEBUG'}, 0, "retrieved VM disk adapter type from vmdk file: $vmdk_controller_type");
}
- if (!$vmdk_controller_type || ($vm_host_product_name =~ /esx/i && $vmdk_controller_type =~ /ide/i)) {
+ if (!$vmdk_controller_type) {
my $vm_os_configuration = $self->get_vm_os_configuration();
if (!$vm_os_configuration) {
notify($ERRORS{'WARNING'}, 0, "unable to determine VM disk adapter type because unable to retrieve default VM OS configuration");
@@ -3105,12 +3103,49 @@ sub get_vm_virtual_hardware_version {
return;
}
+ my $hardware_version;
if ($self->api->can("get_virtual_disk_hardware_version")) {
- return $self->api->get_virtual_disk_hardware_version($self->get_vmdk_file_path());
+ $hardware_version = $self->api->get_virtual_disk_hardware_version($self->get_vmdk_file_path());
+ notify($ERRORS{'DEBUG'}, 0, "retrieved hardware version from api object: $hardware_version");
}
else {
- return $self->get_vmdk_parameter_value('virtualHWVersion');
+ $hardware_version = $self->get_vmdk_parameter_value('virtualHWVersion');
+ notify($ERRORS{'DEBUG'}, 0, "retrieved hardware version stored in the vmdk file: $hardware_version");
+ }
+
+ if (!$hardware_version) {
+ notify($ERRORS{'WARNING'}, 0, "unable to determine hardware version of vmdk file, returning 7");
+ return 7;
+ }
+
+ # Under ESXi, IDE adapters are not allowed if the hardware version is 4
+ # Override the hardware version retrieved from the vmdk file if:
+ # -VMware product = ESX
+ # -Adapter type = IDE
+ # -Hardware version = 4
+ if ($hardware_version < 7) {
+ my $vmware_product_name = $self->get_vmhost_product_name();
+ if (!$vmware_product_name) {
+ notify($ERRORS{'WARNING'}, 0, "unable to determine VMware product name in order to tell if hardware version should be overridden, returning $hardware_version");
+ return $hardware_version;
+ }
+
+ if ($vmware_product_name =~ /esx/i) {
+ my $adapter_type = $self->get_vm_disk_adapter_type();
+ if (!$adapter_type) {
+ notify($ERRORS{'WARNING'}, 0, "unable to determine disk adapter type in order to tell if hardware version should be overridden, returning $hardware_version");
+ return $hardware_version;
+ }
+
+ if ($adapter_type =~ /ide/i) {
+ notify($ERRORS{'OK'}, 0, "overriding hardware version $hardware_version --> 7, IDE adapters cannot be used on ESX unless the hardware version is 7 or higher, VMware product: '$vmware_product_name', vmdk adapter type: $adapter_type, vmdk hardware version: $hardware_version");
+ return 7;
+ }
+ }
}
+
+ notify($ERRORS{'OK'}, 0, "returning hardware version: $hardware_version");
+ return $hardware_version;
}
#/////////////////////////////////////////////////////////////////////////////
Modified: incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm
URL: http://svn.apache.org/viewvc/incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm?rev=998230&r1=998229&r2=998230&view=diff
==============================================================================
--- incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm (original)
+++ incubator/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/vSphere_SDK.pm Fri Sep 17 18:08:29 2010
@@ -451,21 +451,11 @@ sub copy_virtual_disk {
# If the adapter type was not specified, retrieve it from the source vmdk file
if (!$destination_adapter_type) {
- my $vmware_product_name = $self->get_vmware_product_name();
$destination_adapter_type = $self->get_virtual_disk_controller_type($source_path);
-
- if (!$vmware_product_name) {
- notify($ERRORS{'WARNING'}, 0, "destination adapter type argument was not specifed and unable to determine VMware product name contains ESX, using lsiLogic");
- $destination_adapter_type = 'lsiLogic';
- }
- elsif (!$destination_adapter_type) {
+ if (!$destination_adapter_type) {
notify($ERRORS{'WARNING'}, 0, "destination adapter type argument was not specifed and unable to retrieve adapter type from source vmdk file: $source_path, using lsiLogic");
$destination_adapter_type = 'lsiLogic';
}
- elsif ($vmware_product_name =~ /esx/i && $destination_adapter_type =~ /ide/i) {
- notify($ERRORS{'OK'}, 0, "VMware product is '$vmware_product_name' and adapter type from source vmdk file is '$destination_adapter_type', using lsiLogic");
- $destination_adapter_type = 'lsiLogic';
- }
}
# Check the adapter type argument, the string must match exactly or the copy will fail
@@ -923,12 +913,12 @@ sub get_virtual_disk_hardware_version {
}
# Check if the hardwareVersion key exists in the vmdk file info
- if (!defined($vmdk_file_info->{hardwareVersion}) || !$vmdk_file_info->{hardwareVersion}) {
+ my $hardware_version = $vmdk_file_info->{hardwareVersion};
+ if (!$hardware_version) {
notify($ERRORS{'WARNING'}, 0, "unable to retrieve hardwareVersion value from file info: $vmdk_file_path\n" . format_data($vmdk_file_info));
return;
}
- my $hardware_version = $vmdk_file_info->{hardwareVersion};
notify($ERRORS{'DEBUG'}, 0, "retrieved hardwareVersion value from vmdk file info: $hardware_version");
return $hardware_version;
}