From cf0e1816b54bd00930bc8489a5055851ea2b11b1 Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com>
Date: Thu, 19 May 2022 16:53:36 +0200
Subject: [PATCH] Resolves: rhbz#1301204 rhbz#2024522 rhbz#2026725 rhbz#2029844
 rhbz#2039884 rhbz#2053177 rhbz#2054671 rhbz#2058243 rhbz#2058246 rhbz#2058247
 rhbz#2058251 rhbz#2058252 rhbz#2059142 rhbz#2059145 rhbz#2059148 rhbz#2059149
 rhbz#2059501 rhbz#2064818 rhbz#2068457 rhbz#2076585

- Rebased to latest upstream sources (see CHANGELOG.md)
- Updated pcs-web-ui
- Updated bundled rubygems: backports, daemons, ethon ffi, ruby2_keywords, thin
- Stopped bundling rubygem-rexml (use distribution package instead)
---
 .gitignore                                    |    9 +
 ...inbit-drbd-agent-pass-OCF-validation.patch |   41 -
 ...owing-to-clone-a-group-with-a-stonit.patch |   84 --
 ...e-fixes-in-pcs-resource-move-command.patch | 1056 -----------------
 ...md-when-unable-to-get-agent-metadata.patch |   73 --
 ...473-01-fix-enabling-corosync-qdevice.patch |   25 -
 ...ecking-of-scsi-devices-to-be-removed.patch |   86 --
 bz2040420-01-fix-creating-empty-cib.patch     |   94 --
 ...end-parameter-all-in-cluster-destroy.patch |   23 -
 bz20486401-01-Fix-snmp-client.patch           |   25 -
 ...t-cluster-setup-with-udp-u-transport.patch |   10 +-
 ...resource-roles-in-colocation-constra.patch |   25 -
 pcs.spec                                      |   54 +-
 simplify-ternar-expression.patch              |   26 -
 sources                                       |   19 +-
 15 files changed, 46 insertions(+), 1604 deletions(-)
 delete mode 100644 Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
 delete mode 100644 bz1811072-01-revert-of-disallowing-to-clone-a-group-with-a-stonit.patch
 delete mode 100644 bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
 delete mode 100644 bz2019836-01-fix-rsc-update-cmd-when-unable-to-get-agent-metadata.patch
 delete mode 100644 bz2032473-01-fix-enabling-corosync-qdevice.patch
 delete mode 100644 bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
 delete mode 100644 bz2040420-01-fix-creating-empty-cib.patch
 delete mode 100644 bz2044409-01-fix-backend-parameter-all-in-cluster-destroy.patch
 delete mode 100644 bz20486401-01-Fix-snmp-client.patch
 delete mode 100644 fix-translating-resource-roles-in-colocation-constra.patch
 delete mode 100644 simplify-ternar-expression.patch

diff --git a/.gitignore b/.gitignore
index b75385b..7b68e61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -155,3 +155,12 @@
 /pcs-web-ui-node-modules-0.1.12.tar.xz
 /sinatra-2.2.0.gem
 /rack-protection-2.2.0.gem
