From db1a118ed0d36633c67513961b479f8fae3cc2b9 Mon Sep 17 00:00:00 2001

From: Ivan Devat <idevat@redhat.com>

Date: Thu, 15 Jun 2017 11:46:12 +0200

Subject: [PATCH] squash bz1447910 bundle resources are missing meta

d21dd0e6b4d3 make resource enable | disable work with bundles

27d46c115210 make resource manage | unmanage work with bundles

c963cdcd321b show bundles' meta attributes in resources listing

f1923af76d73 support meta attributes in 'resource bundle create'

e09015ee868a support meta attributes in 'resource bundle update'

c6e70a38346a stop bundles when deleting them

---

 pcs/cli/resource/parse_args.py                     |   4 +-

 pcs/cli/resource/test/test_parse_args.py           |  70 ++++++++

 pcs/lib/cib/nvpair.py                              |  12 +-

 pcs/lib/cib/resource/bundle.py                     |  17 +-

 pcs/lib/cib/resource/common.py                     |  40 +++--

 pcs/lib/cib/test/test_nvpair.py                    |  42 +++++

 pcs/lib/cib/test/test_resource_common.py           |  16 +-

 pcs/lib/cib/tools.py                               |  10 +-

 pcs/lib/commands/resource.py                       |  86 +++++++---

 pcs/lib/commands/test/resource/fixture.py          |   2 +-

 .../commands/test/resource/test_bundle_create.py   | 179 +++++++++++++++----

 .../commands/test/resource/test_bundle_update.py   | 102 ++++++++++-

 .../test/resource/test_resource_enable_disable.py  |  93 ++++++++--

 .../test/resource/test_resource_manage_unmanage.py | 189 +++++++++++++++++++--

 pcs/lib/pacemaker/state.py                         |  40 ++++-

 pcs/lib/pacemaker/test/test_state.py               | 108 +++++++++++-

 pcs/pcs.8                                          |   6 +-

 pcs/resource.py                                    |  99 ++++++++---

 pcs/test/cib_resource/test_bundle.py               |  67 ++++++++

 pcs/test/cib_resource/test_manage_unmanage.py      |   5 +-

 pcs/test/test_resource.py                          |  40 +++--

 pcs/usage.py                                       |   9 +-

 22 files changed, 1055 insertions(+), 181 deletions(-)

diff --git a/pcs/cli/resource/parse_args.py b/pcs/cli/resource/parse_args.py

index 19ee8f9..366acac 100644

--- a/pcs/cli/resource/parse_args.py

+++ b/pcs/cli/resource/parse_args.py

@@ -58,7 +58,7 @@ def parse_create(arg_list):

 def _parse_bundle_groups(arg_list):

     repeatable_keyword_list = ["port-map", "storage-map"]

-    keyword_list = ["container", "network"] + repeatable_keyword_list

+    keyword_list = ["meta", "container", "network"] + repeatable_keyword_list

     groups = group_by_keywords(

         arg_list,

         set(keyword_list),

@@ -99,6 +99,7 @@ def parse_bundle_create_options(arg_list):

             prepare_options(storage_map)

             for storage_map in groups.get("storage-map", [])

         ],

+        "meta": prepare_options(groups.get("meta", []))

     }

     if not parts["container_type"]:

         parts["container_type"] = "docker"

@@ -144,6 +145,7 @@ def parse_bundle_update_options(arg_list):

         "port_map_remove": port_map["remove"],

         "storage_map_add": storage_map["add"],

         "storage_map_remove": storage_map["remove"],

+        "meta": prepare_options(groups.get("meta", []))

     }

     return parts

diff --git a/pcs/cli/resource/test/test_parse_args.py b/pcs/cli/resource/test/test_parse_args.py

index 5033ec7..0c936cc 100644

--- a/pcs/cli/resource/test/test_parse_args.py

+++ b/pcs/cli/resource/test/test_parse_args.py

@@ -220,6 +220,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -235,6 +236,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -247,6 +249,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -259,6 +262,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -280,6 +284,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {"a": "b", "c": "d"},

                 "port_map": [],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -309,6 +314,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [{"a": "b", "c": "d"}],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -321,6 +327,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [{"a": "b", "c": "d"}, {"e": "f"}],

                 "storage_map": [],

+                "meta": {},

             }

         )

@@ -347,6 +354,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [],

                 "storage_map": [{"a": "b", "c": "d"}],

+                "meta": {},

             }

         )

