import pcs-0.11.1-10.el9

.gitignore

@@ -7,8 +7,8 @@ SOURCES/ffi-1.13.1.gem
 SOURCES/mustermann-1.1.1.gem
 SOURCES/open4-1.3.4-1.gem
 SOURCES/pcs-0.11.1.tar.gz
-SOURCES/pcs-web-ui-0.1.11.tar.gz
+SOURCES/pcs-web-ui-0.1.12.tar.gz
-SOURCES/pcs-web-ui-node-modules-0.1.11.tar.xz
+SOURCES/pcs-web-ui-node-modules-0.1.12.tar.xz
 SOURCES/pyagentx-0.4.pcs.2.tar.gz
 SOURCES/rack-2.2.3.gem
 SOURCES/rack-protection-2.0.8.1.gem

.pcs.metadata

@@ -7,8 +7,8 @@ cfa25e7a3760c3ec16723cb8263d9b7a52d0eadf SOURCES/ffi-1.13.1.gem
 50a4e37904485810cb05e27d75c9783e5a8f3402 SOURCES/mustermann-1.1.1.gem
 41a7fe9f8e3e02da5ae76c821b89c5b376a97746 SOURCES/open4-1.3.4-1.gem
 47d8d30bf502ff2a6a81c6cebc262fc272b48011 SOURCES/pcs-0.11.1.tar.gz
-84f87804814a2f97aa9b9a33ca47f43fd6198097 SOURCES/pcs-web-ui-0.1.11.tar.gz
+a29bfd22130ac978c5d4a6a82108ce37ad2a5db9 SOURCES/pcs-web-ui-0.1.12.tar.gz
-769c4b1abe37b44673e92c90c29d32fe9240fbc1 SOURCES/pcs-web-ui-node-modules-0.1.11.tar.xz
+c9723466d7bfb353899307a5700177f47e7e6cff SOURCES/pcs-web-ui-node-modules-0.1.12.tar.xz
 3176b2f2b332c2b6bf79fe882e83feecf3d3f011 SOURCES/pyagentx-0.4.pcs.2.tar.gz
 345b7169d4d2d62176a225510399963bad62b68f SOURCES/rack-2.2.3.gem
 1f046e23baca8beece3b38c60382f44aa2b2cb41 SOURCES/rack-protection-2.0.8.1.gem

SOURCES/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
+

SOURCES/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
+

SOURCES/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
+

SOURCES/bz2044409-01-fix-backend-parameter-all-in-cluster-destroy.patch

@@ -0,0 +1,23 @@
+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
+

SOURCES/bz20486401-01-Fix-snmp-client.patch

@@ -0,0 +1,25 @@
+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
+

SOURCES/fix-translating-resource-roles-in-colocation-constra.patch

@@ -0,0 +1,25 @@
+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
+

SOURCES/simplify-ternar-expression.patch

@@ -0,0 +1,26 @@
+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
+

SPECS/pcs.spec

@@ -1,6 +1,6 @@
 Name: pcs
 Version: 0.11.1
-Release: 7%{?dist}
+Release: 10%{?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_commit 0.1.12
-%global ui_modules_version 0.1.11
+%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,12 @@ 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
+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.
@@ -118,6 +124,8 @@ 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
@@ -293,6 +301,8 @@ update_times_patch(){
 %autosetup -D -T -b 100 -a 101 -S git -n %{ui_src_name} -N
 %autopatch -p1 -m 201
 # update_times_patch %%{PATCH201}
+update_times_patch %{PATCH201}
+update_times_patch %{PATCH202}
 
 # patch pcs sources
 %autosetup -S git -n %{pcs_source_name} -N
@@ -301,6 +311,12 @@ 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}
+update_times_patch %{PATCH9}
+update_times_patch %{PATCH10}
 
 # prepare dirs/files necessary for building all bundles
 # -----------------------------------------------------
@@ -541,6 +557,24 @@ run_all_tests
 %license pyagentx_LICENSE.txt
 
 %changelog
+* Tue Feb 01 2022 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-10
+- Fixed snmp client
+- Fixed translating resource roles in colocation constraint
+- Resolves: rhbz#2048640
+
+* Tue Jan 25 2022 Miroslav Lisik <mlisik@redhat.com> - 0.11.1-9
+- Fixed cluster destroy in web ui
+- Fixed covscan issue in web ui
+- Resolves: rhbz#2044409
+
+* 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