Author: arkurth
Date: Wed Jul 13 19:08:25 2016
New Revision: 1752523
URL: http://svn.apache.org/viewvc?rev=1752523&view=rev
Log:
VCL-929
VIM_SSH.pm::get_virtual_disk_hardware_version still wasn't parsing the hardware
version correctly. '1' was being returned if the value was supposed to be '11'.
Updated to regex to include the /g flag.
Also added check to VMware.pm::get_vm_virtual_hardware_version to catch if
get_virtual_disk_hardware_version returns a value less than 7 and ESXi is being
used.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm?rev=1752523&r1=1752522&r2=1752523&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm Wed
Jul 13 19:08:25 2016
@@ -1944,7 +1944,7 @@ sub get_virtual_disk_hardware_version {
next;
}
- my ($hardware_version) = $disk_info =~
/\shardwareVersion\s*=\s*(\d+)/i;
+ my ($hardware_version) = $disk_info =~
/\shardwareVersion\s*=\s*(\d+)/ig;
if (!$hardware_version) {
notify($ERRORS{'WARNING'}, 0, "unable to determine disk
hardware version, disk path: $disk_path, disk info section from vim-cmd
$vim_cmd_arguments output:\n$disk_info");
next;
Modified: vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
URL:
http://svn.apache.org/viewvc/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm?rev=1752523&r1=1752522&r2=1752523&view=diff
==============================================================================
--- vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm
(original)
+++ vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VMware.pm Wed
Jul 13 19:08:25 2016
@@ -491,6 +491,7 @@ sub node_status {
# If normal checks require a reload, return it
if ($result =~ /reload/i) {
+ notify($ERRORS{'OK'}, 0, "skipping VMware node status checks,
parent node_status subroutine returned $result");
return $result;
}
@@ -4860,6 +4861,10 @@ sub get_vm_virtual_hardware_version {
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;
}
+ else {
+ notify($ERRORS{'WARNING'}, 0, "hardware version
$hardware_version is not valid on $vmware_product_name, overriding to version
7");
+ return 7;
+ }
}
# Maximum hardware version by VMware version:
