From mboxrd@z Thu Jan  1 00:00:00 1970
From: mgrac@sourceware.org <mgrac@sourceware.org>
Date: 28 Mar 2008 17:26:32 -0000
Subject: [Cluster-devel] Cluster Project branch, master,
	updated. gfs-kernel_0_1_22-105-g9aa8f60
Message-ID: <20080328172632.15209.qmail@sourceware.org>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cluster Project".

http://sources.redhat.com/git/gitweb.cgi?p=cluster.git;a=commitdiff;h=9aa8f60e85331a41af9b54615696fff75a77f643

The branch, master has been updated
       via  9aa8f60e85331a41af9b54615696fff75a77f643 (commit)
      from  4a91131c548a5127431255f47ad96889cb1f4d07 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9aa8f60e85331a41af9b54615696fff75a77f643
Author: Marek 'marx' Grac <mgrac@redhat.com>
Date:   Fri Mar 28 18:20:06 2008 +0100

    fence/agents:	Add obsolete options
    
    Added obsolete/dual options like hostname/ippaddr, action/option. These
    options are either translated to new or they are not used anymore/yet in
    new agents (eg. version of firmware).

-----------------------------------------------------------------------

Summary of changes:
 fence/agents/apc/apc.py                 |    2 +-
 fence/agents/bladecenter/bladecenter.py |    2 +-
 fence/agents/drac/drac5.py              |    3 +-
 fence/agents/ilo/ilo.py                 |    2 +-
 fence/agents/lib/fencing.py             |   40 +++++++++++++++++++++++++++---
 fence/agents/wti/wti.py                 |    2 +-
 6 files changed, 42 insertions(+), 9 deletions(-)

diff --git a/fence/agents/apc/apc.py b/fence/agents/apc/apc.py
index d502d5a..bcea997 100755
--- a/fence/agents/apc/apc.py
+++ b/fence/agents/apc/apc.py
@@ -68,7 +68,7 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"secure", "port" ]
+			"secure", "port", "test" ]
 
 	options = check_input(device_opt, process_input(device_opt))
 
diff --git a/fence/agents/bladecenter/bladecenter.py b/fence/agents/bladecenter/bladecenter.py
index 17b1a8e..cbc7daa 100755
--- a/fence/agents/bladecenter/bladecenter.py
+++ b/fence/agents/bladecenter/bladecenter.py
@@ -58,7 +58,7 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"cmd_prompt", "secure", "plug_no" ]
+			"cmd_prompt", "secure", "port" ]
 
 	options = check_input(device_opt, process_input(device_opt))
 
diff --git a/fence/agents/drac/drac5.py b/fence/agents/drac/drac5.py
index d967b64..63012fc 100755
--- a/fence/agents/drac/drac5.py
+++ b/fence/agents/drac/drac5.py
@@ -46,7 +46,8 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"cmd_prompt", "secure" ]
+			"cmd_prompt", "secure",
+			"drac_version", "module_name" ]
 
 	options = check_input(device_opt, process_input(device_opt))
 
diff --git a/fence/agents/ilo/ilo.py b/fence/agents/ilo/ilo.py
index 761501e..1f3e330 100755
--- a/fence/agents/ilo/ilo.py
+++ b/fence/agents/ilo/ilo.py
@@ -45,7 +45,7 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"secure" ]
+			"secure", "ribcl" ]
 
 	options = check_input(device_opt, process_input(device_opt))
 
diff --git a/fence/agents/lib/fencing.py b/fence/agents/lib/fencing.py
index f0fe163..39d1285 100644
--- a/fence/agents/lib/fencing.py
+++ b/fence/agents/lib/fencing.py
@@ -49,7 +49,7 @@ all_opt = {
 		"order" : 1 },
 	"action" : {
 		"getopt" : "o:",
-		"help" : "-o <action>    Action: reboot (default), off or on",
+		"help" : "-o <action>    Action: status, reboot (default), off or on",
 		"order" : 1 },
 	"ipaddr" : {
 		"getopt" : "a:",
@@ -71,7 +71,7 @@ all_opt = {
 		"getopt" : "S:",
 		"help" : "-S <script>    Script to run to retrieve password",
 		"order" : 1 },
-	"modulename" : {
+	"module_name" : {
 		"getopt" : "m:",
 		"help" : "-m <module>    DRAC/MC module name",
 		"order" : 1 },
@@ -79,6 +79,10 @@ all_opt = {
 		"getopt" : "d:",
 		"help" : "-D <version>   Force DRAC version to use",
 		"order" : 1 },
+	"ribcl" : {
+		"getopt" : "r:",
+		"help" : "-r <version>   Force ribcl version to use",
+		"order" : 1 },
 	"cmd_prompt" : {
 		"getopt" : "c:",
 		"help" : "-c <prompt>    Force command prompt",
@@ -89,8 +93,13 @@ all_opt = {
 		"order" : 1 },
 	"port" : {
 		"getopt" : "n:",
-		"help" : "-n             Physical plug number on device",
-		"order" : 1 }
+		"help" : "-n <id>        Physical plug number on device",
+		"order" : 1 },
+	"test" : {
+		"getopt" : "T",
+		"help" : "",
+		"order" : 1,
+		"obsolete" : "use -o status instead" }
 }
 
 class fspawn(pexpect.spawn):
@@ -162,6 +171,16 @@ def process_input(avail_opt):
 			opt, args = getopt.gnu_getopt(sys.argv[1:], getopt_string)
 		except getopt.GetoptError, error:
 			fail_usage("Parse error: " + error.msg)
+
+		## Compatibility Layer
+		#####
+		z = dict(opt)
+		if z.has_key("-T") == 1:
+			z["-o"] = "status"
+
+		opt = z
+		##
+		#####
 	else:
 		opt = { }
 		name = ""
@@ -172,6 +191,19 @@ def process_input(avail_opt):
 			(name, value) = (line + "=").split("=", 1)
 			value = value[:-1]
 
+			## Compatibility Layer
+			######
+			if name == "blade":
+				name = "port"
+			elif name == "option":
+				name = "action"
+			elif name == "fm":
+				name = "port"
+			elif name == "hostname":
+				name = "ipaddr"
+
+			##
+			######
 			if avail_opt.count(name) == 0:
 				fail_usage("Parse error: Unknown option '"+line+"'")
 
diff --git a/fence/agents/wti/wti.py b/fence/agents/wti/wti.py
index ccec9dd..926d347 100755
--- a/fence/agents/wti/wti.py
+++ b/fence/agents/wti/wti.py
@@ -62,7 +62,7 @@ def set_power_status(conn, options):
 def main():
 	device_opt = [  "help", "version", "agent", "quiet", "verbose", "debug",
 			"action", "ipaddr", "login", "passwd", "passwd_script",
-			"cmd_prompt", "secure", "port", "no_login" ]
+			"cmd_prompt", "secure", "port", "no_login", "test" ]
 
 	options = check_input(device_opt, process_input(device_opt))
 


hooks/post-receive
--
Cluster Project