Attachment 591829 Details for Bug 800650 – Proposed patch

[patch] Proposed patch

fence-symlink.patch (text/plain), 4.22 KB, created by Marek Grac on 2012-06-14 13:03:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marek Grac

Created: 2012-06-14 13:03:45 UTC

Size: 4.22 KB

patch

obsolete

>diff --git a/fence/agents/ilo/Makefile.am b/fence/agents/ilo/Makefile.am
>index 7b44f59..33b04e9 100644
>--- a/fence/agents/ilo/Makefile.am
>+++ b/fence/agents/ilo/Makefile.am
>@@ -2,13 +2,19 @@ MAINTAINERCLEANFILES	= Makefile.in
> 
> TARGET			= fence_ilo
> 
>+SYMTARGET		= fence_ilo2
>+
> SRC			= $(TARGET).py
> 
> EXTRA_DIST		= $(SRC)
> 
> sbin_SCRIPTS		= $(TARGET)
> 
>-man_MANS		= $(TARGET).8
>+man_MANS		= $(TARGET).8 $(SYMTARGET).8
>+
>+$(SYMTARGET): $(TARGET)
>+	ln -sf $^ $@
>+
> 
> include $(top_srcdir)/make/fencebuild.mk
> include $(top_srcdir)/make/fenceman.mk
>diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
>index f70dc9c..d4e34df 100644
>--- a/fence/agents/ilo/fence_ilo.py
>+++ b/fence/agents/ilo/fence_ilo.py
>@@ -82,6 +82,7 @@ The agent opens an SSL connection to the iLO card. Once the SSL \
> connection is established, the agent is able to communicate with \
> the iLO card through an XML stream."
> 	docs["vendorurl"] = "http://www.hp.com"
>+	docs["symlink"] = [("fence_ilo2", "Fence agent for HP iLO2")]
> 	show_docs(options, docs)
> 
> 	##
>diff --git a/fence/agents/ipmilan/Makefile.am b/fence/agents/ipmilan/Makefile.am
>index f237f92..26eae6d 100644
>--- a/fence/agents/ipmilan/Makefile.am
>+++ b/fence/agents/ipmilan/Makefile.am
>@@ -2,15 +2,20 @@ MAINTAINERCLEANFILES	= Makefile.in
> 
> TARGET			= fence_ipmilan
> 
>+SYMTARGET		= fence_ilo3
>+
> sbin_PROGRAMS		= $(TARGET)
> 
> noinst_HEADERS		= expect.h
> 
> fence_ipmilan_SOURCES	= expect.c ipmilan.c
> 
>-dist_man_MANS		= $(TARGET).8
>+dist_man_MANS		= $(TARGET).8 $(SYMTARGET).8
>+
>+$(SYMTARGET): $(TARGET)
>+	ln -sf $^ $@
> 
> include $(top_srcdir)/make/fencemanc.mk
> 
> clean-local: clean-man
>-	rm -f $(TARGET)
>+	rm -f $(TARGET) $(SYMTARGET)
>diff --git a/fence/agents/ipmilan/ipmilan.c b/fence/agents/ipmilan/ipmilan.c
>index ef2b582..d1a0530 100644
>--- a/fence/agents/ipmilan/ipmilan.c
>+++ b/fence/agents/ipmilan/ipmilan.c
>@@ -903,6 +903,9 @@ static void print_xml_metadata(char *pname) {
> 
>   printf("%s\n","<?xml version=\"1.0\" ?>");
>   printf("%s%s%s\n","<resource-agent name=\"",pname,"\" shortdesc=\"Fence agent for IPMI over LAN\">");
>+  printf("<symlink name=\"fence_ilo3\" shortdesc=\"Fence agent for HP iLO2\"/>\n");
>+  printf("<symlink name=\"fence_idrac\" shortdesc=\"Fence agent for Dell iDRAC\"/>\n");
>+  printf("<symlink name=\"fence_imm\" shortdesc=\"Fence agent for IBM Integrated Management Module\"/>\n");  
>   printf("<longdesc>\n");
>   printf("fence_ipmilan is an I/O Fencing agent which can be used with "
>          "machines controlled by IPMI. This agent calls support software "
>@@ -967,6 +970,7 @@ main(int argc, char **argv)
> 	int cipher=-1;
> 	int print_final_status=1;
> 	int translated_ret = -1;
>+	char *filename;
> 
> 	memset(ip, 0, sizeof(ip));
> 	memset(authtype, 0, sizeof(authtype));
>@@ -977,6 +981,12 @@ main(int argc, char **argv)
> 	memset(method, 0, sizeof(method));
> 	memset(delay, 0, sizeof(delay));
> 
>+	if (!strcmp(pname, "fence_ilo3")) {
>+		lanplus = 1;
>+		down_sleep = 4;
>+		strncpy(method, "cycle\0", 6);
>+        }
>+
> 	if (argc > 1) {
> 		/*
> 		   Parse command line options if any were specified
>diff --git a/fence/agents/lib/fence2man.xsl b/fence/agents/lib/fence2man.xsl
>index 0fd71be..89baf7f 100644
>--- a/fence/agents/lib/fence2man.xsl
>+++ b/fence/agents/lib/fence2man.xsl
>@@ -33,6 +33,10 @@
> .TH FENCE_AGENT 8 2009-10-20 "<xsl:value-of select="@name"/> (Fence Agent)"
> .SH NAME
> <xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" />
>+<xsl:for-each select="symlink">
>+.P
>+<xsl:value-of select="@name" /> - <xsl:value-of select="@shortdesc" /> (symlink)
>+</xsl:for-each>
> .SH DESCRIPTION
> .P
> <xsl:value-of select="longdesc"/>
>diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
>index a9c287a..cb8ec26 100644
>--- a/fence/agents/lib/fencing.py.py
>+++ b/fence/agents/lib/fencing.py.py
>@@ -471,6 +471,9 @@ def metadata(avail_opt, options, docs):
> 
> 	print "<?xml version=\"1.0\" ?>"
> 	print "<resource-agent name=\"" + os.path.basename(sys.argv[0]) + "\" shortdesc=\"" + docs["shortdesc"] + "\" >"
>+	if "symlink" in docs:
>+		for (symlink,desc) in docs["symlink"]:
>+			print "<symlink name=\"" + symlink + "\" shortdesc=\"" + desc + "\"/>"
> 	print "<longdesc>" + docs["longdesc"] + "</longdesc>"
> 	if docs.has_key("vendorurl"):
> 		print "<vendor-url>" + docs["vendorurl"] + "</vendor-url>"

Actions: View | Diff

Attachments on bug 800650: 591829