@@ -359,6 +367,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {},

                 "port_map": [],

                 "storage_map": [{"a": "b", "c": "d"}, {"e": "f"}],

+                "meta": {},

             }

         )

@@ -368,6 +377,28 @@ class ParseBundleCreateOptions(TestCase):

     def test_storage_map_missing_key(self):

         self.assert_raises_cmdline(["storage-map", "=b", "c=d"])

+    def test_meta(self):

+        self.assert_produce(

+            ["meta", "a=b", "c=d"],

+            {

+                "container_type": "docker",

+                "container": {},

+                "network": {},

+                "port_map": [],

+                "storage_map": [],

+                "meta": {"a": "b", "c": "d"},

+            }

+        )

+

+    def test_meta_empty(self):

+        self.assert_raises_cmdline(["meta"])

+

+    def test_meta_missing_value(self):

+        self.assert_raises_cmdline(["meta", "a", "c=d"])

+

+    def test_meta_missing_key(self):

+        self.assert_raises_cmdline(["meta", "=b", "c=d"])

+

     def test_all(self):

         self.assert_produce(

             [

@@ -377,6 +408,7 @@ class ParseBundleCreateOptions(TestCase):

                 "port-map", "m=n", "o=p",

                 "storage-map", "q=r", "s=t",

                 "storage-map", "u=v", "w=x",

+                "meta", "y=z", "A=B",

             ],

             {

                 "container_type": "lxc",

@@ -384,6 +416,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {"e": "f", "g": "h"},

                 "port_map": [{"i": "j", "k": "l"}, {"m": "n", "o": "p"}],

                 "storage_map": [{"q": "r", "s": "t"}, {"u": "v", "w": "x"}],

+                "meta": {"y": "z", "A": "B"},

             }

         )

@@ -391,11 +424,13 @@ class ParseBundleCreateOptions(TestCase):

         self.assert_produce(

             [

                 "storage-map", "q=r", "s=t",

+                "meta", "y=z",

                 "port-map", "i=j", "k=l",

                 "network", "e=f",

                 "container", "lxc", "a=b",

                 "storage-map", "u=v", "w=x",

                 "port-map", "m=n", "o=p",

+                "meta", "A=B",

                 "network", "g=h",

                 "container", "c=d",

             ],

@@ -405,6 +440,7 @@ class ParseBundleCreateOptions(TestCase):

                 "network": {"e": "f", "g": "h"},

                 "port_map": [{"i": "j", "k": "l"}, {"m": "n", "o": "p"}],

                 "storage_map": [{"q": "r", "s": "t"}, {"u": "v", "w": "x"}],

+                "meta": {"y": "z", "A": "B"},

             }

         )

@@ -432,6 +468,7 @@ class ParseBundleUpdateOptions(TestCase):

                 "port_map_remove": [],

                 "storage_map_add": [],

                 "storage_map_remove": [],

+                "meta": {},

             }

         )

@@ -445,6 +482,7 @@ class ParseBundleUpdateOptions(TestCase):

                 "port_map_remove": [],

                 "storage_map_add": [],

                 "storage_map_remove": [],

+                "meta": {},

             }

         )

@@ -467,6 +505,7 @@ class ParseBundleUpdateOptions(TestCase):

                 "port_map_remove": [],

                 "storage_map_add": [],

                 "storage_map_remove": [],

+                "meta": {},

             }

         )

@@ -519,6 +558,7 @@ class ParseBundleUpdateOptions(TestCase):

                 "port_map_remove": ["c", "d", "i"],

                 "storage_map_add": [],

                 "storage_map_remove": [],

+                "meta": {},

             }

         )

@@ -562,9 +602,34 @@ class ParseBundleUpdateOptions(TestCase):

                     {"e": "f", "g": "h",},

                 ],

                 "storage_map_remove": ["c", "d", "i"],

+                "meta": {},

+            }

+        )

+

+    def test_meta(self):

+        self.assert_produce(

+            ["meta", "a=b", "c=d"],

+            {

+                "container": {},

+                "network": {},

+                "port_map_add": [],

+                "port_map_remove": [],

+                "storage_map_add": [],

+                "storage_map_remove": [],

+                "meta": {"a": "b", "c": "d"},

             }

         )

+    def test_meta_empty(self):

+        self.assert_raises_cmdline(["meta"])

+

+    def test_meta_missing_value(self):

+        self.assert_raises_cmdline(["meta", "a", "c=d"])

+

+    def test_meta_missing_key(self):

