From b19563441935886e88c9e0e681a2a69caa836bbc Mon Sep 17 00:00:00 2001
From: Aleksei Burlakov <aburlakov@suse.com>
Date: Wed, 4 Sep 2024 15:56:00 +0200
Subject: [PATCH 1/2] Fix: use ocf:heartbeat:Dummy instead of
ocf:heartbeat:anything
* ocf:heartbeat:anything is obsolete and doesn't exist anymore.
* deleting a running resource might take longer
---
e2e_test/hawk_test_driver.py | 15 +++++----------
e2e_test/hawk_test_ssh.py | 4 ++--
2 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/e2e_test/hawk_test_driver.py b/e2e_test/hawk_test_driver.py
index 105ce75d..63f6fb22 100644
--- a/e2e_test/hawk_test_driver.py
+++ b/e2e_test/hawk_test_driver.py
@@ -31,7 +31,7 @@ class Error:
# XPATH constants
class Xpath:
- ANYTHING_OPT_LIST = '//option[contains(@value, "anything")]'
+ DUMMY_OPT_LIST = '//option[contains(@value, "Dummy")]'
CLICK_OK_SUBMIT = '//*[@id="modal"]/div/div/form/div[3]/input'
CLONE_CHILD = '//select[contains(@data-help-filter, ".row.resource") and contains(@name, "clone[child]")]'
CLONE_DATA_HELP_FILTER = '//a[contains(@data-help-filter, ".clone")]'
@@ -602,13 +602,8 @@ def test_add_primitive(self, primitive):
print(f"ERROR: Couldn't find element [primitive[type]]. Cannot add primitive [{primitive}].")
return False
elem.click()
- self.check_and_click_by_xpath("Couldn't find value [anything] for primitive type",
- [Xpath.ANYTHING_OPT_LIST])
- elem = self.find_element(By.NAME, 'primitive[params][binfile]')
- if not elem:
- print("ERROR: Couldn't find element [primitive[params][binfile]]")
- return False
- elem.send_keys("file")
+ self.check_and_click_by_xpath("Couldn't find value [Dummy] for primitive type",
+ [Xpath.DUMMY_OPT_LIST])
# Set start timeout value in 35s
self.check_and_click_by_xpath("Couldn't find edit button for start operation",
[Xpath.EDIT_START_TIMEOUT, Xpath.MODAL_TIMEOUT])
@@ -642,7 +637,7 @@ def test_add_primitive(self, primitive):
elem.click()
status = self.verify_success()
if status:
- print(f"INFO: Successfully added primitive [{primitive}] of class [ocf:heartbeat:anything]")
+ print(f"INFO: Successfully added primitive [{primitive}] of class [ocf:heartbeat:Dummy]")
else:
print(f"ERROR: Could not create primitive [{primitive}]")
return status
@@ -662,7 +657,7 @@ def remove_rsc(self, name):
self.check_and_click_by_xpath(f"Cannot delete resource [{name}]", [Xpath.HREF_DELETE_FORMAT.format(name)])
time.sleep(2)
self.check_and_click_by_xpath(f"Cannot confirm delete of resource [{name}]", [Xpath.COMMIT_BTN_DANGER])
- time.sleep(2)
+ time.sleep(20)
self.check_and_click_by_xpath("Couldn't find Edit Configuration element", [Xpath.HREF_CONFIG_EDIT])
time.sleep(3)
if not self.test_status:
diff --git a/e2e_test/hawk_test_ssh.py b/e2e_test/hawk_test_ssh.py
index 16e989e5..a6ef8d07 100644
--- a/e2e_test/hawk_test_ssh.py
+++ b/e2e_test/hawk_test_ssh.py
@@ -128,7 +128,7 @@ def verify_primitive(self, primitive, version, results):
False when configuration is not defined in configuration
'''
print(f"TEST: verify_primitive: check primitive [{primitive}] exists")
- matches = [f"{primitive} anything", "binfile=file", "op start timeout=35s",
+ matches = [f"{primitive} Dummy", "op start timeout=35s",
"op monitor timeout=9s interval=13s", "meta target-role=Started"]
if Version(version) < Version('15'):
matches.append("op stop timeout=15s")
@@ -154,7 +154,7 @@ def verify_primitive_removed(self, primitive, results):
False when configuration is not removed
'''
print(f"TEST: verify_primitive_removed: check primitive [{primitive}] is removed")
- if self.check_cluster_conf_ssh("crm resource status | grep ocf::heartbeat:anything", ''):
+ if self.check_cluster_conf_ssh("crm resource status | grep ocf::heartbeat:Dummy", ''):
print("INFO: primitive successfully removed")
self.set_test_status(results, 'verify_primitive_removed', 'passed')
return True
From 42b178931d2f67c612d759487a2ac2a1338ee5cd Mon Sep 17 00:00:00 2001
From: Aleksei Burlakov <aburlakov@suse.com>
Date: Sat, 7 Sep 2024 16:00:36 +0200
Subject: [PATCH 2/2] Fix: decode the resource type from URI
After updating js-routes >= 2.0.0, the rsource type is URI-encoded.
---
hawk/app/controllers/agents_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/hawk/app/controllers/agents_controller.rb b/hawk/app/controllers/agents_controller.rb
index de320b60..230c6cb3 100644
--- a/hawk/app/controllers/agents_controller.rb
+++ b/hawk/app/controllers/agents_controller.rb
@@ -22,6 +22,7 @@ def show
else
@name = params[:id]
end
+ @name = CGI.unescape(@name)
@agent = Util.get_metadata_hash(@name)
if @agent