fence-agents/SOURCES/bz1709780-fence_rhevm-RHEV-v4-API-support.patch

From a4e8b77ac51a0e4a6de489823ee1be47cbc7eb18 Mon Sep 17 00:00:00 2001
From: Oyvind Albrigtsen <oalbrigt@redhat.com>
Date: Thu, 9 May 2019 12:09:48 +0200
Subject: [PATCH] fence_rhevm: add RHEV v4 API support and auto-detection

---
 agents/rhevm/fence_rhevm.py         | 44 +++++++++++++++++++++++------
 tests/data/metadata/fence_rhevm.xml |  7 ++++-
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/agents/rhevm/fence_rhevm.py b/agents/rhevm/fence_rhevm.py
index a1cdaf605..6012c4239 100644
--- a/agents/rhevm/fence_rhevm.py
+++ b/agents/rhevm/fence_rhevm.py
@@ -9,7 +9,8 @@
 from fencing import fail, EC_FETCH_VM_UUID, run_delay
 
 RE_GET_ID = re.compile("<vm( .*)? id=\"(.*?)\"", re.IGNORECASE)
-RE_STATUS = re.compile("<state>(.*?)</state>", re.IGNORECASE)
+RE_STATUS = re.compile("<status>(.*?)</status>", re.IGNORECASE)
+RE_STATE = re.compile("<state>(.*?)</state>", re.IGNORECASE)
 RE_GET_NAME = re.compile("<name>(.*?)</name>", re.IGNORECASE)
 
 def get_power_status(conn, options):
@@ -25,7 +26,10 @@ def get_power_status(conn, options):
 
 	options["id"] = result.group(2)
 
-	result = RE_STATUS.search(res)
+	if tuple(map(int, options["--api-version"].split(".")))[0] > 3:
+		result = RE_STATUS.search(res)
+	else:
+		result = RE_STATE.search(res)
 	if result == None:
 		# We were able to parse ID so output is correct
 		# in some cases it is possible that RHEV-M output does not
@@ -59,7 +63,10 @@ def get_list(conn, options):
 		lines = res.split("<vm ")
 		for i in range(1, len(lines)):
 			name = RE_GET_NAME.search(lines[i]).group(1)
-			status = RE_STATUS.search(lines[i]).group(1)
+			if tuple(map(int, options["--api-version"].split(".")))[0] > 3:
+				status = RE_STATUS.search(lines[i]).group(1)
+			else:
+				status = RE_STATE.search(lines[i]).group(1)
 			outlets[name] = ("", status)
 	except AttributeError:
 		return {}
@@ -69,6 +76,13 @@ def get_list(conn, options):
 	return outlets
 
 def send_command(opt, command, method="GET"):
+	if opt["--api-version"] == "auto":
+		opt["--api-version"] = "4"
+		res = send_command(opt, "")
+		if re.search("<title>Error</title>", res):
+			opt["--api-version"] = "3"
+		logging.debug("auto-detected API version: " + opt["--api-version"])
+
 	## setup correct URL
 	if "--ssl" in opt or "--ssl-secure" in opt or "--ssl-insecure" in opt:
 		url = "https:"
@@ -90,7 +104,7 @@ def send_command(opt, command, method="GET"):
 	web_buffer = io.BytesIO()
 	conn.setopt(pycurl.URL, url.encode("UTF-8"))
 	conn.setopt(pycurl.HTTPHEADER, [
-		"Version: 3",
+		"Version: {}".format(opt["--api-version"]),
 		"Content-type: application/xml",
 		"Accept: application/xml",
 		"Prefer: persistent-auth",
@@ -130,8 +144,9 @@ def send_command(opt, command, method="GET"):
 
 	result = web_buffer.getvalue().decode("UTF-8")
 
-	logging.debug("%s\n", command)
-	logging.debug("%s\n", result)
+	logging.debug("url: %s\n", url)
+	logging.debug("command: %s\n", command)
+	logging.debug("result: %s\n", result)
 
 	return result
 
@@ -151,6 +166,15 @@ def define_new_opts():
 		"required" : "0",
 		"shortdesc" : "Reuse cookies for authentication",
 		"order" : 1}
+	all_opt["api_version"] = {
+		"getopt" : ":",
+		"longopt" : "api-version",
+		"help" : "--api-version                  "
+			"Version of RHEV API (default: auto)",
+		"required" : "0",
+		"order" : 2,
+		"default" : "auto",
+	}
 	all_opt["api_path"] = {
 		"getopt" : ":",
 		"longopt" : "api-path",
@@ -158,20 +182,19 @@ def define_new_opts():
 		"default" : "/ovirt-engine/api",
 		"required" : "0",
 		"shortdesc" : "The path part of the API URL",
-		"order" : 2}
+		"order" : 3}
 	all_opt["disable_http_filter"] = {
 		"getopt" : "",
 		"longopt" : "disable-http-filter",
 		"help" : "--disable-http-filter          Set HTTP Filter header to false",
 		"required" : "0",
 		"shortdesc" : "Set HTTP Filter header to false",
-		"order" : 3}
+		"order" : 4}
 
 
 def main():
 	device_opt = [
 		"ipaddr",
-		"api_path",
 		"login",
 		"passwd",
 		"ssl",
@@ -179,6 +202,8 @@ def main():
 		"web",
 		"port",
 		"use_cookies",
+		"api_version",
+		"api_path",
 		"disable_http_filter",
 	]
 
@@ -186,6 +211,7 @@ def main():
 	define_new_opts()
 
 	all_opt["power_wait"]["default"] = "1"
+	all_opt["shell_timeout"]["default"] = "5"
 
 	options = check_input(device_opt, process_input(device_opt))
 
diff --git a/tests/data/metadata/fence_rhevm.xml b/tests/data/metadata/fence_rhevm.xml
index 6344db79f..c56cf64b6 100644
--- a/tests/data/metadata/fence_rhevm.xml
+++ b/tests/data/metadata/fence_rhevm.xml
@@ -98,6 +98,11 @@
 		<content type="string"  />
 		<shortdesc lang="en">Login name</shortdesc>
 	</parameter>
+	<parameter name="api_version" unique="0" required="0">
+		<getopt mixed="--api-version" />
+		<content type="string" default="auto"  />
+		<shortdesc lang="en">Version of RHEV API (default: auto)</shortdesc>
+	</parameter>
 	<parameter name="api_path" unique="0" required="0">
 		<getopt mixed="--api-path=[path]" />
 		<shortdesc lang="en">The path part of the API URL</shortdesc>
@@ -164,7 +169,7 @@
 	</parameter>
 	<parameter name="shell_timeout" unique="0" required="0">
 		<getopt mixed="--shell-timeout=[seconds]" />
-		<content type="second" default="3"  />
+		<content type="second" default="5"  />
 		<shortdesc lang="en">Wait X seconds for cmd prompt after issuing command</shortdesc>
 	</parameter>
 	<parameter name="retry_on" unique="0" required="0">