+        self.assert_raises_cmdline(["meta", "=b", "c=d"])

+

+

     def test_all(self):

         self.assert_produce(

             [

@@ -578,6 +643,7 @@ class ParseBundleUpdateOptions(TestCase):

                 "storage-map", "add", "v=w",

                 "storage-map", "remove", "x", "y",

                 "storage-map", "remove", "z",

+                "meta", "A=B", "C=D",

             ],

             {

                 "container": {"a": "b", "c": "d"},

@@ -592,6 +658,7 @@ class ParseBundleUpdateOptions(TestCase):

                     {"v": "w"},

                 ],

                 "storage_map_remove": ["x", "y", "z"],

+                "meta": {"A": "B", "C": "D"},

             }

         )

@@ -599,11 +666,13 @@ class ParseBundleUpdateOptions(TestCase):

         self.assert_produce(

             [

                 "storage-map", "remove", "x", "y",

+                "meta", "A=B",

                 "port-map", "remove", "o", "p",

                 "network", "e=f", "g=h",

                 "storage-map", "add", "r=s", "t=u",

                 "port-map", "add", "i=j", "k=l",

                 "container", "a=b", "c=d",

+                "meta", "C=D",

                 "port-map", "remove", "q",

                 "storage-map", "remove", "z",

                 "storage-map", "add", "v=w",

@@ -622,6 +691,7 @@ class ParseBundleUpdateOptions(TestCase):

                     {"v": "w"},

                 ],

                 "storage_map_remove": ["x", "y", "z"],

+                "meta": {"A": "B", "C": "D"},

             }

         )

diff --git a/pcs/lib/cib/nvpair.py b/pcs/lib/cib/nvpair.py

index 261d17c..d3f5a5c 100644

--- a/pcs/lib/cib/nvpair.py

+++ b/pcs/lib/cib/nvpair.py

@@ -11,18 +11,19 @@ from functools import partial

 from pcs.lib.cib.tools import create_subelement_id

 from pcs.lib.xml_tools import get_sub_element

-def _append_new_nvpair(nvset_element, name, value):

+def _append_new_nvpair(nvset_element, name, value, id_provider=None):

     """

     Create nvpair with name and value as subelement of nvset_element.

     etree.Element nvset_element is context of new nvpair

     string name is name attribute of new nvpair

     string value is value attribute of new nvpair

+    IdProvider id_provider -- elements' ids generator

     """

     etree.SubElement(

         nvset_element,

         "nvpair",

-        id=create_subelement_id(nvset_element, name),

+        id=create_subelement_id(nvset_element, name, id_provider),

         name=name,

         value=value

     )

@@ -73,7 +74,7 @@ def arrange_first_nvset(tag_name, context_element, nvpair_dict):

     update_nvset(nvset_element, nvpair_dict)

-def append_new_nvset(tag_name, context_element, nvpair_dict):

+def append_new_nvset(tag_name, context_element, nvpair_dict, id_provider=None):

     """

     Append new nvset_element comprising nvpairs children (corresponding

     nvpair_dict) to the context_element

@@ -81,12 +82,13 @@ def append_new_nvset(tag_name, context_element, nvpair_dict):

     string tag_name should be "instance_attributes" or "meta_attributes"

     etree.Element context_element is element where new nvset will be appended

     dict nvpair_dict contains source for nvpair children

+    IdProvider id_provider -- elements' ids generator

     """

     nvset_element = etree.SubElement(context_element, tag_name, {

-        "id": create_subelement_id(context_element, tag_name)

+        "id": create_subelement_id(context_element, tag_name, id_provider)

     })

     for name, value in sorted(nvpair_dict.items()):

-        _append_new_nvpair(nvset_element, name, value)

