From a4dcfd9e5ce9124d681ea9508bdbcceb3c6b1394 Mon Sep 17 00:00:00 2001
From: Miroslav Lisik <mlisik@redhat.com>
Date: Fri, 14 Jan 2022 12:24:28 +0100
Subject: [PATCH] Resolves: rhbz#1990787 rhbz#2033248 rhbz#2039883 rhbz#2040420

- Fixed 'pcs resource move' command
- Fixed removing of unavailable fence-scsi storage device
- Fixed ocf validation of ocf linbit drdb agent
- Fixed creating empty cib
- Updated pcs-web-ui
---
 .gitignore                                    |    2 +
 ...inbit-drbd-agent-pass-OCF-validation.patch |   41 +
 ...e-fixes-in-pcs-resource-move-command.patch | 1056 +++++++++++++++++
 ...ecking-of-scsi-devices-to-be-removed.patch |   86 ++
 bz2040420-01-fix-creating-empty-cib.patch     |   94 ++
 pcs.spec                                      |   22 +-
 sources                                       |    4 +-
 7 files changed, 1300 insertions(+), 5 deletions(-)
 create mode 100644 Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
 create mode 100644 bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
 create mode 100644 bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
 create mode 100644 bz2040420-01-fix-creating-empty-cib.patch

diff --git a/.gitignore b/.gitignore
index 596f7ea..b9aa8af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -151,3 +151,5 @@
 /pcs-web-ui-0.1.11.tar.gz
 /pcs-web-ui-node-modules-0.1.11.tar.xz
 /pcs-0.11.1.tar.gz
+/pcs-web-ui-0.1.12.tar.gz
+/pcs-web-ui-node-modules-0.1.12.tar.xz
diff --git a/Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch b/Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
new file mode 100644
index 0000000..15a7ab4
--- /dev/null
+++ b/Make-ocf-linbit-drbd-agent-pass-OCF-validation.patch
@@ -0,0 +1,41 @@
+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/bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch b/bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
new file mode 100644
index 0000000..b304d91
--- /dev/null
+++ b/bz1990787-01-Multiple-fixes-in-pcs-resource-move-command.patch
@@ -0,0 +1,1056 @@
+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/bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch b/bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
new file mode 100644
index 0000000..277e1a8
--- /dev/null
+++ b/bz2033248-01-skip-checking-of-scsi-devices-to-be-removed.patch
@@ -0,0 +1,86 @@
+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
new file mode 100644
index 0000000..0039b3d
--- /dev/null
+++ b/bz2040420-01-fix-creating-empty-cib.patch
@@ -0,0 +1,94 @@
+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/pcs.spec b/pcs.spec
index ae3719c..d660987 100644
--- a/pcs.spec
+++ b/pcs.spec
@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.11.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 # https://docs.fedoraproject.org/en-US/packaging-guidelines/LicensingGuidelines/
 # https://fedoraproject.org/wiki/Licensing:Main?rd=Licensing#Good_Licenses
 # GPLv2: pcs
@@ -24,8 +24,8 @@ ExclusiveArch: i686 x86_64 s390x ppc64le aarch64
 %global pcs_source_name %{name}-%{version_or_commit}
 
 # ui_commit can be determined by hash, tag or branch
-%global ui_commit 0.1.11
-%global ui_modules_version 0.1.11
+%global ui_commit 0.1.12
+%global ui_modules_version 0.1.12
 %global ui_src_name pcs-web-ui-%{ui_commit}
 
 %global pcs_snmp_pkg_name  pcs-snmp
@@ -109,6 +109,10 @@ Source101: https://github.com/ClusterLabs/pcs-web-ui/releases/download/%{ui_comm
 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
 
 # Downstream patches do not come from upstream. They adapt pcs for specific
 # RHEL needs.
@@ -301,6 +305,10 @@ update_times_patch %{PATCH1}
 update_times_patch %{PATCH2}
 update_times_patch %{PATCH3}
 update_times_patch %{PATCH4}
+update_times_patch %{PATCH5}
+update_times_patch %{PATCH6}
+update_times_patch %{PATCH7}
+update_times_patch %{PATCH8}
 
 # prepare dirs/files necessary for building all bundles
 # -----------------------------------------------------
@@ -541,6 +549,14 @@ run_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Fri Jan 14 2022 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-8
+- Fixed 'pcs resource move' command
+- Fixed removing of unavailable fence-scsi storage device
+- Fixed ocf validation of ocf linbit drdb agent
+- Fixed creating empty cib
+- Updated pcs-web-ui
+- Resolves: rhbz#1990787 rhbz#2033248 rhbz#2039883 rhbz#2040420
+
 * Wed Dec 15 2021 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-7
 - Fixed enabling corosync-qdevice
 - Fixed resource update command when unable to get agent metadata
diff --git a/sources b/sources
index d62a121..8c6db04 100644
--- a/sources
+++ b/sources
@@ -17,6 +17,6 @@ SHA512 (tornado-6.1.0.tar.gz) = bd161a1c30f40f983d608297bca113735cb4baad255de713
 SHA512 (dacite-1.6.0.tar.gz) = 034255f095589d309fe5805413d8b148f430cd20a0de305b7954083b530d516da1d8f3f00ebb5264a8cfb77f2b2a76f1e2d863e78bd191f1d85021c5553815da
 SHA512 (webrick-1.7.0.gem) = 5f242b50300046fe7c22ecd1640a73e5815e05a72bedfebe6bc39c24c92bd61abdd180860de0d194c0eebbc640b507b6892de181d3b577c5372ace0ca6faf2a3
 SHA512 (rexml-3.2.5.gem) = 1e3838d4a5befa76137fb8fea6a20195490645aa2b1c5d14d1eeca6c093d7f64eb405f07fd07b00fcafa9606dc78f9f0a488012338f81414623feb6e8cb83931
-SHA512 (pcs-web-ui-node-modules-0.1.11.tar.xz) = 9d11d3549480a92f839b93427544f2aadc115ba4f9a0f0c672cc0d54a7a5813ced43e34dc81dfed4f77ded25664a3cccc4a85f33b3454c85d4369c8f98e71c9e
 SHA512 (pcs-0.11.1.tar.gz) = 24fdcf027965c99534d1cd411d5517a1446f633d80a1ccb9dc6be95adda8a81f0ef74df94bb433296b3e9a90b8b96ab318c75473efdc53fe48446fd0d9c9f3da
-SHA512 (pcs-web-ui-0.1.11.tar.gz) = f668bf29a8c4d5714e3d560779221672289d5bdfc6a1f68d124ec511c38053eab4526df258d29c25243413280ab1189709270a5ee51d9d3c42f556d3b5648d72
+SHA512 (pcs-web-ui-0.1.12.tar.gz) = 0c1e3e71ce4cf5a1a39319b379985267642ed36d54bc18c6b0c4c5c9f8cd24e59c4f6137a64ffe704fe22a056960c3a205308dba17060680f3bbd92abe9ab9f4
+SHA512 (pcs-web-ui-node-modules-0.1.12.tar.xz) = 4f72f5f239613ab93ce1f32126050fae1b1c00ec3b73799a1ace3687c1a35370168ff1b6e070c2b661ece84e3ed4463189453247a2799f20dac1028b0c9b83f6