+/backports-3.23.0.gem
+/daemons-1.4.1.gem
+/ethon-0.15.0.gem
+/ffi-1.15.5.gem
+/ruby2_keywords-0.0.5.gem
+/thin-1.8.1.gem
+/pcs-0.11.2.44-9da7.tar.gz
+/pcs-web-ui-node-modules-0.1.13.tar.xz
+/pcs-web-ui-0.1.13.tar.gz
diff --git a/Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch b/Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
deleted file mode 100644
index 15a7ab4..0000000
--- a/Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e58f7897d561cff2f9c257933acdb36d57cc130c Mon Sep 17 00:00:00 2001
-From: Tomas Jelinek <tojeline@redhat.com>
-Date: Tue, 4 Jan 2022 12:56:56 +0100
-Subject: [PATCH 2/4] Make ocf:linbit:drbd agent pass OCF validation
-
----
- data/ocf-1.0.rng | 18 ++++++++----------
- 1 file changed, 8 insertions(+), 10 deletions(-)
-
-diff --git a/data/ocf-1.0.rng b/data/ocf-1.0.rng
-index 36ba4611..1e14a83b 100644
---- a/data/ocf-1.0.rng
-+++ b/data/ocf-1.0.rng
-@@ -169,16 +169,14 @@ RNGs. Thank you.
-       <optional>
-         <element name="content">
-           <choice>
--            <attribute name="type">
--              <choice>
--                <value>boolean</value>
--                <value>string</value>
--                <value>integer</value>
--                <value>second</value><!-- used by fence agents -->
--                <value>int</value><!-- used by fence agents intead of integer -->
--                <value>time</value><!-- used by pacemaker metadata -->
--              </choice>
--            </attribute>
-+            <!--
-+              OCF 1.0 allows values: boolean, integer, string. Agents, however,
-+              quite often use other values: int (fence agents), numeric
-+              (ocf:linbit:drbd), second (fence agents), time (pacemaker
-+              metadata). Since pcs doesn't actually care about the type, we
-+              allow any type to keep compatibility with existing agents.
-+            -->
-+            <attribute name="type" />
-             <group>
-               <!--
-                 used by fence agents and processed by pcs even though it is not
--- 
-2.31.1
-
diff --git a/bz1811072-01-revert-of-disallowing-to-clone-a-group-with-a-stonit.patch b/bz1811072-01-revert-of-disallowing-to-clone-a-group-with-a-stonit.patch
deleted file mode 100644
index 6a5ba20..0000000
--- a/bz1811072-01-revert-of-disallowing-to-clone-a-group-with-a-stonit.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From e1573865543a3d59930b315a40ecd9b7a807e1c1 Mon Sep 17 00:00:00 2001
-From: Ondrej Mular <omular@redhat.com>
-Date: Mon, 13 Dec 2021 12:48:26 +0100
-Subject: [PATCH 3/3] revert of disallowing to clone a group with a stonith
- inside
-
-Originally, this was not fixed properly (it was possible to add a stonith
-into a cloned group), therefore to stay consistent, this change is being
-reverted. It will be fixed in the future by not allowing stonith to be
-placed into a group.
----
- pcs/resource.py                                  | 16 ++--------------
- .../tier1/cib_resource/test_clone_unclone.py     |  8 ++------
- 2 files changed, 4 insertions(+), 20 deletions(-)
-
-diff --git a/pcs/resource.py b/pcs/resource.py
-index 928477b2..c7cf4c7e 100644
---- a/pcs/resource.py
-+++ b/pcs/resource.py
-@@ -1697,7 +1697,7 @@ def resource_clone_create(
-     ):
-         element.parentNode.parentNode.removeChild(element.parentNode)
- 
--    def _reject_stonith_clone_report(force_flags, stonith_ids, group_id=None):
-+    if element.getAttribute("class") == "stonith":
-         process_library_reports(
-             [
-                 reports.ReportItem(
-@@ -1706,24 +1706,12 @@ def resource_clone_create(
-                         is_forced=reports.codes.FORCE in force_flags,
-                     ),
-                     message=reports.messages.CloningStonithResourcesHasNoEffect(
--                        stonith_ids, group_id=group_id
-+                        [name]
-                     ),
-                 )
-             ]
-         )
- 
--    if element.getAttribute("class") == "stonith":
--        _reject_stonith_clone_report(force_flags, [name])
--
--    if element.tagName == "group":
--        stonith_ids = [
--            resource.getAttribute("id")
--            for resource in element.getElementsByTagName("primitive")
--            if resource.getAttribute("class") == "stonith"
--        ]
--        if stonith_ids:
--            _reject_stonith_clone_report(force_flags, stonith_ids, name)
--
-     parts = parse_clone_args(argv, promotable=promotable)
-     if not update_existing:
-         clone_id = parts["clone_id"]
-diff --git a/pcs_test/tier1/cib_resource/test_clone_unclone.py b/pcs_test/tier1/cib_resource/test_clone_unclone.py
-index 7b0e89f9..4cc4cb3e 100644
---- a/pcs_test/tier1/cib_resource/test_clone_unclone.py
-+++ b/pcs_test/tier1/cib_resource/test_clone_unclone.py
-@@ -354,12 +354,9 @@ class Clone(
- 
-     def test_clone_group_with_stonith(self):
-         self.set_cib_file(FIXTURE_GROUP_WITH_STONITH)
--        self.assert_pcs_fail(
-+        self.assert_effect(
-             "resource clone Group".split(),
--            fixture_clone_stonith_msg(group=True),
--        )
--        self.assert_resources_xml_in_cib(
--            fixture_resources_xml(FIXTURE_GROUP_WITH_STONITH)
-+            fixture_resources_xml(FIXTURE_CLONED_GROUP_WITH_STONITH),
-         )
- 
-     def test_clone_group_with_stonith_forced(self):
-@@ -367,7 +364,6 @@ class Clone(
-         self.assert_effect(
-             "resource clone Group --force".split(),
-             fixture_resources_xml(FIXTURE_CLONED_GROUP_WITH_STONITH),
--            output=fixture_clone_stonith_msg(forced=True, group=True),
-         )
- 
-     def test_promotable_clone(self):
--- 
-2.31.1
-
diff --git a/bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch b/bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
deleted file mode 100644
index b304d91..0000000
--- a/bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
+++ /dev/null
@@ -1,1056 +0,0 @@
-From 4effb249590c6da5eeb13d9106f36e210e6fe5c2 Mon Sep 17 00:00:00 2001
-From: Ondrej Mular <omular@redhat.com>
-Date: Mon, 10 Jan 2022 16:04:54 +0100
-Subject: [PATCH 3/4] Multiple fixes in `pcs resource move` command
-
----
- pcs/common/reports/codes.py                   |   1 +
- pcs/common/reports/messages.py                |  21 ++
- pcs/lib/cib/node.py                           |  14 +-
- pcs/lib/commands/resource.py                  | 105 ++++++-
- pcs/lib/node.py                               |   7 +-
- pcs/resource.py                               |   7 +
- .../tier0/common/reports/test_messages.py     |  12 +
- .../resource/test_resource_move_autoclean.py  | 280 +++++++++++++++++-
- .../resource/test_resource_move_ban.py        |  45 ++-
- .../tools/command_env/config_runner_pcmk.py   |   2 +
- pcs_test/tools/command_env/mock_runner.py     |   2 +-
- pcs_test/tools/fixture_cib.py                 |   1 +
- 12 files changed, 463 insertions(+), 34 deletions(-)
-
-diff --git a/pcs/common/reports/codes.py b/pcs/common/reports/codes.py
-index 8ed83d84..8887fd6d 100644
---- a/pcs/common/reports/codes.py
-+++ b/pcs/common/reports/codes.py
-@@ -421,6 +421,7 @@ RESOURCE_UNMOVE_UNBAN_PCMK_EXPIRED_NOT_SUPPORTED = M(
- )
- RESOURCE_MOVE_CONSTRAINT_CREATED = M("RESOURCE_MOVE_CONSTRAINT_CREATED")
- RESOURCE_MOVE_CONSTRAINT_REMOVED = M("RESOURCE_MOVE_CONSTRAINT_REMOVED")
-+RESOURCE_MOVE_NOT_AFFECTING_RESOURCE = M("RESOURCE_MOVE_NOT_AFFECTING_RESOURCE")
- RESOURCE_MOVE_AFFECTS_OTRHER_RESOURCES = M(
-     "RESOURCE_MOVE_AFFECTS_OTRHER_RESOURCES"
- )
-diff --git a/pcs/common/reports/messages.py b/pcs/common/reports/messages.py
-index 16171fd0..37c79ba1 100644
---- a/pcs/common/reports/messages.py
-+++ b/pcs/common/reports/messages.py
-@@ -6140,6 +6140,27 @@ class ResourceMoveConstraintRemoved(ReportItemMessage):
-         )
- 
- 
-+@dataclass(frozen=True)
-+class ResourceMoveNotAffectingResource(ReportItemMessage):
-+    """
-+    Creating a location constraint to move a resource has no effect on the
-+    resource.
-+
-+    resource_id -- id of the resource to be moved
-+    """
-+
-+    resource_id: str
-+    _code = codes.RESOURCE_MOVE_NOT_AFFECTING_RESOURCE
-+
-+    @property
-+    def message(self) -> str:
-+        return (
-+            f"Unable to move resource '{self.resource_id}' using a location "
-+            "constraint. Current location of the resource may be affected by "
-+            "some other constraint."
-+        )
-+
-+
- @dataclass(frozen=True)
- class ResourceMoveAffectsOtherResources(ReportItemMessage):
-     """
-diff --git a/pcs/lib/cib/node.py b/pcs/lib/cib/node.py
-index 20a41ca0..df2ffbaa 100644
---- a/pcs/lib/cib/node.py
-+++ b/pcs/lib/cib/node.py
-@@ -1,12 +1,17 @@
- from collections import namedtuple
-+from typing import Set
- from lxml import etree
-+from lxml.etree import _Element
- 
- from pcs.common import reports
- from pcs.common.reports.item import ReportItem
- from pcs.lib.cib.nvpair import update_nvset
- from pcs.lib.cib.tools import get_nodes
- from pcs.lib.errors import LibraryError
--from pcs.lib.xml_tools import append_when_useful
-+from pcs.lib.xml_tools import (
-+    append_when_useful,
-+    get_root,
-+)
- 
- 
- class PacemakerNode(namedtuple("PacemakerNode", "name addr")):
-@@ -58,6 +63,13 @@ def update_node_instance_attrs(
-     append_when_useful(cib_nodes, node_el)
- 
- 
-+def get_node_names(cib: _Element) -> Set[str]:
-+    return {
-+        str(node.attrib["uname"])
-+        for node in get_nodes(get_root(cib)).iterfind("./node")
-+    }
-+
-+
- def _ensure_node_exists(tree, node_name, state_nodes=None):
-     """
-     Make sure node with specified name exists
-diff --git a/pcs/lib/commands/resource.py b/pcs/lib/commands/resource.py
-index d0e8f4db..82ce73e0 100644
---- a/pcs/lib/commands/resource.py
-+++ b/pcs/lib/commands/resource.py
-@@ -50,12 +50,16 @@ from pcs.lib.cib.tools import (
- from pcs.lib.env import LibraryEnvironment, WaitType
- from pcs.lib.errors import LibraryError
- from pcs.lib.external import CommandRunner
--from pcs.lib.node import get_existing_nodes_names_addrs
-+from pcs.lib.node import (
-+    get_existing_nodes_names_addrs,
-+    get_pacemaker_node_names,
-+)
- from pcs.lib.pacemaker import simulate as simulate_tools
- from pcs.lib.pacemaker.live import (
-     diff_cibs_xml,
-     get_cib,
-     get_cib_xml,
-+    get_cluster_status_dom,
-     has_resource_unmove_unban_expired_support,
-     push_cib_diff_xml,
-     resource_ban,
-@@ -1589,6 +1593,16 @@ def move(
-     )
- 
- 
-+def _nodes_exist_reports(
-+    cib: _Element, node_names: Iterable[str]
-+) -> ReportItemList:
-+    existing_node_names = get_pacemaker_node_names(cib)
-+    return [
-+        reports.ReportItem.error(reports.messages.NodeNotFound(node_name))
-+        for node_name in (set(node_names) - existing_node_names)
-+    ]
-+
-+
- def move_autoclean(
-     env: LibraryEnvironment,
-     resource_id: str,
-@@ -1626,6 +1640,9 @@ def move_autoclean(
-     if resource_el is not None:
-         report_list.extend(resource.common.validate_move(resource_el, master))
- 
-+    if node:
-+        report_list.extend(_nodes_exist_reports(cib, [node]))
-+
-     if env.report_processor.report_list(report_list).has_errors:
-         raise LibraryError()
- 
-@@ -1659,8 +1676,32 @@ def move_autoclean(
-     add_constraint_cib_diff = diff_cibs_xml(
-         env.cmd_runner(), env.report_processor, cib_xml, rsc_moved_cib_xml
-     )
-+    with get_tmp_cib(
-+        env.report_processor, rsc_moved_cib_xml
-+    ) as rsc_moved_constraint_cleared_cib_file:
-+        stdout, stderr, retval = resource_unmove_unban(
-+            env.cmd_runner(
-+                dict(CIB_file=rsc_moved_constraint_cleared_cib_file.name)
-+            ),
-+            resource_id,
-+            node,
-+            master,
-+        )
-+        if retval != 0:
-+            raise LibraryError(
-+                ReportItem.error(
-+                    reports.messages.ResourceUnmoveUnbanPcmkError(
-+                        resource_id, stdout, stderr
-+                    )
-+                )
-+            )
-+        rsc_moved_constraint_cleared_cib_file.seek(0)
-+        constraint_removed_cib = rsc_moved_constraint_cleared_cib_file.read()
-     remove_constraint_cib_diff = diff_cibs_xml(
--        env.cmd_runner(), env.report_processor, rsc_moved_cib_xml, cib_xml
-+        env.cmd_runner(),
-+        env.report_processor,
-+        rsc_moved_cib_xml,
-+        constraint_removed_cib,
-     )
- 
-     if not (add_constraint_cib_diff and remove_constraint_cib_diff):
-@@ -1689,13 +1730,15 @@ def move_autoclean(
-                     )
-                 )
-             )
--    _ensure_resource_is_not_moved(
-+    _ensure_resource_moved_and_not_moved_back(
-         env.cmd_runner,
-         env.report_processor,
-         etree_to_str(after_move_simulated_cib),
-         remove_constraint_cib_diff,
-         resource_id,
-         strict,
-+        resource_state_before,
-+        node,
-     )
-     push_cib_diff_xml(env.cmd_runner(), add_constraint_cib_diff)
-     env.report_processor.report(
-@@ -1704,13 +1747,15 @@ def move_autoclean(
-         )
-     )
-     env.wait_for_idle(wait_timeout)
--    _ensure_resource_is_not_moved(
-+    _ensure_resource_moved_and_not_moved_back(
-         env.cmd_runner,
-         env.report_processor,
-         get_cib_xml(env.cmd_runner()),
-         remove_constraint_cib_diff,
-         resource_id,
-         strict,
-+        resource_state_before,
-+        node,
-     )
-     push_cib_diff_xml(env.cmd_runner(), remove_constraint_cib_diff)
-     env.report_processor.report(
-@@ -1730,16 +1775,35 @@ def move_autoclean(
-         raise LibraryError()
- 
- 
--def _ensure_resource_is_not_moved(
-+def _ensure_resource_moved_and_not_moved_back(
-     runner_factory: Callable[[Optional[Mapping[str, str]]], CommandRunner],
-     report_processor: reports.ReportProcessor,
-     cib_xml: str,
-     remove_constraint_cib_diff: str,
-     resource_id: str,
-     strict: bool,
-+    resource_state_before: Dict[str, List[str]],
-+    node: Optional[str],
- ) -> None:
-     # pylint: disable=too-many-locals
-     with get_tmp_cib(report_processor, cib_xml) as rsc_unmove_cib_file:
-+        if not _was_resource_moved(
-+            node,
-+            resource_state_before,
-+            get_resource_state(
-+                get_cluster_status_dom(
-+                    runner_factory(dict(CIB_file=rsc_unmove_cib_file.name))
-+                ),
-+                resource_id,
-+            ),
-+        ):
-+            raise LibraryError(
-+                reports.ReportItem.error(
-+                    reports.messages.ResourceMoveNotAffectingResource(
-+                        resource_id
-+                    )
-+                )
-+            )
-         push_cib_diff_xml(
-             runner_factory(dict(CIB_file=rsc_unmove_cib_file.name)),
-             remove_constraint_cib_diff,
-@@ -1809,20 +1873,31 @@ def _resource_running_on_nodes(
-     return frozenset()
- 
- 
-+def _was_resource_moved(
-+    node: Optional[str],
-+    resource_state_before: Dict[str, List[str]],
-+    resource_state_after: Dict[str, List[str]],
-+) -> bool:
-+    running_on_nodes = _resource_running_on_nodes(resource_state_after)
-+    return not bool(
-+        resource_state_before
-+        and (  # running resource moved
-+            not running_on_nodes
-+            or (node and node not in running_on_nodes)
-+            or (resource_state_before == resource_state_after)
-+        )
-+    )
-+
-+
- def _move_wait_report(
-     resource_id: str,
-     node: Optional[str],
-     resource_state_before: Dict[str, List[str]],
-     resource_state_after: Dict[str, List[str]],
- ) -> ReportItem:
--    allowed_nodes = frozenset([node] if node else [])
--    running_on_nodes = _resource_running_on_nodes(resource_state_after)
--
-     severity = reports.item.ReportItemSeverity.info()
--    if resource_state_before and (  # running resource moved
--        not running_on_nodes
--        or (allowed_nodes and allowed_nodes.isdisjoint(running_on_nodes))
--        or (resource_state_before == resource_state_after)
-+    if not _was_resource_moved(
-+        node, resource_state_before, resource_state_after
-     ):
-         severity = reports.item.ReportItemSeverity.error()
-     if not resource_state_after:
-@@ -1873,14 +1948,18 @@ class _MoveBanTemplate:
-         lifetime=None,
-         wait: WaitType = False,
-     ):
-+        # pylint: disable=too-many-locals
-         # validate
-         wait_timeout = env.ensure_wait_satisfiable(wait)  # raises on error
- 
-+        cib = env.get_cib()
-         resource_el, report_list = resource.common.find_one_resource(
--            get_resources(env.get_cib()), resource_id
-+            get_resources(cib), resource_id
-         )
-         if resource_el is not None:
-             report_list.extend(self._validate(resource_el, master))
-+        if node:
-+            report_list.extend(_nodes_exist_reports(cib, [node]))
-         if env.report_processor.report_list(report_list).has_errors:
-             raise LibraryError()
- 
-diff --git a/pcs/lib/node.py b/pcs/lib/node.py
-index ff08f747..3a7f236e 100644
---- a/pcs/lib/node.py
-+++ b/pcs/lib/node.py
-@@ -3,6 +3,7 @@ from typing import (
-     List,
-     Optional,
-     Tuple,
-+    Set,
- )
- 
- from lxml.etree import _Element
-@@ -11,7 +12,7 @@ from pcs.common import reports
- from pcs.common.reports import ReportItemList
- from pcs.common.reports import ReportItemSeverity
- from pcs.common.reports.item import ReportItem
--from pcs.lib.cib.node import PacemakerNode
-+from pcs.lib.cib.node import PacemakerNode, get_node_names
- from pcs.lib.cib.resource import remote_node, guest_node
- from pcs.lib.corosync.config_facade import ConfigFacade as CorosyncConfigFacade
- from pcs.lib.corosync.node import CorosyncNode
-@@ -28,6 +29,10 @@ def get_existing_nodes_names(
-     )
- 
- 
-+def get_pacemaker_node_names(cib: _Element) -> Set[str]:
-+    return get_node_names(cib) | set(get_existing_nodes_names(None, cib)[0])
-+
-+
- def get_existing_nodes_names_addrs(
-     corosync_conf=None, cib=None, error_on_missing_name=False
- ):
-diff --git a/pcs/resource.py b/pcs/resource.py
-index c7cf4c7e..f4f2c093 100644
---- a/pcs/resource.py
-+++ b/pcs/resource.py
-@@ -24,6 +24,7 @@ from pcs.settings import (
-     pacemaker_wait_timeout_status as PACEMAKER_WAIT_TIMEOUT_STATUS,
- )
- from pcs.cli.common.errors import (
-+    SEE_MAN_CHANGES,
-     raise_command_replaced,
-     CmdLineInputError,
- )
-@@ -868,6 +869,12 @@ def resource_move(lib: Any, argv: List[str], modifiers: InputModifiers):
-     node = None
-     if argv:
-         node = argv.pop(0)
-+        if node.startswith("lifetime="):
-+            deprecation_warning(
-+                "Option 'lifetime' has been removed. {}".format(
-+                    SEE_MAN_CHANGES.format("0.11")
-+                )
-+            )
-     if argv:
-         raise CmdLineInputError()
- 
-diff --git a/pcs_test/tier0/common/reports/test_messages.py b/pcs_test/tier0/common/reports/test_messages.py
-index a6f92395..a56ef382 100644
---- a/pcs_test/tier0/common/reports/test_messages.py
-+++ b/pcs_test/tier0/common/reports/test_messages.py
-@@ -4515,6 +4515,18 @@ class ResourceMoveConstraintRemoved(NameBuildTest):
-         )
- 
- 
-+class ResourceMoveNotAffectingResource(NameBuildTest):
-+    def test_success(self):
-+        self.assert_message_from_report(
-+            (
-+                "Unable to move resource 'R1' using a location constraint. "
-+                "Current location of the resource may be affected by some "
-+                "other constraint."
-+            ),
-+            reports.ResourceMoveNotAffectingResource("R1"),
-+        )
-+
-+
- class ResourceMoveAffectsOtherResources(NameBuildTest):
-     def test_multiple(self):
-         self.assert_message_from_report(
-diff --git a/pcs_test/tier0/lib/commands/resource/test_resource_move_autoclean.py b/pcs_test/tier0/lib/commands/resource/test_resource_move_autoclean.py
-index 32d758de..1bd4ee82 100644
---- a/pcs_test/tier0/lib/commands/resource/test_resource_move_autoclean.py
-+++ b/pcs_test/tier0/lib/commands/resource/test_resource_move_autoclean.py
-@@ -20,6 +20,25 @@ from pcs_test.tools.command_env import get_env_tools
- from pcs_test.tools.misc import get_test_resource as rc
- 
- 
-+def _node_fixture(name, node_id):
-+    return f'<node id="{node_id}" uname="{name}"/>'
-+
-+
-+def _node_list_fixture(nodes):
-+    return "\n".join(
-+        _node_fixture(node_name, node_id)
-+        for node_id, node_name in enumerate(nodes)
-+    )
-+
-+
-+def _nodes_section_fixture(content):
-+    return f"""
-+    <nodes>
-+    {content}
-+    </nodes>
-+    """
-+
-+
- def _rsc_primitive_fixture(res_id):
-     return f'<primitive id="{res_id}"/>'
- 
-@@ -145,11 +164,17 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-             resources=_resources_tag(
-                 _resource_primitive + _resource_promotable_clone
-             ),
-+            nodes=_nodes_section_fixture(
-+                _node_list_fixture([self.orig_node, self.new_node])
-+            ),
-         )
-         self.orig_cib = etree_to_str(
-             xml_fromstring(self.config.calls.get(config_load_cib_name).stdout)
-         )
-         self.cib_with_constraint = '<updated_cib with_constraint="True"/>'
-+        self.cib_without_constraint = (
-+            '<cib with_constraint="False" updated="True"/>'
-+        )
-         self.cib_simulate_constraint = (
-             '<cib simulate="True" with_constraint="True"/>'
-         )
-@@ -160,6 +185,9 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-         self.cib_diff_add_constraint_updated_tmp_file_name = (
-             "cib_diff_add_constraint_updated"
-         )
-+        self.cib_constraint_removed_by_unmove_file_name = (
-+            "cib_constraint_removed_by_unmove"
-+        )
-         self.cib_diff_remove_constraint_orig_tmp_file_name = (
-             "cib_diff_remove_constraint_orig"
-         )
-@@ -220,13 +248,18 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-                 self.cib_diff_add_constraint_updated_tmp_file_name,
-                 orig_content=self.cib_with_constraint,
-             ),
-+            TmpFileCall(
-+                self.cib_constraint_removed_by_unmove_file_name,
-+                orig_content=self.cib_with_constraint,
-+                new_content=self.cib_without_constraint,
-+            ),
-             TmpFileCall(
-                 self.cib_diff_remove_constraint_orig_tmp_file_name,
-                 orig_content=self.cib_with_constraint,
-             ),
-             TmpFileCall(
-                 self.cib_diff_remove_constraint_updated_tmp_file_name,
--                orig_content=self.orig_cib,
-+                orig_content=self.cib_without_constraint,
-             ),
-             TmpFileCall(
-                 self.simulated_cib_add_constraint_tmp_file_name,
-@@ -296,6 +329,12 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-             stdout=self.cib_diff_add_constraint,
-             name="runner.cib.diff.add_constraint",
-         )
-+        self.config.runner.pcmk.resource_clear(
-+            resource=resource_id,
-+            master=is_promotable,
-+            node=self.new_node if with_node else None,
-+            env=dict(CIB_file=self.cib_constraint_removed_by_unmove_file_name),
-+        )
-         self.config.runner.cib.diff(
-             self.cib_diff_remove_constraint_orig_tmp_file_name,
-             self.cib_diff_remove_constraint_updated_tmp_file_name,
-@@ -308,6 +347,13 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-             cib_xml=self.cib_with_constraint,
-             name="pcmk.simulate.rsc.move",
-         )
-+        self.config.runner.pcmk.load_state(
-+            resources=status_after,
-+            name="runner.pcmk.load_state.mid_simulation",
-+            env=dict(
-+                CIB_file=self.cib_apply_diff_remove_constraint_from_simulated_cib_tmp_file_name
-+            ),
-+        )
-         self.config.runner.cib.push_diff(
-             cib_diff=self.cib_diff_remove_constraint,
-             name="pcmk.push_cib_diff.simulation.remove_constraint",
-@@ -335,6 +381,13 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-             self.cib_with_constraint,
-             name="load_cib_after_move",
-         )
-+        self.config.runner.pcmk.load_state(
-+            resources=status_after,
-+            name="runner.pcmk.load_state.after_push",
-+            env=dict(
-+                CIB_file=self.cib_apply_diff_remove_constraint_after_push_tmp_file_name
-+            ),
-+        )
-         self.config.runner.cib.push_diff(
-             cib_diff=self.cib_diff_remove_constraint,
-             name="pcmk.push_cib_diff.simulation.remove_constraint_after_move",
-@@ -380,6 +433,11 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-                 file_path=self.cib_diff_add_constraint_updated_tmp_file_name,
-                 content=self.cib_with_constraint,
-             ),
-+            fixture.debug(
-+                reports.codes.TMP_FILE_WRITE,
-+                file_path=self.cib_constraint_removed_by_unmove_file_name,
-+                content=self.cib_with_constraint,
-+            ),
-             fixture.debug(
-                 reports.codes.TMP_FILE_WRITE,
-                 file_path=self.cib_diff_remove_constraint_orig_tmp_file_name,
-@@ -388,7 +446,7 @@ class MoveAutocleanSuccess(MoveAutocleanCommonSetup):
-             fixture.debug(
-                 reports.codes.TMP_FILE_WRITE,
-                 file_path=self.cib_diff_remove_constraint_updated_tmp_file_name,
--                content=self.orig_cib,
-+                content=self.cib_without_constraint,
-             ),
-             fixture.debug(
-                 reports.codes.TMP_FILE_WRITE,
-@@ -758,9 +816,7 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-             resources=_state_resource_fixture(resource_id, "Stopped"),
-         )
-         self.env_assist.assert_raise_library_error(
--            lambda: move_autoclean(
--                self.env_assist.get_env(), resource_id, node="node"
--            ),
-+            lambda: move_autoclean(self.env_assist.get_env(), resource_id),
-             [
-                 fixture.error(
-                     reports.codes.CANNOT_MOVE_RESOURCE_NOT_RUNNING,
-@@ -770,11 +826,33 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-             expected_in_processor=False,
-         )
- 
-+    def test_node_not_found(self):
-+        resource_id = "A"
-+        node = "non_existing_node"
-+        self.config.runner.cib.load(
-+            resources=_resources_tag(_rsc_primitive_fixture(resource_id)),
-+        )
-+        self.env_assist.assert_raise_library_error(
-+            lambda: move_autoclean(
-+                self.env_assist.get_env(), resource_id, node
-+            ),
-+        )
-+        self.env_assist.assert_reports(
-+            [
-+                fixture.error(
-+                    reports.codes.NODE_NOT_FOUND,
-+                    node=node,
-+                    searched_types=[],
-+                )
-+            ],
-+        )
-+
-     def test_constraint_already_exist(self):
-         resource_id = "A"
-         config_load_cib_name = "load_cib"
-         node = "node1"
-         cib_with_constraint = '<cib with_constraint="True"/>'
-+        cib_without_constraint = '<cib with_constraint="False" updated="True"/>'
-         cib_rsc_move_tmp_file_name = "cib_rsc_move_tmp_file"
-         cib_diff_add_constraint_orig_tmp_file_name = (
-             "cib_diff_add_constraint_orig"
-@@ -788,6 +866,9 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-         cib_diff_remove_constraint_updated_tmp_file_name = (
-             "cib_diff_remove_constraint_updated"
-         )
-+        cib_constraint_removed_by_unmove_file_name = (
-+            "cib_constraint_removed_by_unmove"
-+        )
-         self.config.runner.cib.load(
-             resources=_resources_tag(_rsc_primitive_fixture(resource_id)),
-             constraints=f"""
-@@ -795,6 +876,7 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-                   <rsc_location id="prefer-{resource_id}" rsc="{resource_id}" role="Started" node="{node}" score="INFINITY"/>
-               </constraints>
-             """,
-+            nodes=_nodes_section_fixture(_node_list_fixture([node])),
-             name=config_load_cib_name,
-         )
-         orig_cib = etree_to_str(
-@@ -815,13 +897,18 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-                     cib_diff_add_constraint_updated_tmp_file_name,
-                     orig_content=cib_with_constraint,
-                 ),
-+                TmpFileCall(
-+                    cib_constraint_removed_by_unmove_file_name,
-+                    orig_content=cib_with_constraint,
-+                    new_content=cib_without_constraint,
-+                ),
-                 TmpFileCall(
-                     cib_diff_remove_constraint_orig_tmp_file_name,
-                     orig_content=cib_with_constraint,
-                 ),
-                 TmpFileCall(
-                     cib_diff_remove_constraint_updated_tmp_file_name,
--                    orig_content=orig_cib,
-+                    orig_content=cib_without_constraint,
-                 ),
-             ]
-         )
-@@ -839,6 +926,11 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-             stdout="",
-             name="runner.cib.diff.add_constraint",
-         )
-+        self.config.runner.pcmk.resource_clear(
-+            resource=resource_id,
-+            node=node,
-+            env=dict(CIB_file=cib_constraint_removed_by_unmove_file_name),
-+        )
-         self.config.runner.cib.diff(
-             cib_diff_remove_constraint_orig_tmp_file_name,
-             cib_diff_remove_constraint_updated_tmp_file_name,
-@@ -863,6 +955,11 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-                     file_path=cib_diff_add_constraint_updated_tmp_file_name,
-                     content=cib_with_constraint,
-                 ),
-+                fixture.debug(
-+                    reports.codes.TMP_FILE_WRITE,
-+                    file_path=cib_constraint_removed_by_unmove_file_name,
-+                    content=cib_with_constraint,
-+                ),
-                 fixture.debug(
-                     reports.codes.TMP_FILE_WRITE,
-                     file_path=cib_diff_remove_constraint_orig_tmp_file_name,
-@@ -871,7 +968,7 @@ class MoveAutocleanValidations(MoveAutocleanCommonSetup):
-                 fixture.debug(
-                     reports.codes.TMP_FILE_WRITE,
-                     file_path=cib_diff_remove_constraint_updated_tmp_file_name,
--                    content=orig_cib,
-+                    content=cib_without_constraint,
-                 ),
-                 fixture.info(
-                     reports.codes.NO_ACTION_NECESSARY,
-@@ -896,6 +993,9 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-         self.cib_diff_add_constraint = "diff_add_constraint"
-         self.cib_diff_remove_constraint = "diff_remove_constraint"
-         self.cib_with_constraint = '<cib with_constraint="True"/>'
-+        self.cib_without_constraint = (
-+            '<cib with_constraint="False" updated="True"/>'
-+        )
-         self.cib_rsc_move_tmp_file_name = "cib_rsc_move_tmp_file"
-         self.cib_diff_add_constraint_orig_tmp_file_name = (
-             "cib_diff_add_constraint_orig"
-@@ -903,6 +1003,9 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-         self.cib_diff_add_constraint_updated_tmp_file_name = (
-             "cib_diff_add_constraint_updated"
-         )
-+        self.cib_constraint_removed_by_unmove_file_name = (
-+            "cib_constraint_removed_by_unmove"
-+        )
-         self.cib_diff_remove_constraint_orig_tmp_file_name = (
-             "cib_diff_remove_constraint_orig"
-         )
-@@ -951,6 +1054,9 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
- 
-         self.config.runner.cib.load(
-             resources=_resources_tag(_rsc_primitive_fixture(self.resource_id)),
-+            nodes=_nodes_section_fixture(
-+                _node_list_fixture(["node1", "node2"])
-+            ),
-             name=self.config_load_cib_name,
-         )
-         self.orig_cib = etree_to_str(
-@@ -979,13 +1085,18 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-                 self.cib_diff_add_constraint_updated_tmp_file_name,
-                 orig_content=self.cib_with_constraint,
-             ),
-+            TmpFileCall(
-+                self.cib_constraint_removed_by_unmove_file_name,
-+                orig_content=self.cib_with_constraint,
-+                new_content=self.cib_without_constraint,
-+            ),
-             TmpFileCall(
-                 self.cib_diff_remove_constraint_orig_tmp_file_name,
-                 orig_content=self.cib_with_constraint,
-             ),
-             TmpFileCall(
-                 self.cib_diff_remove_constraint_updated_tmp_file_name,
--                orig_content=self.orig_cib,
-+                orig_content=self.cib_without_constraint,
-             ),
-             TmpFileCall(
-                 self.simulated_cib_add_constraint_tmp_file_name,
-@@ -1067,6 +1178,11 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             stdout=self.cib_diff_add_constraint,
-             name="runner.cib.diff.add_constraint",
-         )
-+        self.config.runner.pcmk.resource_clear(
-+            resource=self.resource_id,
-+            node=node,
-+            env=dict(CIB_file=self.cib_constraint_removed_by_unmove_file_name),
-+        )
-         self.config.runner.cib.diff(
-             self.cib_diff_remove_constraint_orig_tmp_file_name,
-             self.cib_diff_remove_constraint_updated_tmp_file_name,
-@@ -1081,6 +1197,15 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-         )
-         if stage <= 1:
-             return
-+        self.config.runner.pcmk.load_state(
-+            resources=_state_resource_fixture(
-+                self.resource_id, "Started", node if node else "node2"
-+            ),
-+            name="runner.pcmk.load_state.mid_simulation",
-+            env=dict(
-+                CIB_file=self.cib_apply_diff_remove_constraint_from_simulated_cib_tmp_file_name
-+            ),
-+        )
-         self.config.runner.cib.push_diff(
-             cib_diff=self.cib_diff_remove_constraint,
-             name="pcmk.push_cib_diff.simulation.remove_constraint",
-@@ -1110,6 +1235,17 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             self.cib_with_constraint,
-             name="load_cib_after_move",
-         )
-+        if stage <= 3:
-+            return
-+        self.config.runner.pcmk.load_state(
-+            resources=_state_resource_fixture(
-+                self.resource_id, "Started", node if node else "node2"
-+            ),
-+            name="runner.pcmk.load_state.after_push",
-+            env=dict(
-+                CIB_file=self.cib_apply_diff_remove_constraint_after_push_tmp_file_name
-+            ),
-+        )
-         self.config.runner.cib.push_diff(
-             cib_diff=self.cib_diff_remove_constraint,
-             name="pcmk.push_cib_diff.simulation.remove_constraint_after_move",
-@@ -1126,7 +1262,7 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             ),
-             name="pcmk.simulate.rsc.unmove.after_push",
-         )
--        if stage <= 3:
-+        if stage <= 4:
-             return
-         self.config.runner.cib.push_diff(
-             cib_diff=self.cib_diff_remove_constraint,
-@@ -1153,6 +1289,11 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-                 file_path=self.cib_diff_add_constraint_updated_tmp_file_name,
-                 content=self.cib_with_constraint,
-             ),
-+            fixture.debug(
-+                reports.codes.TMP_FILE_WRITE,
-+                file_path=self.cib_constraint_removed_by_unmove_file_name,
-+                content=self.cib_with_constraint,
-+            ),
-             fixture.debug(
-                 reports.codes.TMP_FILE_WRITE,
-                 file_path=self.cib_diff_remove_constraint_orig_tmp_file_name,
-@@ -1161,7 +1302,7 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             fixture.debug(
-                 reports.codes.TMP_FILE_WRITE,
-                 file_path=self.cib_diff_remove_constraint_updated_tmp_file_name,
--                content=self.orig_cib,
-+                content=self.cib_without_constraint,
-             ),
-             fixture.debug(
-                 reports.codes.TMP_FILE_WRITE,
-@@ -1199,7 +1340,7 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-                 reports.codes.WAIT_FOR_IDLE_STARTED,
-                 timeout=0,
-             ),
--        ][: {None: None, 3: -2, 2: 7, 1: 5}[stage]]
-+        ][: {None: None, 4: -2, 3: 10, 2: 8, 1: 6}[stage]]
- 
-     def test_move_affects_other_resources_strict(self):
-         self.tmp_file_mock_obj.set_calls(
-@@ -1304,7 +1445,8 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-                 ),
-             )
-         )
--        self.set_up_testing_env(stage=3)
-+        setup_stage = 4
-+        self.set_up_testing_env(stage=setup_stage)
-         self.env_assist.assert_raise_library_error(
-             lambda: move_autoclean(self.env_assist.get_env(), self.resource_id),
-             [
-@@ -1316,7 +1458,7 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             ],
-             expected_in_processor=False,
-         )
--        self.env_assist.assert_reports(self.get_reports(stage=3))
-+        self.env_assist.assert_reports(self.get_reports(stage=setup_stage))
- 
-     def test_unmove_after_push_affects_other_resources_strict(self):
-         self.tmp_file_mock_obj.set_calls(
-@@ -1330,7 +1472,8 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-                 ),
-             )
-         )
--        self.set_up_testing_env(stage=3)
-+        setup_stage = 4
-+        self.set_up_testing_env(stage=setup_stage)
-         self.env_assist.assert_raise_library_error(
-             lambda: move_autoclean(
-                 self.env_assist.get_env(),
-@@ -1346,7 +1489,7 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             ],
-             expected_in_processor=False,
-         )
--        self.env_assist.assert_reports(self.get_reports(stage=3))
-+        self.env_assist.assert_reports(self.get_reports(stage=setup_stage))
- 
-     def test_resource_not_runnig_after_move(self):
-         self.tmp_file_mock_obj.set_calls(
-@@ -1381,8 +1524,113 @@ class MoveAutocleanFailures(MoveAutocleanCommonSetup):
-             ]
-         )
- 
-+    def test_simulation_resource_not_moved(self):
-+        node = "node2"
-+        different_node = f"different-{node}"
-+        setup_stage = 1
-+        self.tmp_file_mock_obj.set_calls(
-+            self.get_tmp_files_mocks(
-+                _simulation_transition_fixture(
-+                    _simulation_synapses_fixture(self.resource_id)
-+                ),
-+            )
-+            + [
-+                TmpFileCall(
-+                    self.cib_apply_diff_remove_constraint_from_simulated_cib_tmp_file_name,
-+                    orig_content=self.cib_simulate_constraint,
-+                ),
-+            ]
-+        )
-+        self.set_up_testing_env(node=node, stage=setup_stage)
-+        self.config.runner.pcmk.load_state(
-+            resources=_state_resource_fixture(
-+                self.resource_id, "Started", different_node
-+            ),
-+            name="runner.pcmk.load_state.final",
-+            env=dict(
-+                CIB_file=self.cib_apply_diff_remove_constraint_from_simulated_cib_tmp_file_name
-+            ),
-+        )
-+        self.env_assist.assert_raise_library_error(
-+            lambda: move_autoclean(
-+                self.env_assist.get_env(),
-+                self.resource_id,
-+                node=node,
-+            ),
-+            [
-+                fixture.error(
-+                    reports.codes.RESOURCE_MOVE_NOT_AFFECTING_RESOURCE,
-+                    resource_id=self.resource_id,
-+                )
-+            ],
-+            expected_in_processor=False,
-+        )
-+        self.env_assist.assert_reports(
-+            self.get_reports(stage=setup_stage)
-+            + [
-+                fixture.debug(
-+                    reports.codes.TMP_FILE_WRITE,
-+                    file_path=self.cib_apply_diff_remove_constraint_from_simulated_cib_tmp_file_name,
-+                    content=self.cib_simulate_constraint,
-+                ),
-+            ]
-+        )
-+
-+    def test_after_push_resource_not_moved(self):
-+        node = "node2"
-+        different_node = f"different-{node}"
-+        setup_stage = 3
-+        self.tmp_file_mock_obj.set_calls(
-+            self.get_tmp_files_mocks(
-+                _simulation_transition_fixture(
-+                    _simulation_synapses_fixture(self.resource_id)
-+                ),
-+                _simulation_transition_fixture(),
-+            )
-+            + [
-+                TmpFileCall(
-+                    self.cib_apply_diff_remove_constraint_after_push_tmp_file_name,
-+                    orig_content=self.cib_with_constraint,
-+                ),
-+            ]
-+        )
-+        self.set_up_testing_env(node=node, stage=setup_stage)
-+        self.config.runner.pcmk.load_state(
-+            resources=_state_resource_fixture(
-+                self.resource_id, "Started", different_node
-+            ),
-+            name="runner.pcmk.load_state.final",
-+            env=dict(
-+                CIB_file=self.cib_apply_diff_remove_constraint_after_push_tmp_file_name,
-+            ),
-+        )
-+        self.env_assist.assert_raise_library_error(
-+            lambda: move_autoclean(
-+                self.env_assist.get_env(),
-+                self.resource_id,
-+                node=node,
-+            ),
-+            [
-+                fixture.error(
-+                    reports.codes.RESOURCE_MOVE_NOT_AFFECTING_RESOURCE,
-+                    resource_id=self.resource_id,
-+                )
-+            ],
-+            expected_in_processor=False,
-+        )
-+        self.env_assist.assert_reports(
-+            self.get_reports(stage=setup_stage)
-+            + [
-+                fixture.debug(
-+                    reports.codes.TMP_FILE_WRITE,
-+                    file_path=self.cib_apply_diff_remove_constraint_after_push_tmp_file_name,
-+                    content=self.cib_with_constraint,
-+                ),
-+            ]
-+        )
-+
-     def test_resource_running_on_a_different_node(self):
--        node = "node1"
-+        node = "node2"
-         different_node = f"different-{node}"
-         self.tmp_file_mock_obj.set_calls(
-             self.get_tmp_files_mocks(
-diff --git a/pcs_test/tier0/lib/commands/resource/test_resource_move_ban.py b/pcs_test/tier0/lib/commands/resource/test_resource_move_ban.py
-index 5d57fa06..28dd1cd1 100644
---- a/pcs_test/tier0/lib/commands/resource/test_resource_move_ban.py
-+++ b/pcs_test/tier0/lib/commands/resource/test_resource_move_ban.py
-@@ -10,6 +10,29 @@ from pcs.common.reports import ReportItemSeverity as severities
- from pcs.common.reports import codes as report_codes
- from pcs.lib.commands import resource
- 
-+
-+def _node_fixture(name, node_id):
-+    return f'<node id="{node_id}" uname="{name}"/>'
-+
-+
-+def _node_list_fixture(nodes):
-+    return "\n".join(
-+        _node_fixture(node_name, node_id)
-+        for node_id, node_name in enumerate(nodes)
-+    )
-+
-+
-+def _nodes_section_fixture(content):
-+    return f"""
-+    <nodes>
-+    {content}
-+    </nodes>
-+    """
-+
-+
-+nodes_section = _nodes_section_fixture(
-+    _node_list_fixture(["node", "node1", "node2"])
-+)
- resources_primitive = """
-     <resources>
-         <primitive id="A" />
-@@ -128,8 +151,24 @@ class MoveBanBaseMixin(MoveBanClearBaseMixin):
-             expected_in_processor=False,
-         )
- 
-+    def test_node_not_found(self):
-+        self.config.runner.cib.load(resources=resources_primitive)
-+        node = "node"
-+        self.env_assist.assert_raise_library_error(
-+            lambda: self.lib_action(self.env_assist.get_env(), "A", node)
-+        )
-+        self.env_assist.assert_reports(
-+            [
-+                fixture.error(
-+                    report_codes.NODE_NOT_FOUND, node=node, searched_types=[]
-+                )
-+            ]
-+        )
-+
-     def test_all_options(self):
--        self.config.runner.cib.load(resources=resources_promotable)
-+        self.config.runner.cib.load(
-+            resources=resources_promotable, nodes=nodes_section
-+        )
-         self.config_pcmk_action(
-             resource="A-clone",
-             master=True,
-@@ -274,7 +313,9 @@ class MoveBanWaitMixin:
-     def setUp(self):
-         self.timeout = 10
-         self.env_assist, self.config = get_env_tools(self)
--        self.config.runner.cib.load(resources=resources_primitive)
-+        self.config.runner.cib.load(
-+            resources=resources_primitive, nodes=nodes_section
-+        )
- 
-     @mock.patch.object(
-         settings,
-diff --git a/pcs_test/tools/command_env/config_runner_pcmk.py b/pcs_test/tools/command_env/config_runner_pcmk.py
-index 6df3dff3..7a88cf96 100644
---- a/pcs_test/tools/command_env/config_runner_pcmk.py
-+++ b/pcs_test/tools/command_env/config_runner_pcmk.py
-@@ -695,6 +695,7 @@ class PcmkShortcuts:
-         stdout="",
-         stderr="",
-         returncode=0,
-+        env=None,
-     ):
-         """
-         Create a call for crm_resource --clear
-@@ -711,6 +712,7 @@ class PcmkShortcuts:
-         string stdout -- crm_resource's stdout
-         string stderr -- crm_resource's stderr
-         int returncode -- crm_resource's returncode
-+        dict env -- CommandRunner environment variables
-         """
-         # arguments are used via locals()
-         # pylint: disable=unused-argument
-diff --git a/pcs_test/tools/command_env/mock_runner.py b/pcs_test/tools/command_env/mock_runner.py
-index f7871fc2..8520ce02 100644
---- a/pcs_test/tools/command_env/mock_runner.py
-+++ b/pcs_test/tools/command_env/mock_runner.py
-@@ -143,6 +143,6 @@ class Runner:
-             env.update(env_extend)
-         if env != call.env:
-             raise self.__call_queue.error_with_context(
--                f"ENV doesn't match. Expected: {call.env}; Real: {env}"
-+                f"Command #{i}: ENV doesn't match. Expected: {call.env}; Real: {env}"
-             )
-         return call.stdout, call.stderr, call.returncode
-diff --git a/pcs_test/tools/fixture_cib.py b/pcs_test/tools/fixture_cib.py
-index 602491c8..bf02bacc 100644
---- a/pcs_test/tools/fixture_cib.py
-+++ b/pcs_test/tools/fixture_cib.py
-@@ -310,6 +310,7 @@ MODIFIER_GENERATORS = {
-     "replace": replace_all,
-     "append": append_all,
-     "resources": lambda xml: replace_all({"./configuration/resources": xml}),
-+    "nodes": lambda xml: replace_all({"./configuration/nodes": xml}),
-     "constraints": lambda xml: replace_all(
-         {"./configuration/constraints": xml}
-     ),
--- 
-2.31.1
-
diff --git a/bz2019836-01-fix-rsc-update-cmd-when-unable-to-get-agent-metadata.patch b/bz2019836-01-fix-rsc-update-cmd-when-unable-to-get-agent-metadata.patch
deleted file mode 100644
index 9611c1a..0000000
--- a/bz2019836-01-fix-rsc-update-cmd-when-unable-to-get-agent-metadata.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 69bfb22dbd68023069f6dae11e418f6ad455474f Mon Sep 17 00:00:00 2001
-From: Ondrej Mular <omular@redhat.com>
-Date: Tue, 7 Dec 2021 11:14:37 +0100
-Subject: [PATCH 2/3] fix rsc update cmd when unable to get agent metadata
-
-`resource update` command failed with a traceback when updating a
-resource with a non-existing resource agent
----
- pcs/resource.py                        | 14 ++++++++------
- pcs_test/tier1/legacy/test_resource.py | 21 +++++++++++++++++++++
- 2 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/pcs/resource.py b/pcs/resource.py
-index b2a5e355..928477b2 100644
---- a/pcs/resource.py
-+++ b/pcs/resource.py
-@@ -1075,13 +1075,15 @@ def resource_update(lib, args, modifiers, deal_with_guest_change=True):
-         if report_list:
-             process_library_reports(report_list)
-     except lib_ra.ResourceAgentError as e:
--        severity = (
--            reports.ReportItemSeverity.WARNING
--            if modifiers.get("--force")
--            else reports.ReportItemSeverity.ERROR
--        )
-         process_library_reports(
--            [lib_ra.resource_agent_error_to_report_item(e, severity)]
-+            [
-+                lib_ra.resource_agent_error_to_report_item(
-+                    e,
-+                    reports.get_severity(
-+                        reports.codes.FORCE, modifiers.get("--force")
-+                    ),
-+                )
-+            ]
-         )
-     except LibraryError as e:
-         process_library_reports(e.args)
-diff --git a/pcs_test/tier1/legacy/test_resource.py b/pcs_test/tier1/legacy/test_resource.py
-index 417ca131..0f8415b4 100644
---- a/pcs_test/tier1/legacy/test_resource.py
-+++ b/pcs_test/tier1/legacy/test_resource.py
-@@ -4882,6 +4882,27 @@ class UpdateInstanceAttrs(
-             ),
-         )
- 
-+    def test_nonexisting_agent(self):
-+        agent = "ocf:pacemaker:nonexistent"
-+        message = (
-+            f"Agent '{agent}' is not installed or does "
-+            "not provide valid metadata: Metadata query for "
-+            f"{agent} failed: Input/output error"
-+        )
-+        self.assert_pcs_success(
-+            f"resource create --force D0 {agent}".split(),
-+            f"Warning: {message}\n",
-+        )
-+
-+        self.assert_pcs_fail(
-+            "resource update D0 test=testA".split(),
-+            f"Error: {message}, use --force to override\n",
-+        )
-+        self.assert_pcs_success(
-+            "resource update --force D0 test=testA".split(),
-+            f"Warning: {message}\n",
-+        )
-+
-     def test_update_existing(self):
-         xml = """
-             <resources>
--- 
-2.31.1
-
diff --git a/bz2032473-01-fix-enabling-corosync-qdevice.patch b/bz2032473-01-fix-enabling-corosync-qdevice.patch
deleted file mode 100644
index 71a2290..0000000
--- a/bz2032473-01-fix-enabling-corosync-qdevice.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 798d054db1a20b7cd2f2aed2b35b9e51835dec55 Mon Sep 17 00:00:00 2001
-From: Tomas Jelinek <tojeline@redhat.com>
-Date: Mon, 6 Dec 2021 16:06:31 +0100
-Subject: [PATCH 1/3] fix enabling corosync-qdevice
-
----
- pcsd/remote.rb | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pcsd/remote.rb b/pcsd/remote.rb
-index b569e249..e1923d6f 100644
---- a/pcsd/remote.rb
-+++ b/pcsd/remote.rb
-@@ -2002,7 +2002,7 @@ def qdevice_client_enable(param, request, auth_user)
-   unless allowed_for_local_cluster(auth_user, Permissions::WRITE)
-     return 403, 'Permission denied'
-   end
--  if not ServiceChecker.new('corosync', enabled: true).is_enabled?('corosync')
-+  if not ServiceChecker.new(['corosync'], enabled: true).is_enabled?('corosync')
-     return pcsd_success('corosync is not enabled, skipping')
-   elsif enable_service('corosync-qdevice')
-     return pcsd_success('corosync-qdevice enabled')
--- 
-2.31.1
-
diff --git a/bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch b/bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
deleted file mode 100644
index 277e1a8..0000000
--- a/bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From 1f91f67a18885937794e775bbbcde973ffe59468 Mon Sep 17 00:00:00 2001
-From: Miroslav Lisik <mlisik@redhat.com>
-Date: Thu, 16 Dec 2021 14:12:58 +0100
-Subject: [PATCH 1/4] skip checking of scsi devices to be removed before
- unfencing to be added devices
-
----
- pcs/lib/commands/scsi.py                 |  3 ++-
- pcs_test/tier0/lib/commands/test_scsi.py | 21 +++++++++++++++++----
- 2 files changed, 19 insertions(+), 5 deletions(-)
-
-diff --git a/pcs/lib/commands/scsi.py b/pcs/lib/commands/scsi.py
-index ff20a563..ab732805 100644
---- a/pcs/lib/commands/scsi.py
-+++ b/pcs/lib/commands/scsi.py
-@@ -31,7 +31,8 @@ def unfence_node(
-         return
-     fence_scsi_bin = os.path.join(settings.fence_agent_binaries, "fence_scsi")
-     fenced_devices = []
--    for device in original_devices:
-+    # do not check devices being removed
-+    for device in sorted(set(original_devices) & set(updated_devices)):
-         stdout, stderr, return_code = env.cmd_runner().run(
-             [
-                 fence_scsi_bin,
-diff --git a/pcs_test/tier0/lib/commands/test_scsi.py b/pcs_test/tier0/lib/commands/test_scsi.py
-index 8ef9836a..bc2357a9 100644
---- a/pcs_test/tier0/lib/commands/test_scsi.py
-+++ b/pcs_test/tier0/lib/commands/test_scsi.py
-@@ -13,10 +13,13 @@ class TestUnfenceNode(TestCase):
-         self.old_devices = ["device1", "device3"]
-         self.new_devices = ["device3", "device0", "device2"]
-         self.added_devices = set(self.new_devices) - set(self.old_devices)
-+        self.check_devices = sorted(
-+            set(self.old_devices) & set(self.new_devices)
-+        )
-         self.node = "node1"
- 
-     def test_success_devices_to_unfence(self):
--        for old_dev in self.old_devices:
-+        for old_dev in self.check_devices:
-             self.config.runner.scsi.get_status(
-                 self.node, old_dev, name=f"runner.scsi.is_fenced.{old_dev}"
-             )
-@@ -38,9 +41,19 @@ class TestUnfenceNode(TestCase):
-         )
-         self.env_assist.assert_reports([])
- 
-+    def test_success_replace_unavailable_device(self):
-+        self.config.runner.scsi.unfence_node(self.node, {"device2"})
-+        scsi.unfence_node(
-+            self.env_assist.get_env(),
-+            self.node,
-+            {"device1"},
-+            {"device2"},
-+        )
-+        self.env_assist.assert_reports([])
-+
-     def test_unfencing_failure(self):
-         err_msg = "stderr"
--        for old_dev in self.old_devices:
-+        for old_dev in self.check_devices:
-             self.config.runner.scsi.get_status(
-                 self.node, old_dev, name=f"runner.scsi.is_fenced.{old_dev}"
-             )
-@@ -98,7 +111,7 @@ class TestUnfenceNode(TestCase):
- 
-     def test_unfencing_skipped_devices_are_fenced(self):
-         stdout_off = "Status: OFF"
--        for old_dev in self.old_devices:
-+        for old_dev in self.check_devices:
-             self.config.runner.scsi.get_status(
-                 self.node,
-                 old_dev,
-@@ -116,7 +129,7 @@ class TestUnfenceNode(TestCase):
-             [
-                 fixture.info(
-                     report_codes.STONITH_UNFENCING_SKIPPED_DEVICES_FENCED,
--                    devices=sorted(self.old_devices),
-+                    devices=sorted(self.check_devices),
-                 )
-             ]
-         )
--- 
-2.31.1
-
diff --git a/bz2040420-01-fix-creating-empty-cib.patch b/bz2040420-01-fix-creating-empty-cib.patch
deleted file mode 100644
index 0039b3d..0000000
--- a/bz2040420-01-fix-creating-empty-cib.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 94d411afc37de231c8a3101c30e1e6ba66ecd223 Mon Sep 17 00:00:00 2001
-From: Tomas Jelinek <tojeline@redhat.com>
-Date: Thu, 13 Jan 2022 17:32:38 +0100
-Subject: [PATCH 4/4] fix creating empty cib
-
----
- pcs/utils.py                | 21 +++++++++++----------
- pcs_test/tier1/test_misc.py | 25 ++++++++++++++++++++++++-
- 2 files changed, 35 insertions(+), 11 deletions(-)
-
-diff --git a/pcs/utils.py b/pcs/utils.py
-index 2f5949a7..b5b8af05 100644
---- a/pcs/utils.py
-+++ b/pcs/utils.py
-@@ -2135,16 +2135,17 @@ def write_empty_cib(cibfile):
-     """
-     Commandline options: no options
-     """
--    empty_xml = """<?xml version="1.0" encoding="UTF-8"?>
--<cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2">
--  <configuration>
--    <crm_config/>
--    <nodes/>
--    <resources/>
--    <constraints/>
--  </configuration>
--  <status/>
--</cib>"""
-+    empty_xml = """
-+        <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-3.1">
-+          <configuration>
-+            <crm_config/>
-+            <nodes/>
-+            <resources/>
-+            <constraints/>
-+          </configuration>
-+          <status/>
-+        </cib>
-+    """
-     with open(cibfile, "w") as f:
-         f.write(empty_xml)
- 
-diff --git a/pcs_test/tier1/test_misc.py b/pcs_test/tier1/test_misc.py
-index 13312a69..abd02c61 100644
---- a/pcs_test/tier1/test_misc.py
-+++ b/pcs_test/tier1/test_misc.py
-@@ -1,8 +1,10 @@
-+import os
- from unittest import TestCase
- 
- from pcs_test.tools.assertions import AssertPcsMixin
- from pcs_test.tools.misc import (
-     get_test_resource as rc,
-+    get_tmp_dir,
-     get_tmp_file,
-     outdent,
-     write_file_to_tmpfile,
-@@ -19,7 +21,7 @@ class ParseArgvDashDash(TestCase, AssertPcsMixin):
-     cmd = "constraint colocation add R1 with R2".split()
- 
-     def setUp(self):
--        self.temp_cib = get_tmp_file("tier1_misc")
-+        self.temp_cib = get_tmp_file("tier1_misc_dashdash")
-         write_file_to_tmpfile(rc("cib-empty.xml"), self.temp_cib)
-         self.pcs_runner = PcsRunner(self.temp_cib.name)
-         self.allowed_roles = format_list(const.PCMK_ROLES)
-@@ -89,3 +91,24 @@ class ParseArgvDashDash(TestCase, AssertPcsMixin):
-                 """
-             ),
-         )
-+
-+
-+class EmptyCibIsPcmk2Compatible(TestCase, AssertPcsMixin):
-+    # This test verifies that a default empty CIB created by pcs when -f points
-+    # to an empty file conforms to minimal schema version supported by
-+    # pacemaker 2.0. If pcs prints a message that CIB schema has been upgraded,
-+    # then the test fails and shows there is a bug. Bundle with promoted-max
-+    # requires CIB compliant with schema 3.1, which was introduced in pacemaker
-+    # 2.0.0.
-+    def setUp(self):
-+        self.cib_dir = get_tmp_dir("tier1_misc_empty_cib")
-+        self.pcs_runner = PcsRunner(os.path.join(self.cib_dir.name, "cib.xml"))
-+
-+    def tearDown(self):
-+        self.cib_dir.cleanup()
-+
-+    def test_success(self):
-+        self.assert_pcs_success(
-+            "resource bundle create b container docker image=my.img promoted-max=1".split(),
-+            "",
-+        )
--- 
-2.31.1
-
diff --git a/bz2044409-01-fix-backend-parameter-all-in-cluster-destroy.patch b/bz2044409-01-fix-backend-parameter-all-in-cluster-destroy.patch
deleted file mode 100644
index 1131d7f..0000000
--- a/bz2044409-01-fix-backend-parameter-all-in-cluster-destroy.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From fa75f40361bc39cbd645b8014713e4c0ad0cda18 Mon Sep 17 00:00:00 2001
-From: Ivan Devat <idevat@redhat.com>
-Date: Mon, 24 Jan 2022 14:08:54 +0100
-Subject: [PATCH 2/2] fix backend parameter "all" in cluster destroy
-
----
- src/app/backend/calls/destroyCluster.ts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/app/backend/calls/destroyCluster.ts b/src/app/backend/calls/destroyCluster.ts
-index b6e83a41..cf41ea42 100644
---- a/src/app/backend/calls/destroyCluster.ts
-+++ b/src/app/backend/calls/destroyCluster.ts
-@@ -4,5 +4,5 @@ const { url } = endpoints.destroyCluster;
- 
- export const destroyCluster = (clusterName: string): CallResult =>
-   http.post(url({ clusterName }), {
--    params: [["--all", "1"]],
-+    params: [["all", "1"]],
-   });
--- 
-2.31.1
-
diff --git a/bz20486401-01-Fix-snmp-client.patch b/bz20486401-01-Fix-snmp-client.patch
deleted file mode 100644
index 63a05d5..0000000
--- a/bz20486401-01-Fix-snmp-client.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7902bb8fe7f97fbbc93e7001a6c4e8a445dcb44e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Valentin=20Vidi=C4=87?= <vvidic@valentin-vidic.from.hr>
-Date: Wed, 15 Dec 2021 20:32:26 +0100
-Subject: [PATCH 1/2] Fix snmp client
-
-Required constant is missing causing the command to fail on startup and breaking the pcs_snmp_agent service.
----
- pcsd/pcsd-cli-main.rb | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/pcsd/pcsd-cli-main.rb b/pcsd/pcsd-cli-main.rb
-index 29b9006d..be72d543 100644
---- a/pcsd/pcsd-cli-main.rb
-+++ b/pcsd/pcsd-cli-main.rb
-@@ -10,6 +10,7 @@ require 'remote.rb'
- 
- 
- PCS = get_pcs_path()
-+PCS_INTERNAL = get_pcs_internal_path()
- $logger_device = StringIO.new
- $logger = Logger.new($logger_device)
- early_log($logger)
--- 
-2.34.1
-
diff --git a/do-not-support-cluster-setup-with-udp-u-transport.patch b/do-not-support-cluster-setup-with-udp-u-transport.patch
index fa1ead6..ab241a5 100644
--- a/do-not-support-cluster-setup-with-udp-u-transport.patch
+++ b/do-not-support-cluster-setup-with-udp-u-transport.patch
@@ -1,4 +1,4 @@
-From 49d9c698697b0dd49f53b60340705b4fd656e248 Mon Sep 17 00:00:00 2001
+From 2a578689db8522971840dbb1644a21c341fe7d83 Mon Sep 17 00:00:00 2001
 From: Ivan Devat <idevat@redhat.com>
 Date: Tue, 20 Nov 2018 15:03:56 +0100
 Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
@@ -9,7 +9,7 @@ Subject: [PATCH] do not support cluster setup with udp(u) transport in RHEL9
  2 files changed, 3 insertions(+)
 
 diff --git a/pcs/pcs.8.in b/pcs/pcs.8.in
-index 0bbee071..ba14251d 100644
+index 363515bb..4c2496aa 100644
 --- a/pcs/pcs.8.in
 +++ b/pcs/pcs.8.in
 @@ -457,6 +457,8 @@ By default, encryption is enabled with cipher=aes256 and hash=sha256. To disable
@@ -22,10 +22,10 @@ index 0bbee071..ba14251d 100644
  .br
  Transport options are: ip_version, netmtu
 diff --git a/pcs/usage.py b/pcs/usage.py
-index bc885918..4e286f46 100644
+index cfa2ac9c..519c853e 100644
 --- a/pcs/usage.py
 +++ b/pcs/usage.py
-@@ -916,6 +916,7 @@ Commands:
+@@ -1429,6 +1429,7 @@ Commands:
              hash=sha256. To disable encryption, set cipher=none and hash=none.
  
          Transports udp and udpu:
@@ -34,5 +34,5 @@ index bc885918..4e286f46 100644
          support traffic encryption nor compression.
          Transport options are:
 -- 
-2.31.1
+2.35.1
 
diff --git a/fix-translating-resource-roles-in-colocation-constra.patch b/fix-translating-resource-roles-in-colocation-constra.patch
deleted file mode 100644
index a6cc80a..0000000
--- a/fix-translating-resource-roles-in-colocation-constra.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f759872276ed8ff04bbf05010c18bbe4d1abdb11 Mon Sep 17 00:00:00 2001
-From: Tomas Jelinek <tojeline@redhat.com>
-Date: Tue, 1 Feb 2022 16:10:35 +0100
-Subject: [PATCH 2/2] fix translating resource roles in colocation constraints
-
----
- pcs/lib/xml_tools.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/pcs/lib/xml_tools.py b/pcs/lib/xml_tools.py
-index 07752f92..6a652fd1 100644
---- a/pcs/lib/xml_tools.py
-+++ b/pcs/lib/xml_tools.py
-@@ -66,7 +66,7 @@ def export_attributes(
-     result = {str(key): str(value) for key, value in element.attrib.items()}
-     if not with_id:
-         result.pop("id", None)
--    for role_name in ("role", "rsc-role"):
-+    for role_name in ("role", "rsc-role", "with-rsc-role"):
-         if role_name in result:
-             result[role_name] = pacemaker.role.get_value_primary(
-                 const.PcmkRoleType(result[role_name].capitalize())
--- 
-2.34.1
-
diff --git a/pcs.spec b/pcs.spec
index 25b136b..8208b4b 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
-Version: 0.11.1
-Release: 11%{?dist}
+Version: 0.11.2
+Release: 1%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
@@ -9,7 +9,7 @@ Release: 11%{?dist}
 #      rack-test, sinatra, tilt
 # GPLv2 or Ruby: eventmachne
 # (GPLv2 or Ruby) and BSD: thin
-# BSD or Ruby: open4, rexml, ruby2_keywords, webrick
+# BSD or Ruby: open4, ruby2_keywords, webrick
 # BSD and MIT: ffi
 License: GPLv2 and ASL 2.0 and MIT and BSD and (GPLv2 or Ruby) and (BSD or Ruby)
 URL: https://github.com/ClusterLabs/pcs
@@ -18,14 +18,14 @@ Summary: Pacemaker Configuration System
 #building only for architectures with pacemaker and corosync available
 ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 
-%global version_or_commit %{version}
-# %%global version_or_commit %%{version}.210-9862
+# %%global version_or_commit %%{version}
+%global version_or_commit %{version}.44-9da7
 
 %global pcs_source_name %{name}-%{version_or_commit}
 
 # ui_commit can be determined by hash, tag or branch
-%global ui_commit 0.1.12
-%global ui_modules_version 0.1.12
+%global ui_commit 0.1.13
+%global ui_modules_version 0.1.13
 %global ui_src_name pcs-web-ui-%{ui_commit}
 
 %global pcs_snmp_pkg_name  pcs-snmp
@@ -33,20 +33,19 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global pyagentx_version   0.4.pcs.2
 %global tornado_version    6.1.0
 %global dacite_version  1.6.0
-%global version_rubygem_backports  3.17.2
-%global version_rubygem_daemons  1.3.1
-%global version_rubygem_ethon  0.12.0
+%global version_rubygem_backports  3.23.0
+%global version_rubygem_daemons  1.4.1
+%global version_rubygem_ethon  0.15.0
 %global version_rubygem_eventmachine  1.2.7
-%global version_rubygem_ffi  1.13.1
+%global version_rubygem_ffi  1.15.5
 %global version_rubygem_mustermann  1.1.1
 %global version_rubygem_open4  1.3.4
 %global version_rubygem_rack  2.2.3
 %global version_rubygem_rack_protection  2.2.0
 %global version_rubygem_rack_test  1.1.0
-%global version_rubygem_rexml  3.2.5
-%global version_rubygem_ruby2_keywords  0.0.2
+%global version_rubygem_ruby2_keywords  0.0.5
 %global version_rubygem_sinatra  2.2.0
-%global version_rubygem_thin  1.7.2
+%global version_rubygem_thin  1.8.1
 %global version_rubygem_tilt  2.0.10
 %global version_rubygem_webrick  1.7.0
 
@@ -81,7 +80,6 @@ Source44: https://github.com/konradhalas/dacite/archive/v%{dacite_version}/dacit
 Source81: https://rubygems.org/downloads/backports-%{version_rubygem_backports}.gem
 Source82: https://rubygems.org/downloads/ethon-%{version_rubygem_ethon}.gem
 Source83: https://rubygems.org/downloads/ffi-%{version_rubygem_ffi}.gem
-Source85: https://rubygems.org/downloads/rexml-%{version_rubygem_rexml}.gem
 Source86: https://rubygems.org/downloads/mustermann-%{version_rubygem_mustermann}.gem
 # We needed to re-upload open4 rubygem because of issues with sources in gating.
 # Unfortunately, there was no newer version available, therefore we had to
@@ -106,15 +104,6 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm
 # Z-streams are exception here: they can come from upstream but should be
 # applied at the end to keep z-stream changes as straightforward as possible.
 # Patch1: bzNUMBER-01-name.patch
-Patch2: bz2032473-01-fix-enabling-corosync-qdevice.patch
-Patch3: bz2019836-01-fix-rsc-update-cmd-when-unable-to-get-agent-metadata.patch
-Patch4: bz1811072-01-revert-of-disallowing-to-clone-a-group-with-a-stonit.patch
-Patch5: bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
-Patch6: Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
-Patch7: bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
-Patch8: bz2040420-01-fix-creating-empty-cib.patch
-Patch9: bz20486401-01-Fix-snmp-client.patch
-Patch10: fix-translating-resource-roles-in-colocation-constra.patch
 
 # Downstream patches do not come from upstream. They adapt pcs for specific
 # RHEL needs.
@@ -124,8 +113,6 @@ Patch1: do-not-support-cluster-setup-with-udp-u-transport.patch
 
 # ui patches: >200
 # Patch201: bzNUMBER-01-name.patch
-Patch201: simplify-ternar-expression.patch
-Patch202: bz2044409-01-fix-backend-parameter-all-in-cluster-destroy.patch
 
 # git for patches
 BuildRequires: git-core
@@ -154,8 +141,9 @@ BuildRequires: ruby >= 2.5
 BuildRequires: ruby-devel
 BuildRequires: rubygems
 BuildRequires: rubygem-bundler
-# ruby libraries for tests
 BuildRequires: rubygem-json
+BuildRequires: rubygem-rexml
+# ruby libraries for tests
 BuildRequires: rubygem-test-unit
 # for touching patch files (sanitization function)
 BuildRequires: diffstat
@@ -188,6 +176,7 @@ Requires: python3-cryptography
 Requires: ruby >= 2.5
 Requires: rubygems
 Requires: rubygem-json
+Requires: rubygem-rexml
 # for killall
 Requires: psmisc
 # cluster stack and related packages
@@ -221,7 +210,6 @@ Provides: bundled(open4) = %{version_rubygem_open4}
 Provides: bundled(rack) = %{version_rubygem_rack}
 Provides: bundled(rack_protection) = %{version_rubygem_rack_protection}
 Provides: bundled(rack_test) = %{version_rubygem_rack_test}
-Provides: bundled(rexml) = %{version_rubygem_rexml}
 Provides: bundled(ruby2_keywords) = %{version_rubygem_ruby2_keywords}
 Provides: bundled(sinatra) = %{version_rubygem_sinatra}
 Provides: bundled(thin) = %{version_rubygem_thin}
@@ -326,7 +314,6 @@ mkdir -p %{rubygem_cache_dir}
 cp -f %SOURCE81 %{rubygem_cache_dir}
 cp -f %SOURCE82 %{rubygem_cache_dir}
 cp -f %SOURCE83 %{rubygem_cache_dir}
-cp -f %SOURCE85 %{rubygem_cache_dir}
 cp -f %SOURCE86 %{rubygem_cache_dir}
 # For reason why we are renaming open4 rubygem, see comment of source
 # definition above.
@@ -385,7 +372,6 @@ mv %{rubygem_bundle_dir}/gems/ffi-%{version_rubygem_ffi}/LICENSE.SPECS ffi_LICEN
 mv %{rubygem_bundle_dir}/gems/mustermann-%{version_rubygem_mustermann}/LICENSE mustermann_LICENSE
 mv %{rubygem_bundle_dir}/gems/open4-%{version_rubygem_open4}/LICENSE open4_LICENSE
 mv %{rubygem_bundle_dir}/gems/rack-%{version_rubygem_rack}/MIT-LICENSE rack_MIT-LICENSE
-mv %{rubygem_bundle_dir}/gems/rexml-%{version_rubygem_rexml}/LICENSE.txt rexml_LICENSE.txt
 mv %{rubygem_bundle_dir}/gems/rack-protection-%{version_rubygem_rack_protection}/License rack-protection_License
 mv %{rubygem_bundle_dir}/gems/rack-test-%{version_rubygem_rack_test}/MIT-LICENSE.txt rack-test_MIT-LICENSE.txt
 mv %{rubygem_bundle_dir}/gems/sinatra-%{version_rubygem_sinatra}/LICENSE sinatra_LICENSE
@@ -513,7 +499,6 @@ run_all_tests
 %license rack_MIT-LICENSE
 %license rack-protection_License
 %license rack-test_MIT-LICENSE.txt
-%license rexml_LICENSE.txt
 %license sinatra_LICENSE
 %license tilt_COPYING
 %license webrick_LICENSE.txt
@@ -557,6 +542,13 @@ run_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Thu May 19 2022 Miroslav Lisik <mlisik@redhat.com> - 0.11.2-1
+- Rebased to latest upstream sources (see CHANGELOG.md)
+- Updated pcs-web-ui
+- Updated bundled rubygems: backports, daemons, ethon ffi, ruby2_keywords, thin
+- Stopped bundling rubygem-rexml (use distribution package instead)
+- Resolves: rhbz#1301204 rhbz#2024522 rhbz#2026725 rhbz#2029844 rhbz#2039884 rhbz#2053177 rhbz#2054671 rhbz#2058243 rhbz#2058246 rhbz#2058247 rhbz#2058251 rhbz#2058252 rhbz#2059142 rhbz#2059145 rhbz#2059148 rhbz#2059149 rhbz#2059501 rhbz#2064818 rhbz#2068457 rhbz#2076585
+
 * Wed May 04 2022 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-11
 - Updated bundled rubygems: sinatra, rack-protection
 - Resolves: rhbz#2081334
diff --git a/simplify-ternar-expression.patch b/simplify-ternar-expression.patch
deleted file mode 100644
index 0835fbd..0000000
--- a/simplify-ternar-expression.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From f44cdc871a39da3960bd04565b4d1d5ffa19bd23 Mon Sep 17 00:00:00 2001
-From: Ivan Devat <idevat@redhat.com>
-Date: Thu, 20 Jan 2022 13:32:49 +0100
-Subject: [PATCH 1/2] simplify ternar expression
-
-The motivation for this is that covscan complains about it.
----
- src/app/view/share/useUrlTabs.ts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/app/view/share/useUrlTabs.ts b/src/app/view/share/useUrlTabs.ts
-index 7278dad8..a1136bf3 100644
---- a/src/app/view/share/useUrlTabs.ts
-+++ b/src/app/view/share/useUrlTabs.ts
-@@ -13,7 +13,7 @@ export const useUrlTabs = <TABS extends ReadonlyArray<string>>(
- 
-   return {
-     currentTab,
--    matchedContext: tab !== null ? tab.matched : `/${defaultTab}`,
-+    matchedContext: tab?.matched ?? `/${defaultTab}`,
-     tabList,
-   };
- };
--- 
-2.31.1
-
diff --git a/sources b/sources
index 2ce3199..fb9b789 100644
--- a/sources
+++ b/sources
@@ -1,22 +1,21 @@
 SHA512 (pyagentx-0.4.pcs.2.tar.gz) = d4194fec9a3e5fefe3793d49b7fec1feafef294c7e613a06046c2993daeefc5cb39d7c5b2b402ff83e49b2d976953f862264288c758c0be09d997b5323cc558a
 SHA512 (open4-1.3.4-1.gem) = 838a18efcd093d55d9589ff9d5c11054618abef863224c2d9b31445dc735218c2f96d954040e2d3f8d5aab0140e54b627fcc4a1b01c17e59267402a2abdd8efb
-SHA512 (daemons-1.3.1.gem) = eede065019b5e251e5b7d0959251c8591ec8c38ada6861a1c41cf85959666a4865efc69178f63bf2acfc1e993c8222d581ac5d689be439744ee3cef0ca6f5138
 SHA512 (eventmachine-1.2.7.gem) = fdbcf9fc933e2414e70f8f48153e9ba6ed7a0029cdf49cdcb4ab72ab26683e727a36c099f017f20681f9c361179461743e501278ca9bd5612e693e26867cc516
-SHA512 (thin-1.7.2.gem) = e9e0ad3dab77a1c6f3e413ce7ed1598da0db5fa62355a1fbbc73153d2fd810d82d5bf2e6a434429912eb885c263c674364a5dec7d878960e2dbef37ccbe1472b
-SHA512 (ethon-0.12.0.gem) = 5fea666efdd5e2d568d0e074f205525656e202ecea3bb5ff8a8ab838a596cab349b869baffb7926227d6cfdae5b9c1cb86bb201b4c9585056c6671ab4feee596
-SHA512 (ffi-1.13.1.gem) = 4c0b5086463c5abedc440c44fb12c62612627a2aaad60b1959ea8831d4ec2bbe3217fec0b63612730bb219748fd2bd2252dd615ca0305fb7f0e8456c63c31fbd
 SHA512 (mustermann-1.1.1.gem) = 55d5fd9b8309e0b806b2fb0af409fbc71b958b8f91116991439f2c66b1f71f17647a61020b0349a86132e7d3da383121719ea330538abb8f3c8bef5fbff0b747
 SHA512 (rack-test-1.1.0.gem) = 16e291fa5a88b6866e8057b4bf1aae4ffe17dd9b0300c1ee36632c5b21ff2075cb4356f6f78437dd84ea76047a5d3abe3dda087a2c154f5e5712e62d7e57fdc9
-SHA512 (ruby2_keywords-0.0.2.gem) = a7bc02980e073a899bf3de2e32711ca9820657d43cc44dede44ca31681d8586e7f808a93b6f6778aaaaf8b84da37a48c8062e69ca33477d9469e9634d616ed8d
 SHA512 (tilt-2.0.10.gem) = d2e0e1976da24ea4d8581d29a3ac2c0772c2e42f1cd04c48f1e3c1745a14d7cd319f14cead3e5341ec0f6c07aa216b50c29ad96984a85a9757ff9f7cc89b80df
-SHA512 (backports-3.17.2.gem) = e860e4c1784b49e81294ce0bdd27226e28bbec9163398d79206c8dced3324c7625bf75c5ccf09bbcee4cf7bfa96371f37572e6d2d8a22dd2204a441eccd716fb
 SHA512 (rack-2.2.3.gem) = aabda2ac4aeea6b119c5d570a6c36b5c114f879cc73678a6f385b71f2191501a86adc3bed6f0e0bacfc1e4c48c2374714588669ede898053dc7719899bf71635
 SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de71302a5b4d35be8c02afbc9820728efa912e62e1cbbfad8f92360261a69e0c8759f9e6cb477fbca31c7
 SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da
 SHA512 (webrick-1.7.0.gem) = 5f242b50300046fe7c22ecd1640a73e5815e05a72bedfebe6bc39c24c92bd61abdd180860de0d194c0eebbc640b507b6892de181d3b577c5372ace0ca6faf2a3
-SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931
-SHA512 (pcs-0.11.1.tar.gz) = 24fdcf027965c99534d1cd411d5517a1446f633d80a1ccb9dc6be95adda8a81f0ef74df94bb433296b3e9a90b8b96ab318c75473efdc53fe48446fd0d9c9f3da
-SHA512 (pcs-web-ui-0.1.12.tar.gz) = 0c1e3e71ce4cf5a1a39319b379985267642ed36d54bc18c6b0c4c5c9f8cd24e59c4f6137a64ffe704fe22a056960c3a205308dba17060680f3bbd92abe9ab9f4
-SHA512 (pcs-web-ui-node-modules-0.1.12.tar.xz) = 4f72f5f239613ab93ce1f32126050fae1b1c00ec3b73799a1ace3687c1a35370168ff1b6e070c2b661ece84e3ed4463189453247a2799f20dac1028b0c9b83f6
 SHA512 (sinatra-2.2.0.gem) = 4cd5da37b6c7f03bff7f66d99e07b55aea0dfeda54782fdf38b36fad43147745a3040d7c7aaf4bcb3cd86c6aad7308113c0f86e453488cd4e5d8eac00b04fce1
 SHA512 (rack-protection-2.2.0.gem) = 06d6c2026e3e93131a2405bbaa8a514ddde48607979828b9fc41309dbdfff2b7c8cac48a6981e76b5dda554f0cbdc7c6ff5f44b8925fce1cb9b7de0a16380ca4
+SHA512 (backports-3.23.0.gem) = b6d721a2925a932e451437938e01c6e3f4ac08bafac975063963f7866e17015abfeb6862face89cbd08caf479db75eb085f540263ba251a87c6acc7611ba6d40
+SHA512 (daemons-1.4.1.gem) = c057a7cbafc16f9daa073ce9fd5680f5f978826554073f4e77f2b284aee73567253d471224109d060193572f313e5eaa1509a2113a1564c1508969f658c045c5
+SHA512 (ethon-0.15.0.gem) = 6e04c70e105fb95f1e0ff62e1d6ae009bb7b39a60d85ec9e43b10c016f33f679620ded253089a738e0cef5010e9023d1093dd92b1caacdde8f6a745cbae2b5b5
+SHA512 (ffi-1.15.5.gem) = 074df34edffc7038ab08199350a97b32280d61ea15dd85d459b008bd3363ec5403b4e533621c8e460e5288f01fec944bff9b149851b819e85bab75ad2362227c
+SHA512 (ruby2_keywords-0.0.5.gem) = f6b9078b111e68c0017e0025ecdccb976c7a32f35c1a8adf9fd879db0c91f89eb9bd799f9527a846e28056f2a5fbf0f3610cda9538570288c493613c35c83a6f
+SHA512 (thin-1.8.1.gem) = c200ea03b7876b2a17b5875557fa967b8d01db20cc401811f314f3285f8249b8793e4709b7bc033a9c5813b9a51e3093c55f717b4a98b8fda171aa82813b7419
+SHA512 (pcs-0.11.2.44-9da7.tar.gz) = 1bacfdb991f6f954f1094f5a62bcc8df4b228dbf8b80952fb9750ecf651123065bf28274b2d742e74cea9535e5003d0bd42560dea992289190fc5bc91b2dd981
+SHA512 (pcs-web-ui-node-modules-0.1.13.tar.xz) = 5e56644d6a4444856e5b15d0717aad9f12249bf365af50a0509fe29c0945fc94b8b26cb1a71231836dcc6c310ba91f1921086012ade073ed6c05715e6ca44983
+SHA512 (pcs-web-ui-0.1.13.tar.gz) = e8ccb07467f0c5d959f8ba1d541615836e9c88dc5793b3dfd1bee14cf96c4107a90251026f26e5dd0cf3d9ceb285c4da4b25dd77f3f0971e0d2c7d15899bce88