fencing: Remove unnecessary generated parts and support script

ClusterLabs · Jul 21, 2017 · 8e4706a · 8e4706a
1 parent 3483762
commit 8e4706a
Show file tree

Hide file tree

Showing 57 changed files with 5 additions and 382 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST		= autogen.sh make/fencebuild.mk scripts/fenceparse \
+EXTRA_DIST		= autogen.sh make/fencebuild.mk \
 			  .version make/release.mk \
 			  make/git-version-gen make/gitlog-to-changelog tests
 
@@ -11,8 +11,6 @@ MAINTAINERCLEANFILES	= Makefile.in aclocal.m4 configure depcomp \
 			  make/clusterautoconfig.h.in~ autoscan.log \
 			  configure.scan
 
-noinst_HEADERS		= make/copyright.cf
-
 ACLOCAL_AMFLAGS		= -I m4
 
 SUBDIRS			= fence/agents/lib fence doc

diff --git a/fence/agents/alom/fence_alom.py b/fence/agents/alom/fence_alom.py
@@ -10,12 +10,6 @@
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Sun Advanced Lights Out Manager (ALOM)"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	conn.send_eol("showplatform")
 	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))

diff --git a/fence/agents/amt/fence_amt.py b/fence/agents/amt/fence_amt.py
@@ -7,12 +7,6 @@
 from fencing import *
 from fencing import fail_usage, is_executable, run_command, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Fence agent for Intel AMT"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(_, options):
 	output = amt_run_command(options, create_command(options, "status"))
 	match = re.search('Powerstate:[\\s]*(..)', str(output))

diff --git a/fence/agents/amt_ws/fence_amt_ws.py b/fence/agents/amt_ws/fence_amt_ws.py
@@ -27,13 +27,6 @@
 import pywsman
 from xml.etree import ElementTree
 
-
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Fence agent for Intel AMT (WS)"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 POWER_ON='2'
 POWER_OFF='8'
 POWER_CYCLE='10'

diff --git a/fence/agents/apc/fence_apc.py b/fence/agents/apc/fence_apc.py
@@ -20,12 +20,6 @@
 from fencing import *
 from fencing import fail, fail_usage, EC_STATUS
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New APC Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 2008"
-#END_VERSION_GENERATION
-
 # Fix for connection timed out issue in:
 # https://bugzilla.redhat.com/show_bug.cgi?id=1342584
 TIMEDOUT_DELAY = 0.5

diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py
@@ -20,12 +20,6 @@
 from fencing import fail_usage
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="APC SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # oid defining fence device
 OID_SYS_OBJECT_ID = '.1.3.6.1.2.1.1.2.0'

diff --git a/fence/agents/azure_arm/fence_azure_arm.py b/fence/agents/azure_arm/fence_azure_arm.py
@@ -7,12 +7,6 @@
 from fencing import *
 from fencing import fail, fail_usage, EC_TIMED_OUT, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION=""
-BUILD_DATE=""
-REDHAT_COPYRIGHT="Copyright (C) Red Hat, Inc. 2004-2010 All rights reserved."
-#END_VERSION_GENERATION
-
 def get_nodes_list(compute_client, options):
     result = {}
     if compute_client:

diff --git a/fence/agents/bladecenter/fence_bladecenter.py b/fence/agents/bladecenter/fence_bladecenter.py
@@ -18,12 +18,6 @@
 from fencing import *
 from fencing import fail, EC_STATUS, EC_GENERIC_ERROR
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New Bladecenter Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 2008"
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	node_cmd = r"system:blade\[" + options["--plug"] + r"\]>"
 

