Gitweb:
http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=1204c4...
Commit: 1204c484a089ba337c6d4c9797eafce24a71915a
Parent: dfff684d59a6c427c9bb680f9a26b9b960005486
Author: Marek 'marx' Grac <mgrac(a)redhat.com>
AuthorDate: Wed Feb 13 10:26:18 2013 +0100
Committer: Marek 'marx' Grac <mgrac(a)redhat.com>
CommitterDate: Wed Feb 13 10:26:18 2013 +0100
COMPATIBILITY BREAK: remove --uuid (use standard -n / --plug instead)
when --plug is UUID then it is automatically detected.
---
fence/agents/lib/fencing.py.py | 12 ------------
fence/agents/vmware_soap/fence_vmware_soap.py | 4 ++--
fence/agents/xenapi/fence_xenapi.py | 3 +--
3 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
index 188ee1f..907d654 100644
--- a/fence/agents/lib/fencing.py.py
+++ b/fence/agents/lib/fencing.py.py
@@ -338,13 +338,6 @@ all_opt = {
"required" : "1",
"shortdesc" : "The URL of the XenServer host.",
"order" : 1},
- "uuid" : {
- "getopt" : "U:",
- "longopt" : "uuid",
- "help" : "-U, --uuid UUID of the VM to fence",
- "required" : "0",
- "shortdesc" : "The UUID of the virtual machine to fence.",
- "order" : 1},
"sudo" : {
"getopt" : "d",
"longopt" : "use-sudo",
@@ -646,11 +639,6 @@ def check_input(device_opt, opt):
if options["--action"] == "disable":
options["--action"] = "off"
- # UUID is now only alias for --plug; because we can detect it automatically
- if options.has_key("--uuid"):
- options["--plug"] == options["--uuid"]
- del options["--uuid"]
-
## automatic detection and set of valid UUID from --plug
try:
options["--uuid"] = str(uuid.UUID(options["--plug"]))
diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py
b/fence/agents/vmware_soap/fence_vmware_soap.py
index 3c08eeb..aeafa26 100644
--- a/fence/agents/vmware_soap/fence_vmware_soap.py
+++ b/fence/agents/vmware_soap/fence_vmware_soap.py
@@ -156,7 +156,7 @@ def set_power_status(conn, options):
conn.service.PowerOffVM_Task(mo_machine)
def main():
- device_opt = [ "ipaddr", "login", "passwd",
"ssl", "port", "uuid" ]
+ device_opt = [ "ipaddr", "login", "passwd",
"ssl", "port" ]
atexit.register(atexit_handler)
@@ -174,7 +174,7 @@ that have SOAP API v4.1+. \
Name of virtual machine (-n / port) has to be used in inventory path \
format (e.g. /datacenter/vm/Discovered virtual machine/myMachine). \
In the cases when name of yours VM is unique you can use it instead. \
-Alternatively you can always use UUID (-U / uuid) to access virtual machine."
+Alternatively you can always use UUID to access virtual machine."
docs["vendorurl"] = "http://www.vmware.com"
show_docs(options, docs)
diff --git a/fence/agents/xenapi/fence_xenapi.py b/fence/agents/xenapi/fence_xenapi.py
index 25e6056..de42c6c 100644
--- a/fence/agents/xenapi/fence_xenapi.py
+++ b/fence/agents/xenapi/fence_xenapi.py
@@ -200,8 +200,7 @@ def return_vm_reference(session, options):
def main():
- device_opt = [ "login", "passwd", "port",
"no_login", "no_password", "session_url",
- "uuid" ]
+ device_opt = [ "login", "passwd", "port",
"no_login", "no_password", "session_url" ]
atexit.register(atexit_handler)