fence-agents: master - fence_vmware: VIX API fix, ESX 4.0.0, helper more verbose
Jan Friesse
honzaf at fedoraproject.org
Wed Oct 7 15:04:49 UTC 2009
Gitweb: http://git.fedorahosted.org/git/fence-agents.git?p=fence-agents.git;a=commitdiff;h=a2f8c2a64bfe9909de3d96def9729963e2516412
Commit: a2f8c2a64bfe9909de3d96def9729963e2516412
Parent: cc95f40eeb1e987ae7d6e3a348f2f3c0f5b98c0d
Author: Jan Friesse <jfriesse at redhat.com>
AuthorDate: Wed Oct 7 17:03:09 2009 +0200
Committer: Jan Friesse <jfriesse at redhat.com>
CommitterDate: Wed Oct 7 17:04:04 2009 +0200
fence_vmware: VIX API fix, ESX 4.0.0, helper more verbose
- patch fixes exception in case user use VIX API
- fence agent is now tested against ESX 4.0.0 and vCenter 4.0.0
- fence_vmware_helper is more verbose in case some Perl module
is missing (prints Perl error message)
---
fence/agents/vmware/fence_vmware.py | 16 ++++++++++++----
fence/agents/vmware/fence_vmware_helper.pl | 2 +-
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/fence/agents/vmware/fence_vmware.py b/fence/agents/vmware/fence_vmware.py
index c3a6cf0..070c2c4 100644
--- a/fence/agents/vmware/fence_vmware.py
+++ b/fence/agents/vmware/fence_vmware.py
@@ -3,16 +3,24 @@
#
# The Following agent has been tested on:
# vmrun 2.0.0 build-116503 (from VMware Server 2.0) against:
-# VMware ESX 3.5 (works correctly)
-# VMware Server 2.0.0 (works correctly)
-# VMware ESXi 3.5 update 2 (works correctly)
+# VMware ESX 4.0.0
+# VMware vCenter 4.0.0
+# VMware ESX 3.5
+# VMware Server 2.0.0
+# VMware ESXi 3.5 update 2
# VMware Server 1.0.7 (works but list/status show only running VMs)
#
# VI Perl API 1.6 against:
+# VMware ESX 4.0.0
+# VMware vCenter 4.0.0
# VMware ESX 3.5
# VMware ESXi 3.5 update 2
# VMware Virtual Center 2.5
#
+# VMware vSphere SDK for Perl 4.0.0 against:
+# VMware ESX 4.0.0
+# VMware vCenter 4.0.0
+#
import sys, re, pexpect, exceptions
sys.path.append("@FENCEAGENTSLIBDIR@")
@@ -211,7 +219,7 @@ def get_power_status(conn,options):
if (vmware_internal_type==VMWARE_TYPE_ESX):
outlets=vmware_get_outlets_vi(conn,options,True)
else:
- outlets=get_outlets_status(conn,options,False)
+ outlets=get_outlets_status(conn,options)
if ((vmware_internal_type==VMWARE_TYPE_SERVER2) or (vmware_internal_type==VMWARE_TYPE_ESX)):
if (not (options["-n"] in outlets)):
diff --git a/fence/agents/vmware/fence_vmware_helper.pl b/fence/agents/vmware/fence_vmware_helper.pl
index 815728d..a0b5cea 100644
--- a/fence/agents/vmware/fence_vmware_helper.pl
+++ b/fence/agents/vmware/fence_vmware_helper.pl
@@ -74,7 +74,7 @@ my %opts = (
eval "use VMware::VIRuntime;";
if ($@) {
- show_error "Please install VI Perl API package to use this tool!\n";
+ show_error "Please install VI Perl API package to use this tool!\nPerl error: $@";
exit 1;
}
More information about the cluster-commits
mailing list