|
 |
658b6c |
From 64e3f3ef4d0abefd2836fe015c87173310b1e130 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Mon, 3 Dec 2018 10:11:15 -0600
|
|
|
658b6c |
Subject: [PATCH 1/8] Add new fence agent for Redfish
|
|
|
658b6c |
|
|
|
658b6c |
- Agent works on all fence devices that implement the Redfish API specification
|
|
|
658b6c |
- Agent programatically finds the Systems Resouce URI if it's not provided
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 151 +++++++++++++++++++++
|
|
|
658b6c |
tests/data/metadata/fence_redfish.xml | 181 ++++++++++++++++++++++++++
|
|
|
658b6c |
2 files changed, 332 insertions(+)
|
|
|
658b6c |
create mode 100644 agents/redfish/fence_redfish.py
|
|
|
658b6c |
create mode 100644 tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
new file mode 100644
|
|
|
658b6c |
index 00000000..df7cf8c2
|
|
|
658b6c |
--- /dev/null
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -0,0 +1,151 @@
|
|
|
658b6c |
+#!@PYTHON@ -tt
|
|
|
658b6c |
+
|
|
|
658b6c |
+# Copyright (c) 2018 Dell Inc. or its subsidiaries. All Rights Reserved.
|
|
|
658b6c |
+
|
|
|
658b6c |
+# Fence agent for devices that support the Redfish API Specification.
|
|
|
658b6c |
+
|
|
|
658b6c |
+import sys
|
|
|
658b6c |
+import re
|
|
|
658b6c |
+import json
|
|
|
658b6c |
+import requests
|
|
|
658b6c |
+import atexit
|
|
|
658b6c |
+sys.path.append("@FENCEAGENTSLIBDIR@")
|
|
|
658b6c |
+
|
|
|
658b6c |
+from requests.packages.urllib3.exceptions import InsecureRequestWarning
|
|
|
658b6c |
+from fencing import *
|
|
|
658b6c |
+from fencing import fail_usage
|
|
|
658b6c |
+
|
|
|
658b6c |
+def get_power_status(conn, options):
|
|
|
658b6c |
+ uri = options["--systems-uri"]
|
|
|
658b6c |
+ response = send_get_request(options, uri)
|
|
|
658b6c |
+ if response['ret'] is False:
|
|
|
658b6c |
+ fail_usage("Couldn't get power information")
|
|
|
658b6c |
+ data = response['data']
|
|
|
658b6c |
+ if data[u'PowerState'].strip() == "On":
|
|
|
658b6c |
+ return "on"
|
|
|
658b6c |
+ else:
|
|
|
658b6c |
+ return "off"
|
|
|
658b6c |
+
|
|
|
658b6c |
+def set_power_status(conn, options):
|
|
|
658b6c |
+ action = {
|
|
|
658b6c |
+ 'on' : "On",
|
|
|
658b6c |
+ 'off': "ForceOff",
|
|
|
658b6c |
+ 'reboot': "GracefulRestart"
|
|
|
658b6c |
+ }[options["--action"]]
|
|
|
658b6c |
+
|
|
|
658b6c |
+ payload = {'ResetType': action}
|
|
|
658b6c |
+ headers = {'content-type': 'application/json'}
|
|
|
658b6c |
+
|
|
|
658b6c |
+ # Search for 'Actions' key and extract URI from it
|
|
|
658b6c |
+ uri = options["--systems-uri"]
|
|
|
658b6c |
+ response = send_get_request(options, uri)
|
|
|
658b6c |
+ if response['ret'] is False:
|
|
|
658b6c |
+ return {'ret': False}
|
|
|
658b6c |
+ data = response['data']
|
|
|
658b6c |
+ uri = data["Actions"]["#ComputerSystem.Reset"]["target"]
|
|
|
658b6c |
+
|
|
|
658b6c |
+ response = send_post_request(options, uri, payload, headers)
|
|
|
658b6c |
+ if response['ret'] is False:
|
|
|
658b6c |
+ fail_usage("Error sending power command")
|
|
|
658b6c |
+ return
|
|
|
658b6c |
+
|
|
|
658b6c |
+def send_get_request(options, uri):
|
|
|
658b6c |
+ full_uri = "https://" + options["--ip"] + uri
|
|
|
658b6c |
+ try:
|
|
|
658b6c |
+ resp = requests.get(full_uri, verify=False,
|
|
|
658b6c |
+ auth=(options["--username"], options["--password"]))
|
|
|
658b6c |
+ data = resp.json()
|
|
|
658b6c |
+ except:
|
|
|
658b6c |
+ return {'ret': False}
|
|
|
658b6c |
+ return {'ret': True, 'data': data}
|
|
|
658b6c |
+
|
|
|
658b6c |
+def send_post_request(options, uri, payload, headers):
|
|
|
658b6c |
+ full_uri = "https://" + options["--ip"] + uri
|
|
|
658b6c |
+ try:
|
|
|
658b6c |
+ requests.post(full_uri, data=json.dumps(payload),
|
|
|
658b6c |
+ headers=headers, verify=False,
|
|
|
658b6c |
+ auth=(options["--username"], options["--password"]))
|
|
|
658b6c |
+ except:
|
|
|
658b6c |
+ return {'ret': False}
|
|
|
658b6c |
+ return {'ret': True}
|
|
|
658b6c |
+
|
|
|
658b6c |
+def find_systems_resource(options):
|
|
|
658b6c |
+ uri = options["--redfish-uri"]
|
|
|
658b6c |
+ response = send_get_request(options, uri)
|
|
|
658b6c |
+ if response['ret'] is False:
|
|
|
658b6c |
+ return {'ret': False}
|
|
|
658b6c |
+ data = response['data']
|
|
|
658b6c |
+
|
|
|
658b6c |
+ if 'Systems' not in data:
|
|
|
658b6c |
+ # Systems resource not found"
|
|
|
658b6c |
+ return {'ret': False}
|
|
|
658b6c |
+ else:
|
|
|
658b6c |
+ uri = data["Systems"]["@odata.id"]
|
|
|
658b6c |
+ response = send_get_request(options, uri)
|
|
|
658b6c |
+ if response['ret'] is False:
|
|
|
658b6c |
+ return {'ret': False}
|
|
|
658b6c |
+ data = response['data']
|
|
|
658b6c |
+
|
|
|
658b6c |
+ # need to be able to handle more than one entry
|
|
|
658b6c |
+ for member in data[u'Members']:
|
|
|
658b6c |
+ system_uri = member[u'@odata.id']
|
|
|
658b6c |
+ return {'ret': True, 'uri': system_uri}
|
|
|
658b6c |
+
|
|
|
658b6c |
+def define_new_opts():
|
|
|
658b6c |
+ all_opt["redfish-uri"] = {
|
|
|
658b6c |
+ "getopt" : ":",
|
|
|
658b6c |
+ "longopt" : "redfish-uri",
|
|
|
658b6c |
+ "help" : "--redfish-uri=[uri] Base or starting Redifsh URI",
|
|
|
658b6c |
+ "required" : "0",
|
|
|
658b6c |
+ "default" : "/redfish/v1",
|
|
|
658b6c |
+ "shortdesc" : "Base or starting Redfish URI",
|
|
|
658b6c |
+ "order": 1
|
|
|
658b6c |
+ }
|
|
|
658b6c |
+ all_opt["systems-uri"] = {
|
|
|
658b6c |
+ "getopt" : ":",
|
|
|
658b6c |
+ "longopt" : "systems-uri",
|
|
|
658b6c |
+ "help" : "--systems-uri=[uri] Redfish Systems resource URI",
|
|
|
658b6c |
+ "required" : "0",
|
|
|
658b6c |
+ "shortdesc" : "Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1",
|
|
|
658b6c |
+ "order": 1
|
|
|
658b6c |
+ }
|
|
|
658b6c |
+
|
|
|
658b6c |
+def main():
|
|
|
658b6c |
+ atexit.register(atexit_handler)
|
|
|
658b6c |
+ device_opt = ["ipaddr", "login", "passwd", "redfish-uri", "systems-uri", "ssl"]
|
|
|
658b6c |
+ define_new_opts()
|
|
|
658b6c |
+
|
|
|
658b6c |
+ opt = process_input(device_opt)
|
|
|
658b6c |
+
|
|
|
658b6c |
+ all_opt["ipport"]["default"] = "443"
|
|
|
658b6c |
+ options = check_input(device_opt, opt)
|
|
|
658b6c |
+
|
|
|
658b6c |
+ docs = {}
|
|
|
658b6c |
+ docs["shortdesc"] = "I/O Fencing agent for Redfish"
|
|
|
658b6c |
+ docs["longdesc"] = "fence_redfish is an I/O Fencing agent which can be used with \
|
|
|
658b6c |
+Out-of-Band controllers that support Redfish APIs. These controllers provide remote \
|
|
|
658b6c |
+access to control power on a server."
|
|
|
658b6c |
+ docs["vendorurl"] = "http://www.dmtf.org"
|
|
|
658b6c |
+ show_docs(options, docs)
|
|
|
658b6c |
+
|
|
|
658b6c |
+ ##
|
|
|
658b6c |
+ ## Operate the fencing device
|
|
|
658b6c |
+ ####
|
|
|
658b6c |
+
|
|
|
658b6c |
+ # Disable insecure-certificate-warning message
|
|
|
658b6c |
+ if "--ssl-insecure" in opt:
|
|
|
658b6c |
+ requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
|
|
|
658b6c |
+
|
|
|
658b6c |
+ if "--systems-uri" not in opt:
|
|
|
658b6c |
+ # Systems URI not provided, find it
|
|
|
658b6c |
+ sysresult = find_systems_resource(options)
|
|
|
658b6c |
+ if sysresult['ret'] is False:
|
|
|
658b6c |
+ sys.exit(1)
|
|
|
658b6c |
+ else:
|
|
|
658b6c |
+ options["--systems-uri"] = sysresult["uri"]
|
|
|
658b6c |
+
|
|
|
658b6c |
+ result = fence_action(None, options, set_power_status, get_power_status, None)
|
|
|
658b6c |
+ sys.exit(result)
|
|
|
658b6c |
+
|
|
|
658b6c |
+if __name__ == "__main__":
|
|
|
658b6c |
+ main()
|
|
|
658b6c |
diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
new file mode 100644
|
|
|
658b6c |
index 00000000..43d447d0
|
|
|
658b6c |
--- /dev/null
|
|
|
658b6c |
+++ b/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
@@ -0,0 +1,181 @@
|
|
|
658b6c |
+
|
|
|
658b6c |
+<resource-agent name="fence_redfish" shortdesc="I/O Fencing agent for Redfish" >
|
|
|
658b6c |
+<longdesc>fence_redfish is an I/O Fencing agent which can be used with Out-of-Band controllers that support Redfish APIs. These controllers provide remote access to control power on a server.</longdesc>
|
|
|
658b6c |
+<vendor-url>http://www.dmtf.org</vendor-url>
|
|
|
658b6c |
+<parameters>
|
|
|
658b6c |
+ <parameter name="ipport" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-u, --ipport=[port]" />
|
|
|
658b6c |
+ <content type="integer" default="443" />
|
|
|
658b6c |
+ <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--ssl-secure" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="systems-uri" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="--systems-uri=[uri]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="action" unique="0" required="1">
|
|
|
658b6c |
+ <getopt mixed="-o, --action=[action]" />
|
|
|
658b6c |
+ <content type="string" default="reboot" />
|
|
|
658b6c |
+ <shortdesc lang="en">Fencing Action</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="inet6_only" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-6, --inet6-only" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ipaddr" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-a, --ip=[ip]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">IP Address or Hostname</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-n, --plug=[ip]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="passwd_script" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-S, --password-script=[script]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Script to retrieve password</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="inet4_only" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-4, --inet4-only" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="passwd" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-p, --password=[password]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Login password or passphrase</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ssl" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-z, --ssl" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">SSL connection</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="redfish-uri" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="--redfish-uri=[uri]" />
|
|
|
658b6c |
+ <content type="string" default="/redfish/v1" />
|
|
|
658b6c |
+ <shortdesc lang="en">Base or starting Redfish URI</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--ssl-insecure" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="login" unique="0" required="1" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-l, --username=[name]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Login Name</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="plug" unique="0" required="0" obsoletes="port">
|
|
|
658b6c |
+ <getopt mixed="-n, --plug=[ip]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="username" unique="0" required="1" obsoletes="login">
|
|
|
658b6c |
+ <getopt mixed="-l, --username=[name]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Login Name</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="redfish_uri" unique="0" required="0" obsoletes="redfish-uri">
|
|
|
658b6c |
+ <getopt mixed="--redfish-uri=[uri]" />
|
|
|
658b6c |
+ <content type="string" default="/redfish/v1" />
|
|
|
658b6c |
+ <shortdesc lang="en">Base or starting Redfish URI</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
|
|
|
658b6c |
+ <getopt mixed="-a, --ip=[ip]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">IP Address or Hostname</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="systems_uri" unique="0" required="0" obsoletes="systems-uri">
|
|
|
658b6c |
+ <getopt mixed="--systems-uri=[uri]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="password" unique="0" required="0" obsoletes="passwd">
|
|
|
658b6c |
+ <getopt mixed="-p, --password=[password]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Login password or passphrase</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
|
|
|
658b6c |
+ <getopt mixed="-S, --password-script=[script]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Script to retrieve password</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="verbose" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-v, --verbose" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Verbose mode</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="debug" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-D, --debug-file=[debugfile]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Write debug information to given file</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="debug_file" unique="0" required="0" obsoletes="debug">
|
|
|
658b6c |
+ <getopt mixed="-D, --debug-file=[debugfile]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Write debug information to given file</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="version" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-V, --version" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Display version information and exit</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="help" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-h, --help" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Display help and exit</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="power_wait" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--power-wait=[seconds]" />
|
|
|
658b6c |
+ <content type="second" default="0" />
|
|
|
658b6c |
+ <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="login_timeout" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--login-timeout=[seconds]" />
|
|
|
658b6c |
+ <content type="second" default="5" />
|
|
|
658b6c |
+ <shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="power_timeout" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--power-timeout=[seconds]" />
|
|
|
658b6c |
+ <content type="second" default="20" />
|
|
|
658b6c |
+ <shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="delay" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--delay=[seconds]" />
|
|
|
658b6c |
+ <content type="second" default="0" />
|
|
|
658b6c |
+ <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="shell_timeout" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--shell-timeout=[seconds]" />
|
|
|
658b6c |
+ <content type="second" default="3" />
|
|
|
658b6c |
+ <shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="port_as_ip" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--port-as-ip" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="retry_on" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--retry-on=[attempts]" />
|
|
|
658b6c |
+ <content type="integer" default="1" />
|
|
|
658b6c |
+ <shortdesc lang="en">Count of attempts to retry power on</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+</parameters>
|
|
|
658b6c |
+<actions>
|
|
|
658b6c |
+ <action name="on" automatic="0"/>
|
|
|
658b6c |
+ <action name="off" />
|
|
|
658b6c |
+ <action name="reboot" />
|
|
|
658b6c |
+ <action name="status" />
|
|
|
658b6c |
+ <action name="monitor" />
|
|
|
658b6c |
+ <action name="metadata" />
|
|
|
658b6c |
+ <action name="validate-all" />
|
|
|
658b6c |
+</actions>
|
|
|
658b6c |
+</resource-agent>
|
|
|
658b6c |
|
|
|
658b6c |
From 6921a34d64d098a7b1f32205e0be434438c36898 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Mon, 3 Dec 2018 10:46:52 -0600
|
|
|
658b6c |
Subject: [PATCH 2/8] Updated fence_redfish.xml with make xml-upload
|
|
|
658b6c |
|
|
|
658b6c |
---
|
|
|
658b6c |
tests/data/metadata/fence_redfish.xml | 148 ++++++++++++++------------
|
|
|
658b6c |
1 file changed, 79 insertions(+), 69 deletions(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
index 43d447d0..a39541e6 100644
|
|
|
658b6c |
--- a/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
+++ b/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
@@ -3,110 +3,115 @@
|
|
|
658b6c |
<longdesc>fence_redfish is an I/O Fencing agent which can be used with Out-of-Band controllers that support Redfish APIs. These controllers provide remote access to control power on a server.</longdesc>
|
|
|
658b6c |
<vendor-url>http://www.dmtf.org</vendor-url>
|
|
|
658b6c |
<parameters>
|
|
|
658b6c |
- <parameter name="ipport" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="-u, --ipport=[port]" />
|
|
|
658b6c |
- <content type="integer" default="443" />
|
|
|
658b6c |
- <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
658b6c |
- </parameter>
|
|
|
658b6c |
- <parameter name="ssl_secure" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="--ssl-secure" />
|
|
|
658b6c |
- <content type="boolean" />
|
|
|
658b6c |
- <shortdesc lang="en">SSL connection with verifying fence device's certificate</shortdesc>
|
|
|
658b6c |
- </parameter>
|
|
|
658b6c |
- <parameter name="systems-uri" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
- <getopt mixed="--systems-uri=[uri]" />
|
|
|
658b6c |
- <content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</shortdesc>
|
|
|
658b6c |
- </parameter>
|
|
|
658b6c |
<parameter name="action" unique="0" required="1">
|
|
|
658b6c |
<getopt mixed="-o, --action=[action]" />
|
|
|
658b6c |
<content type="string" default="reboot" />
|
|
|
658b6c |
- <shortdesc lang="en">Fencing Action</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">Fencing action</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="inet4_only" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-4, --inet4-only" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="inet6_only" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="-6, --inet6-only" />
|
|
|
658b6c |
<content type="boolean" />
|
|
|
658b6c |
<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="ipaddr" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
|
|
|
658b6c |
<getopt mixed="-a, --ip=[ip]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">IP Address or Hostname</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
- <getopt mixed="-n, --plug=[ip]" />
|
|
|
658b6c |
+ <parameter name="ipaddr" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-a, --ip=[ip]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="passwd_script" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
- <getopt mixed="-S, --password-script=[script]" />
|
|
|
658b6c |
- <content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">Script to retrieve password</shortdesc>
|
|
|
658b6c |
+ <parameter name="ipport" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-u, --ipport=[port]" />
|
|
|
658b6c |
+ <content type="integer" default="443" />
|
|
|
658b6c |
+ <shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="inet4_only" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="-4, --inet4-only" />
|
|
|
658b6c |
- <content type="boolean" />
|
|
|
658b6c |
- <shortdesc lang="en">Forces agent to use IPv4 addresses only</shortdesc>
|
|
|
658b6c |
+ <parameter name="login" unique="0" required="1" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-l, --username=[name]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Login name</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="passwd" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
<getopt mixed="-p, --password=[password]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
<shortdesc lang="en">Login password or passphrase</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="ssl" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="-z, --ssl" />
|
|
|
658b6c |
- <content type="boolean" />
|
|
|
658b6c |
- <shortdesc lang="en">SSL connection</shortdesc>
|
|
|
658b6c |
- </parameter>
|
|
|
658b6c |
- <parameter name="redfish-uri" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
- <getopt mixed="--redfish-uri=[uri]" />
|
|
|
658b6c |
- <content type="string" default="/redfish/v1" />
|
|
|
658b6c |
- <shortdesc lang="en">Base or starting Redfish URI</shortdesc>
|
|
|
658b6c |
+ <parameter name="passwd_script" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-S, --password-script=[script]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="--ssl-insecure" />
|
|
|
658b6c |
- <content type="boolean" />
|
|
|
658b6c |
- <shortdesc lang="en">SSL connection without verifying fence device's certificate</shortdesc>
|
|
|
658b6c |
+ <parameter name="password" unique="0" required="0" obsoletes="passwd">
|
|
|
658b6c |
+ <getopt mixed="-p, --password=[password]" />
|
|
|
658b6c |
+ <content type="string" />
|
|
|
658b6c |
+ <shortdesc lang="en">Login password or passphrase</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="login" unique="0" required="1" deprecated="1">
|
|
|
658b6c |
- <getopt mixed="-l, --username=[name]" />
|
|
|
658b6c |
+ <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
|
|
|
658b6c |
+ <getopt mixed="-S, --password-script=[script]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">Login Name</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">Script to run to retrieve password</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="plug" unique="0" required="0" obsoletes="port">
|
|
|
658b6c |
<getopt mixed="-n, --plug=[ip]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="username" unique="0" required="1" obsoletes="login">
|
|
|
658b6c |
- <getopt mixed="-l, --username=[name]" />
|
|
|
658b6c |
+ <parameter name="port" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="-n, --plug=[ip]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">Login Name</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="redfish-uri" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="--redfish-uri=[uri]" />
|
|
|
658b6c |
+ <content type="string" default="/redfish/v1" />
|
|
|
658b6c |
+ <shortdesc lang="en">Base or starting Redfish URI</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="redfish_uri" unique="0" required="0" obsoletes="redfish-uri">
|
|
|
658b6c |
<getopt mixed="--redfish-uri=[uri]" />
|
|
|
658b6c |
<content type="string" default="/redfish/v1" />
|
|
|
658b6c |
<shortdesc lang="en">Base or starting Redfish URI</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
|
|
|
658b6c |
- <getopt mixed="-a, --ip=[ip]" />
|
|
|
658b6c |
+ <parameter name="ssl" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-z, --ssl" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ssl_insecure" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--ssl-insecure" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Use SSL connection without verifying certificate</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="ssl_secure" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--ssl-secure" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
+ <parameter name="systems-uri" unique="0" required="0" deprecated="1">
|
|
|
658b6c |
+ <getopt mixed="--systems-uri=[uri]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">IP Address or Hostname</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="systems_uri" unique="0" required="0" obsoletes="systems-uri">
|
|
|
658b6c |
<getopt mixed="--systems-uri=[uri]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
<shortdesc lang="en">Redfish Systems resource URI, i.e. /redfish/v1/Systems/System.Embedded.1</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="password" unique="0" required="0" obsoletes="passwd">
|
|
|
658b6c |
- <getopt mixed="-p, --password=[password]" />
|
|
|
658b6c |
+ <parameter name="username" unique="0" required="1" obsoletes="login">
|
|
|
658b6c |
+ <getopt mixed="-l, --username=[name]" />
|
|
|
658b6c |
<content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">Login password or passphrase</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">Login name</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
|
|
|
658b6c |
- <getopt mixed="-S, --password-script=[script]" />
|
|
|
658b6c |
- <content type="string" />
|
|
|
658b6c |
- <shortdesc lang="en">Script to retrieve password</shortdesc>
|
|
|
658b6c |
+ <parameter name="quiet" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="-q, --quiet" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="verbose" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="-v, --verbose" />
|
|
|
658b6c |
@@ -133,41 +138,45 @@
|
|
|
658b6c |
<content type="boolean" />
|
|
|
658b6c |
<shortdesc lang="en">Display help and exit</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="power_wait" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="--power-wait=[seconds]" />
|
|
|
658b6c |
+ <parameter name="delay" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--delay=[seconds]" />
|
|
|
658b6c |
<content type="second" default="0" />
|
|
|
658b6c |
- <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="login_timeout" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="--login-timeout=[seconds]" />
|
|
|
658b6c |
<content type="second" default="5" />
|
|
|
658b6c |
<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
+ <parameter name="port_as_ip" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--port-as-ip" />
|
|
|
658b6c |
+ <content type="boolean" />
|
|
|
658b6c |
+ <shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
<parameter name="power_timeout" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="--power-timeout=[seconds]" />
|
|
|
658b6c |
<content type="second" default="20" />
|
|
|
658b6c |
<shortdesc lang="en">Test X seconds for status change after ON/OFF</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="delay" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="--delay=[seconds]" />
|
|
|
658b6c |
+ <parameter name="power_wait" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--power-wait=[seconds]" />
|
|
|
658b6c |
<content type="second" default="0" />
|
|
|
658b6c |
- <shortdesc lang="en">Wait X seconds before fencing is started</shortdesc>
|
|
|
658b6c |
+ <shortdesc lang="en">Wait X seconds after issuing ON/OFF</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="shell_timeout" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="--shell-timeout=[seconds]" />
|
|
|
658b6c |
<content type="second" default="3" />
|
|
|
658b6c |
<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
- <parameter name="port_as_ip" unique="0" required="0">
|
|
|
658b6c |
- <getopt mixed="--port-as-ip" />
|
|
|
658b6c |
- <content type="boolean" />
|
|
|
658b6c |
- <shortdesc lang="en">Make "port/plug" to be an alias to IP address</shortdesc>
|
|
|
658b6c |
- </parameter>
|
|
|
658b6c |
<parameter name="retry_on" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="--retry-on=[attempts]" />
|
|
|
658b6c |
<content type="integer" default="1" />
|
|
|
658b6c |
<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
+ <parameter name="gnutlscli_path" unique="0" required="0">
|
|
|
658b6c |
+ <getopt mixed="--gnutlscli-path=[path]" />
|
|
|
658b6c |
+ <shortdesc lang="en">Path to gnutls-cli binary</shortdesc>
|
|
|
658b6c |
+ </parameter>
|
|
|
658b6c |
</parameters>
|
|
|
658b6c |
<actions>
|
|
|
658b6c |
<action name="on" automatic="0"/>
|
|
|
658b6c |
@@ -176,6 +185,7 @@
|
|
|
658b6c |
<action name="status" />
|
|
|
658b6c |
<action name="monitor" />
|
|
|
658b6c |
<action name="metadata" />
|
|
|
658b6c |
+ <action name="manpage" />
|
|
|
658b6c |
<action name="validate-all" />
|
|
|
658b6c |
</actions>
|
|
|
658b6c |
</resource-agent>
|
|
|
658b6c |
|
|
|
658b6c |
From 755627fadd711848ea256d72f5e75f36f83b4d31 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Mon, 3 Dec 2018 11:55:23 -0600
|
|
|
658b6c |
Subject: [PATCH 3/8] Added run_delay()
|
|
|
658b6c |
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 3 ++-
|
|
|
658b6c |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
index df7cf8c2..0e4a4f68 100644
|
|
|
658b6c |
--- a/agents/redfish/fence_redfish.py
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -13,7 +13,7 @@
|
|
|
658b6c |
|
|
|
658b6c |
from requests.packages.urllib3.exceptions import InsecureRequestWarning
|
|
|
658b6c |
from fencing import *
|
|
|
658b6c |
-from fencing import fail_usage
|
|
|
658b6c |
+from fencing import fail_usage, run_delay
|
|
|
658b6c |
|
|
|
658b6c |
def get_power_status(conn, options):
|
|
|
658b6c |
uri = options["--systems-uri"]
|
|
|
658b6c |
@@ -127,6 +127,7 @@ def main():
|
|
|
658b6c |
access to control power on a server."
|
|
|
658b6c |
docs["vendorurl"] = "http://www.dmtf.org"
|
|
|
658b6c |
show_docs(options, docs)
|
|
|
658b6c |
+ run_delay(options)
|
|
|
658b6c |
|
|
|
658b6c |
##
|
|
|
658b6c |
## Operate the fencing device
|
|
|
658b6c |
|
|
|
658b6c |
From 15fef4c47f391a3f03c714d86c9670ea209dec99 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Tue, 4 Dec 2018 10:56:58 -0600
|
|
|
658b6c |
Subject: [PATCH 4/8] Modify power status check
|
|
|
658b6c |
|
|
|
658b6c |
- Only returns off if PowerState = Off
|
|
|
658b6c |
- Otherwise returns on
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 6 +++---
|
|
|
658b6c |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
index 0e4a4f68..7998fb1c 100644
|
|
|
658b6c |
--- a/agents/redfish/fence_redfish.py
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -21,10 +21,10 @@ def get_power_status(conn, options):
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
fail_usage("Couldn't get power information")
|
|
|
658b6c |
data = response['data']
|
|
|
658b6c |
- if data[u'PowerState'].strip() == "On":
|
|
|
658b6c |
- return "on"
|
|
|
658b6c |
- else:
|
|
|
658b6c |
+ if data[u'PowerState'].strip() == "Off":
|
|
|
658b6c |
return "off"
|
|
|
658b6c |
+ else:
|
|
|
658b6c |
+ return "on"
|
|
|
658b6c |
|
|
|
658b6c |
def set_power_status(conn, options):
|
|
|
658b6c |
action = {
|
|
|
658b6c |
|
|
|
658b6c |
From acf70f4672be65562841227ab0b4cacb87965f44 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Wed, 5 Dec 2018 10:39:32 -0600
|
|
|
658b6c |
Subject: [PATCH 5/8] Changed reboot type to ForceRestart
|
|
|
658b6c |
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 2 +-
|
|
|
658b6c |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
index 7998fb1c..3fe2bfc0 100644
|
|
|
658b6c |
--- a/agents/redfish/fence_redfish.py
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -30,7 +30,7 @@ def set_power_status(conn, options):
|
|
|
658b6c |
action = {
|
|
|
658b6c |
'on' : "On",
|
|
|
658b6c |
'off': "ForceOff",
|
|
|
658b6c |
- 'reboot': "GracefulRestart"
|
|
|
658b6c |
+ 'reboot': "ForceRestart"
|
|
|
658b6c |
}[options["--action"]]
|
|
|
658b6c |
|
|
|
658b6c |
payload = {'ResetType': action}
|
|
|
658b6c |
|
|
|
658b6c |
From 56e3358d45050ac669c099c56873feefa1ecda38 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Wed, 5 Dec 2018 10:54:44 -0600
|
|
|
658b6c |
Subject: [PATCH 6/8] Replaced default port 443 with default ssl enabled option
|
|
|
658b6c |
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 2 +-
|
|
|
658b6c |
tests/data/metadata/fence_redfish.xml | 2 +-
|
|
|
658b6c |
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
index 3fe2bfc0..6a2dbb76 100644
|
|
|
658b6c |
--- a/agents/redfish/fence_redfish.py
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -117,7 +117,7 @@ def main():
|
|
|
658b6c |
|
|
|
658b6c |
opt = process_input(device_opt)
|
|
|
658b6c |
|
|
|
658b6c |
- all_opt["ipport"]["default"] = "443"
|
|
|
658b6c |
+ all_opt["ssl"]["default"] = "1"
|
|
|
658b6c |
options = check_input(device_opt, opt)
|
|
|
658b6c |
|
|
|
658b6c |
docs = {}
|
|
|
658b6c |
diff --git a/tests/data/metadata/fence_redfish.xml b/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
index a39541e6..e1c18584 100644
|
|
|
658b6c |
--- a/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
+++ b/tests/data/metadata/fence_redfish.xml
|
|
|
658b6c |
@@ -80,7 +80,7 @@
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="ssl" unique="0" required="0">
|
|
|
658b6c |
<getopt mixed="-z, --ssl" />
|
|
|
658b6c |
- <content type="boolean" />
|
|
|
658b6c |
+ <content type="boolean" default="1" />
|
|
|
658b6c |
<shortdesc lang="en">Use SSL connection with verifying certificate</shortdesc>
|
|
|
658b6c |
</parameter>
|
|
|
658b6c |
<parameter name="ssl_insecure" unique="0" required="0">
|
|
|
658b6c |
|
|
|
658b6c |
From 5c25a85b22a17d6bbc3dcb47c99b76e3a99a5857 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Wed, 5 Dec 2018 13:29:42 -0600
|
|
|
658b6c |
Subject: [PATCH 7/8] Renamed variable to avoid reusing variable name
|
|
|
658b6c |
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 4 ++--
|
|
|
658b6c |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
index 6a2dbb76..1ea25cd8 100644
|
|
|
658b6c |
--- a/agents/redfish/fence_redfish.py
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -42,9 +42,9 @@ def set_power_status(conn, options):
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
return {'ret': False}
|
|
|
658b6c |
data = response['data']
|
|
|
658b6c |
- uri = data["Actions"]["#ComputerSystem.Reset"]["target"]
|
|
|
658b6c |
+ action_uri = data["Actions"]["#ComputerSystem.Reset"]["target"]
|
|
|
658b6c |
|
|
|
658b6c |
- response = send_post_request(options, uri, payload, headers)
|
|
|
658b6c |
+ response = send_post_request(options, action_uri, payload, headers)
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
fail_usage("Error sending power command")
|
|
|
658b6c |
return
|
|
|
658b6c |
|
|
|
658b6c |
From 7dce8b1e22d57fec0d34e91a99fab9d8a06f1303 Mon Sep 17 00:00:00 2001
|
|
|
658b6c |
From: Jose Delarosa <jose.delarosa@dell.com>
|
|
|
658b6c |
Date: Thu, 6 Dec 2018 10:33:06 -0600
|
|
|
658b6c |
Subject: [PATCH 8/8] Removed unnecessary variable assignments to simplify code
|
|
|
658b6c |
|
|
|
658b6c |
---
|
|
|
658b6c |
agents/redfish/fence_redfish.py | 12 ++++--------
|
|
|
658b6c |
1 file changed, 4 insertions(+), 8 deletions(-)
|
|
|
658b6c |
|
|
|
658b6c |
diff --git a/agents/redfish/fence_redfish.py b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
index 1ea25cd8..67ef67ab 100644
|
|
|
658b6c |
--- a/agents/redfish/fence_redfish.py
|
|
|
658b6c |
+++ b/agents/redfish/fence_redfish.py
|
|
|
658b6c |
@@ -16,8 +16,7 @@
|
|
|
658b6c |
from fencing import fail_usage, run_delay
|
|
|
658b6c |
|
|
|
658b6c |
def get_power_status(conn, options):
|
|
|
658b6c |
- uri = options["--systems-uri"]
|
|
|
658b6c |
- response = send_get_request(options, uri)
|
|
|
658b6c |
+ response = send_get_request(options, options["--systems-uri"])
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
fail_usage("Couldn't get power information")
|
|
|
658b6c |
data = response['data']
|
|
|
658b6c |
@@ -37,8 +36,7 @@ def set_power_status(conn, options):
|
|
|
658b6c |
headers = {'content-type': 'application/json'}
|
|
|
658b6c |
|
|
|
658b6c |
# Search for 'Actions' key and extract URI from it
|
|
|
658b6c |
- uri = options["--systems-uri"]
|
|
|
658b6c |
- response = send_get_request(options, uri)
|
|
|
658b6c |
+ response = send_get_request(options, options["--systems-uri"])
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
return {'ret': False}
|
|
|
658b6c |
data = response['data']
|
|
|
658b6c |
@@ -70,8 +68,7 @@ def send_post_request(options, uri, payload, headers):
|
|
|
658b6c |
return {'ret': True}
|
|
|
658b6c |
|
|
|
658b6c |
def find_systems_resource(options):
|
|
|
658b6c |
- uri = options["--redfish-uri"]
|
|
|
658b6c |
- response = send_get_request(options, uri)
|
|
|
658b6c |
+ response = send_get_request(options, options["--redfish-uri"])
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
return {'ret': False}
|
|
|
658b6c |
data = response['data']
|
|
|
658b6c |
@@ -80,8 +77,7 @@ def find_systems_resource(options):
|
|
|
658b6c |
# Systems resource not found"
|
|
|
658b6c |
return {'ret': False}
|
|
|
658b6c |
else:
|
|
|
658b6c |
- uri = data["Systems"]["@odata.id"]
|
|
|
658b6c |
- response = send_get_request(options, uri)
|
|
|
658b6c |
+ response = send_get_request(options, data["Systems"]["@odata.id"])
|
|
|
658b6c |
if response['ret'] is False:
|
|
|
658b6c |
return {'ret': False}
|
|
|
658b6c |
data = response['data']
|