diff --git a/fence/agents/brocade/fence_brocade.py b/fence/agents/brocade/fence_brocade.py
@@ -6,12 +6,6 @@
 from fencing import *
 from fencing import fail, EC_STATUS
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New Brocade Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 20013"
-#END_VERSION_GENERATION
-
 def set_power_status(conn, options):
 	action = {
 		'on' : "portCfgPersistentEnable",

diff --git a/fence/agents/cisco_mds/fence_cisco_mds.py b/fence/agents/cisco_mds/fence_cisco_mds.py
@@ -13,12 +13,6 @@
 from fencing import fail_usage, array_to_dict
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Cisco MDS 9xxx SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # Cisco admin status
 PORT_ADMIN_STATUS_OID = ".1.3.6.1.2.1.75.1.2.2.1.1"

diff --git a/fence/agents/cisco_ucs/fence_cisco_ucs.py b/fence/agents/cisco_ucs/fence_cisco_ucs.py
@@ -8,12 +8,6 @@
 from fencing import *
 from fencing import fail, EC_STATUS, EC_LOGIN_DENIED, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New Cisco UCS Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 2008"
-#END_VERSION_GENERATION
-
 RE_COOKIE = re.compile("<aaaLogin .* outCookie=\"(.*?)\"", re.IGNORECASE)
 RE_STATUS = re.compile("<lsPower .*? state=\"(.*?)\"", re.IGNORECASE)
 RE_GET_DN = re.compile(" dn=\"(.*?)\"", re.IGNORECASE)

diff --git a/fence/agents/compute/fence_compute.py b/fence/agents/compute/fence_compute.py
@@ -10,12 +10,6 @@
 from fencing import *
 from fencing import fail_usage, is_executable, run_command, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="4.0.11"
-BUILD_DATE="(built Wed Nov 12 06:33:38 EST 2014)"
-REDHAT_COPYRIGHT="Copyright (C) Red Hat, Inc. 2004-2010 All rights reserved."
-#END_VERSION_GENERATION
-
 override_status = ""
 nova = None
 

diff --git a/fence/agents/docker/fence_docker.py b/fence/agents/docker/fence_docker.py
@@ -10,12 +10,6 @@
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import fail_usage, all_opt, fence_action, atexit_handler, check_input, process_input, show_docs, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION = ""
-REDHAT_COPYRIGHT = ""
-BUILD_DATE = ""
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	del conn
 	status = send_cmd(options, "containers/%s/json" % options["--plug"])

diff --git a/fence/agents/drac/fence_drac.py b/fence/agents/drac/fence_drac.py
@@ -5,12 +5,6 @@
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	conn.send_eol("getmodinfo")
 	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))

diff --git a/fence/agents/drac5/fence_drac5.py b/fence/agents/drac5/fence_drac5.py
@@ -18,12 +18,6 @@
 from fencing import *
 from fencing import fail_usage
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New Drac5 Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 2008"
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	if options["--drac-version"] == "DRAC MC":
 		(_, status) = get_list_devices(conn, options)[options["--plug"]]

diff --git a/fence/agents/dummy/fence_dummy.py b/fence/agents/dummy/fence_dummy.py
@@ -8,12 +8,6 @@
 from fencing import *
 from fencing import fail_usage, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New Dummy Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 plug_status = "on"
 
 def get_power_status_file(conn, options):

diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py
@@ -14,12 +14,6 @@
 from fencing import fail_usage
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Eaton SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # oid defining fence device
 OID_SYS_OBJECT_ID = '.1.3.6.1.2.1.1.2.0'

diff --git a/fence/agents/emerson/fence_emerson.py b/fence/agents/emerson/fence_emerson.py
@@ -6,12 +6,6 @@
 from fencing import *
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Emerson SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 STATUSES_OID = ".1.3.6.1.4.1.476.1.42.3.8.50.20.1.95"
 CONTROL_OID = ".1.3.6.1.4.1.476.1.42.3.8.50.20.1.100"

diff --git a/fence/agents/eps/fence_eps.py b/fence/agents/eps/fence_eps.py
@@ -16,12 +16,6 @@
 else:
 	import httplib
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="ePowerSwitch 8M+ (eps)"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 # Run command on EPS device.
 # @param options Device options
 # @param params HTTP GET parameters (without ?)

diff --git a/fence/agents/hds_cb/fence_hds_cb.py b/fence/agents/hds_cb/fence_hds_cb.py
@@ -15,12 +15,6 @@
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New Compute Blade 2000 Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="November, 2012"
-#END_VERSION_GENERATION
-
 RE_STATUS_LINE = r"^([0-9]+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+).*$"
 
 def get_power_status(conn, options):

