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 2016/02/05 23:31:08 UTC
svn commit: r1728758 -
/vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.pm
Author: arkurth
Date: Fri Feb 5 22:31:08 2016
New Revision: 1728758
URL: http://svn.apache.org/viewvc?rev=1728758&view=rev
Log:
VCL-929
Fixed regex bug in VIM_SSH.pm::get_virtual_disk_hardware_version.
Modified:
vcl/trunk/managementnode/lib/VCL/Module/Provisioning/VMware/VIM_SSH.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=1728758&r1=1728757&r2=1728758&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 Fri Feb 5 22:31:08 2016
@@ -1928,19 +1928,12 @@ sub get_virtual_disk_hardware_version {
next;
}
- my ($hardware_version) = $disk_info =~ /\shardwareVersion\s*=\s*(.+)/i;
+ my ($hardware_version) = $disk_info =~ /\shardwareVersion\s*=\s*(\d+)/i;
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;
}
-
- if ($hardware_version =~ /unset/i) {
- notify($ERRORS{'DEBUG'}, 0, "disk hardware version is not set in the vmdk file: $disk_path");
- return 0;
- }
else {
- # Extract just the hardware version from the value
- $hardware_version =~ s/.*(\d+).*/$1/ig;
notify($ERRORS{'DEBUG'}, 0, "retrieved hardware version for $disk_path: '$hardware_version'");
return $hardware_version;
}