+        _append_new_nvpair(nvset_element, name, value, id_provider)

 append_new_instance_attributes = partial(

     append_new_nvset,

diff --git a/pcs/lib/cib/resource/bundle.py b/pcs/lib/cib/resource/bundle.py

index 0fe16f3..8a49c28 100644

--- a/pcs/lib/cib/resource/bundle.py

+++ b/pcs/lib/cib/resource/bundle.py

@@ -9,6 +9,10 @@ from lxml import etree

 from pcs.common import report_codes

 from pcs.lib import reports, validate

+from pcs.lib.cib.nvpair import (

+    append_new_meta_attributes,

+    arrange_first_meta_attributes,

+)

 from pcs.lib.cib.resource.primitive import TAG as TAG_PRIMITIVE

 from pcs.lib.cib.tools import find_element_by_tag_and_id

 from pcs.lib.errors import (

@@ -96,7 +100,7 @@ def validate_new(

 def append_new(

     parent_element, id_provider, bundle_id, container_type, container_options,

-    network_options, port_map, storage_map

+    network_options, port_map, storage_map, meta_attributes

 ):

     """

     Create new bundle and add it to the CIB

@@ -109,6 +113,7 @@ def append_new(

     dict network_options -- network options

     list of dict port_map -- list of port mapping options

     list of dict storage_map -- list of storage mapping options

+    dict meta_attributes -- meta attributes

     """

     bundle_element = etree.SubElement(parent_element, TAG, {"id": bundle_id})

     # TODO create the proper element once more container_types are supported

@@ -132,6 +137,8 @@ def append_new(

         _append_storage_map(

             storage_element, id_provider, bundle_id, storage_map_options

         )

+    if meta_attributes:

+        append_new_meta_attributes(bundle_element, meta_attributes, id_provider)

     return bundle_element

 def validate_update(

@@ -203,7 +210,8 @@ def validate_update(

 def update(

     id_provider, bundle_el, container_options, network_options,

-    port_map_add, port_map_remove, storage_map_add, storage_map_remove

+    port_map_add, port_map_remove, storage_map_add, storage_map_remove,

+    meta_attributes

 ):

     """

     Modify an existing bundle (does not touch encapsulated resources)

@@ -216,6 +224,7 @@ def update(

     list of string port_map_remove -- list of port mapping ids to remove

     list of dict storage_map_add -- list of storage mapping options to add

     list of string storage_map_remove -- list of storage mapping ids to remove

+    dict meta_attributes -- meta attributes to update

     """

     bundle_id = bundle_el.get("id")

     update_attributes_remove_empty(

@@ -253,7 +262,11 @@ def update(

             storage_element, id_provider, bundle_id, storage_map_options

         )

+    if meta_attributes:

+        arrange_first_meta_attributes(bundle_el, meta_attributes)

+

     # remove empty elements with no attributes

+    # meta attributes are handled in their own function

     for element in (network_element, storage_element):

         if len(element) < 1 and not element.attrib:

             element.getparent().remove(element)

diff --git a/pcs/lib/cib/resource/common.py b/pcs/lib/cib/resource/common.py

index f9028ff..0e52b4c 100644

--- a/pcs/lib/cib/resource/common.py

+++ b/pcs/lib/cib/resource/common.py

@@ -58,16 +58,18 @@ def find_resources_to_enable(resource_el):

     etree resource_el -- resource element

     """

     if is_bundle(resource_el):

-        # bundles currently cannot be disabled - pcmk does not support that

-        # inner resources are supposed to be managed separately

-        return []

+        to_enable = [resource_el]

+        in_bundle = get_bundle_inner_resource(resource_el)

+        if in_bundle is not None:

+            to_enable.append(in_bundle)

+        return to_enable

     if is_any_clone(resource_el):

         return [resource_el, get_clone_inner_resource(resource_el)]

     to_enable = [resource_el]

     parent = resource_el.getparent()

-    if is_any_clone(parent):

+    if is_any_clone(parent) or is_bundle(parent):

         to_enable.append(parent)

     return to_enable

@@ -109,20 +111,25 @@ def find_resources_to_manage(resource_el):

     # put there manually. If we didn't do it, the resource may stay unmanaged,

     # as a managed primitive in an unmanaged clone / group is still unmanaged

     # and vice versa.

-    # Bundle resources cannot be set as unmanaged - pcmk currently doesn't

-    # support that. Resources in a bundle are supposed to be treated separately.

-    if is_bundle(resource_el):

-        return []

     res_id = resource_el.attrib["id"]

     return (

         [resource_el] # the resource itself

         +

         # its parents

         find_parent(resource_el, "resources").xpath(

+            # a master or a clone which contains a group, a primitve, or a

+            # grouped primitive with the specified id

+            # OR

+            # a group (in a clone, master, etc. - hence //) which contains a

+            # primitive with the specified id

+            # OR

+            # a bundle which contains a primitive with the specified id

             """

                 (./master|./clone)[(group|group/primitive|primitive)[@id='{r}']]

                 |

                 //group[primitive[@id='{r}']]

+                |

+                ./bundle[primitive[@id='{r}']]

             """

             .format(r=res_id)

         )

@@ -164,10 +171,19 @@ def find_resources_to_unmanage(resource_el):

     #   See clone notes above

     #

     # a bundled primitive - the primitive - the primitive

-    # a bundled primitive - the bundle - nothing

-    #  bundles currently cannot be set as unmanaged - pcmk does not support that

-    # an empty bundle - the bundle - nothing

-    #  bundles currently cannot be set as unmanaged - pcmk does not support that

+    # a bundled primitive - the bundle - the bundle and the primitive

+    #  We need to unmanage implicit resources create by pacemaker and there is

+    #  no other way to do it than unmanage the bundle itself.

+    #  Since it is not possible to unbundle a resource, the concers described

+    #  at unclone don't apply here. However to prevent future bugs, in case

+    #  unbundling becomes possible, we unmanage the primitive as well.

+    # an empty bundle - the bundle - the bundle

+    #  There is nothing else to unmanage.

+    if is_bundle(resource_el):

+        in_bundle = get_bundle_inner_resource(resource_el)

+        return (

+            [resource_el, in_bundle] if in_bundle is not None else [resource_el]

+        )

     if is_any_clone(resource_el):

         resource_el = get_clone_inner_resource(resource_el)

     if is_group(resource_el):

diff --git a/pcs/lib/cib/test/test_nvpair.py b/pcs/lib/cib/test/test_nvpair.py

index 9b9d9b9..0f6d8f8 100644

--- a/pcs/lib/cib/test/test_nvpair.py

+++ b/pcs/lib/cib/test/test_nvpair.py

@@ -8,6 +8,7 @@ from __future__ import (

 from lxml import etree

 from pcs.lib.cib import nvpair

+from pcs.lib.cib.tools import IdProvider

 from pcs.test.tools.assertions import assert_xml_equal

 from pcs.test.tools.pcs_unittest import TestCase, mock

 from pcs.test.tools.xml import etree_to_str

@@ -25,6 +26,21 @@ class AppendNewNvpair(TestCase):

             """

         )

+    def test_with_id_provider(self):

+        nvset_element = etree.fromstring('<nvset id="a"/>')

+        provider = IdProvider(nvset_element)

+        provider.book_ids("a-b")

+        nvpair._append_new_nvpair(nvset_element, "b", "c", provider)

+        assert_xml_equal(

+            etree_to_str(nvset_element),

+            """

+            <nvset id="a">

+                <nvpair id="a-b-1" name="b" value="c"></nvpair>

+            </nvset>

+            """

+        )

+

+

 class UpdateNvsetTest(TestCase):

     @mock.patch(

         "pcs.lib.cib.nvpair.create_subelement_id",

@@ -167,6 +183,32 @@ class AppendNewNvsetTest(TestCase):

             etree_to_str(context_element)

         )

+    def test_with_id_provider(self):

+        context_element = etree.fromstring('<context id="a"/>')

+        provider = IdProvider(context_element)

+        provider.book_ids("a-instance_attributes", "a-instance_attributes-1-a")

+        nvpair.append_new_nvset(

+            "instance_attributes",

+            context_element,

+            {

+                "a": "b",

+                "c": "d",

+            },

+            provider

+        )

+        assert_xml_equal(

+            """

+                <context id="a">

+                    <instance_attributes id="a-instance_attributes-1">

+                        <nvpair id="a-instance_attributes-1-a-1" name="a" value="b"/>

+                        <nvpair id="a-instance_attributes-1-c" name="c" value="d"/>

+                    </instance_attributes>

+                </context>

+            """,

+            etree_to_str(context_element)

+        )

+

+

 class ArrangeFirstNvsetTest(TestCase):

     def setUp(self):

         self.root = etree.Element("root", id="root")

diff --git a/pcs/lib/cib/test/test_resource_common.py b/pcs/lib/cib/test/test_resource_common.py

index 52c2329..6b485f7 100644

--- a/pcs/lib/cib/test/test_resource_common.py

+++ b/pcs/lib/cib/test/test_resource_common.py

@@ -180,7 +180,7 @@ class FindResourcesToEnable(TestCase):

         self.assert_find_resources("F2", ["F2"])

     def test_primitive_in_bundle(self):

-        self.assert_find_resources("H", ["H"])

+        self.assert_find_resources("H", ["H", "H-bundle"])

     def test_group(self):

         self.assert_find_resources("D", ["D"])

@@ -204,10 +204,10 @@ class FindResourcesToEnable(TestCase):

         self.assert_find_resources("F-master", ["F-master", "F"])

     def test_bundle_empty(self):

-        self.assert_find_resources("G-bundle", [])

+        self.assert_find_resources("G-bundle", ["G-bundle"])

     def test_bundle_with_primitive(self):

-        self.assert_find_resources("H-bundle", [])

+        self.assert_find_resources("H-bundle", ["H-bundle", "H"])

 class Enable(TestCase):

@@ -360,7 +360,7 @@ class FindResourcesToManage(TestCase):

         self.assert_find_resources("F2", ["F2", "F-master", "F"])

     def test_primitive_in_bundle(self):

-        self.assert_find_resources("H", ["H"])

+        self.assert_find_resources("H", ["H", "H-bundle"])

     def test_group(self):

         self.assert_find_resources("D", ["D", "D1", "D2"])

@@ -384,10 +384,10 @@ class FindResourcesToManage(TestCase):

         self.assert_find_resources("F-master", ["F-master", "F", "F1", "F2"])

     def test_bundle_empty(self):

-        self.assert_find_resources("G-bundle", [])

+        self.assert_find_resources("G-bundle", ["G-bundle"])

     def test_bundle_with_primitive(self):

-        self.assert_find_resources("H-bundle", [])

+        self.assert_find_resources("H-bundle", ["H-bundle", "H"])

 class FindResourcesToUnmanage(TestCase):

@@ -447,10 +447,10 @@ class FindResourcesToUnmanage(TestCase):

         self.assert_find_resources("F-master", ["F1", "F2"])

     def test_bundle_empty(self):

-        self.assert_find_resources("G-bundle", [])

+        self.assert_find_resources("G-bundle", ["G-bundle"])

     def test_bundle_with_primitive(self):

-        self.assert_find_resources("H-bundle", [])

+        self.assert_find_resources("H-bundle", ["H-bundle", "H"])

 class Manage(TestCase):

diff --git a/pcs/lib/cib/tools.py b/pcs/lib/cib/tools.py

index 2308a42..cf91125 100644

--- a/pcs/lib/cib/tools.py

+++ b/pcs/lib/cib/tools.py

@@ -177,11 +177,11 @@ def find_element_by_tag_and_id(

         )

     )

-def create_subelement_id(context_element, suffix):

-    return find_unique_id(

-        context_element,

-        "{0}-{1}".format(context_element.get("id"), suffix)

-    )

+def create_subelement_id(context_element, suffix, id_provider=None):

+    proposed_id = "{0}-{1}".format(context_element.get("id"), suffix)

+    if id_provider:

+        return id_provider.allocate_id(proposed_id)

+    return find_unique_id(context_element, proposed_id)

 def check_new_id_applicable(tree, description, id):

     validate_id(id, description)

diff --git a/pcs/lib/commands/resource.py b/pcs/lib/commands/resource.py

index 3a060b8..0c5f682 100644

--- a/pcs/lib/commands/resource.py

+++ b/pcs/lib/commands/resource.py

@@ -22,6 +22,7 @@ from pcs.lib.errors import LibraryError

 from pcs.lib.pacemaker.values import validate_id

 from pcs.lib.pacemaker.state import (

     ensure_resource_state,

+    info_resource_state,

     is_resource_managed,

     ResourceNotFound,

 )

@@ -31,7 +32,10 @@ from pcs.lib.resource_agent import(

 @contextmanager

 def resource_environment(

-    env, wait=False, wait_for_resource_ids=None, disabled_after_wait=False,

+    env,

+    wait=False,

+    wait_for_resource_ids=None,

+    resource_state_reporter=info_resource_state,

     required_cib_version=None

 ):

     env.ensure_wait_satisfiable(wait)

@@ -41,10 +45,19 @@ def resource_environment(

     if wait is not False and wait_for_resource_ids:

         state = env.get_cluster_state()

         env.report_processor.process_list([

-            ensure_resource_state(not disabled_after_wait, state, res_id)

+            resource_state_reporter(state, res_id)

             for res_id in wait_for_resource_ids

         ])

+def _ensure_disabled_after_wait(disabled_after_wait):

+    def inner(state, resource_id):

+        return ensure_resource_state(

+            not disabled_after_wait,

+            state,

+            resource_id

+        )

+    return inner

+

 def _validate_remote_connection(

     resource_agent, nodes_to_validate_against, resource_id, instance_attributes,

     allow_not_suitable_command

@@ -195,7 +208,11 @@ def create(

         env,

         wait,

         [resource_id],