diff --git a/fence/agents/hpblade/fence_hpblade.py b/fence/agents/hpblade/fence_hpblade.py
@@ -14,12 +14,6 @@
 from fencing import *
 from fencing import fail, EC_STATUS
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="4.0.11-HP"
-BUILD_DATE="(built Mon Mar 30 08:31:24 EDT 2015)"
-REDHAT_COPYRIGHT="Copyright (C) Red Hat, Inc. 2004-2010 All rights reserved."
-#END_VERSION_GENERATION
-
 def get_enclosure_type(conn, options):
 	conn.send_eol("show enclosure info")
 	conn.log_expect(options, options["--command-prompt"], int(options["--shell-timeout"]))

diff --git a/fence/agents/ibmblade/fence_ibmblade.py b/fence/agents/ibmblade/fence_ibmblade.py
@@ -6,12 +6,6 @@
 from fencing import *
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="IBM Blade SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # From fence_ibmblade.pl
 STATUSES_OID = ".1.3.6.1.4.1.2.3.51.2.22.1.5.1.1.4" # remoteControlBladePowerState

diff --git a/fence/agents/ifmib/fence_ifmib.py b/fence/agents/ifmib/fence_ifmib.py
@@ -15,12 +15,6 @@
 from fencing import fail_usage, array_to_dict
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="IF:MIB SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # IF-MIB trees for alias, status and port
 ALIASES_OID = ".1.3.6.1.2.1.31.1.1.1.18"

diff --git a/fence/agents/ilo/fence_ilo.py b/fence/agents/ilo/fence_ilo.py
@@ -18,12 +18,6 @@
 from fencing import *
 from fencing import fail, EC_LOGIN_DENIED
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="New ILO Agent - test release on steroids"
-REDHAT_COPYRIGHT=""
-BUILD_DATE="March, 2008"
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	conn.send("<LOGIN USER_LOGIN = " + quoteattr(options["--username"]) + \
 		" PASSWORD = " + quoteattr(options["--password"]) + ">\r\n")

diff --git a/fence/agents/ilo_moonshot/fence_ilo_moonshot.py b/fence/agents/ilo_moonshot/fence_ilo_moonshot.py
@@ -6,12 +6,6 @@
 from fencing import *
 from fencing import fail, EC_STATUS
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	conn.send_eol("show node list")
 	conn.log_expect(options["--command-prompt"], int(options["--shell-timeout"]))

diff --git a/fence/agents/ilo_mp/fence_ilo_mp.py b/fence/agents/ilo_mp/fence_ilo_mp.py
@@ -5,12 +5,6 @@
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	conn.send_eol("show /system1")
 

diff --git a/fence/agents/ilo_ssh/fence_ilo_ssh.py b/fence/agents/ilo_ssh/fence_ilo_ssh.py
@@ -5,12 +5,6 @@
 sys.path.append("@FENCEAGENTSLIBDIR@")
 from fencing import *
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(conn, options):
 	conn.send_eol("show /system1")
 

diff --git a/fence/agents/intelmodular/fence_intelmodular.py b/fence/agents/intelmodular/fence_intelmodular.py
@@ -17,12 +17,6 @@
 from fencing import *
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="Intel Modular SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # From INTELCORPORATION-MULTI-FLEX-SERVER-BLADES-MIB.my that ships with
 # firmware updates

diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py
@@ -13,12 +13,6 @@
 from fencing import fail_usage
 from fencing_snmp import FencingSnmp
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION="IBM iPDU SNMP fence agent"
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 ### CONSTANTS ###
 # oid defining fence device
 OID_SYS_OBJECT_ID = '.1.3.6.1.2.1.1.2.0'

diff --git a/fence/agents/ipmilan/fence_ipmilan.py b/fence/agents/ipmilan/fence_ipmilan.py
@@ -7,12 +7,6 @@
 from fencing import *
 from fencing import fail_usage, is_executable, run_command, run_delay
 
-#BEGIN_VERSION_GENERATION
-RELEASE_VERSION=""
-REDHAT_COPYRIGHT=""
-BUILD_DATE=""
-#END_VERSION_GENERATION
-
 def get_power_status(_, options):
 	output = _run_command(options, "status")
 	match = re.search('[Cc]hassis [Pp]ower is [\\s]*([a-zA-Z]{2,3})', str(output))