Attachment 907619 Details for Bug 1107965 – proposed fix

[patch] proposed fix

0001-Fix-is_managed-for-cloned-groups.patch (text/plain), 2.21 KB, created by Tomas Jelinek on 2014-06-11 12:49:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Jelinek

Created: 2014-06-11 12:49:46 UTC

Size: 2.21 KB

patch

obsolete

>From 706763f906bc9d6dd4f23dfc2e2d1be38d9c97cf Mon Sep 17 00:00:00 2001
>From: Tomas Jelinek <tojeline@redhat.com>
>Date: Wed, 11 Jun 2014 14:46:45 +0200
>Subject: [PATCH] Fix is_managed for cloned groups
>
>---
> pcs/resource.py           |  2 +-
> pcs/test/test_resource.py | 13 +++++++++++++
> 2 files changed, 14 insertions(+), 1 deletion(-)
>
>diff --git a/pcs/resource.py b/pcs/resource.py
>index 8f76b55..4fecf09 100644
>--- a/pcs/resource.py
>+++ b/pcs/resource.py
>@@ -1687,7 +1687,7 @@ def is_managed(resource_id):
>                 return False
>             return True
>     for resource_el in state_dom.getElementsByTagName("group"):
>-        if resource_el.getAttribute("id") == resource_id:
>+        if resource_el.getAttribute("id") in [resource_id, resource_id + ":0"]:
>             for primitive_el in resource_el.getElementsByTagName("resource"):
>                 if primitive_el.getAttribute("managed") == "false":
>                     return False
>diff --git a/pcs/test/test_resource.py b/pcs/test/test_resource.py
>index 81228e7..64ec987 100644
>--- a/pcs/test/test_resource.py
>+++ b/pcs/test/test_resource.py
>@@ -1515,6 +1515,19 @@ class ResourceTest(unittest.TestCase):
>         ac(o,"")
>         assert r == 0
> 
>+        output, retVal = pcs(temp_cib, "resource create dummy0 Dummy --group group0")
>+        ac(output, "")
>+        assert retVal == 0
>+        output, retVal = pcs(temp_cib, "resource clone group0")
>+        ac(output, "")
>+        assert retVal == 0
>+        output, retVal = pcs(temp_cib, "resource show group0-clone")
>+        ac(output," Clone: group0-clone\n  Group: group0\n   Resource: dummy0 (class=ocf provider=heartbeat type=Dummy)\n    Operations: start interval=0s timeout=20 (dummy0-start-timeout-20)\n                stop interval=0s timeout=20 (dummy0-stop-timeout-20)\n                monitor interval=10 timeout=20 (dummy0-monitor-interval-10)\n")
>+        assert retVal == 0
>+        output, retVal = pcs(temp_cib, "resource disable group0")
>+        ac(output, "")
>+        assert retVal == 0
>+
>     def testOPOption(self):
>         o,r = pcs(temp_cib, "resource create --no-default-ops A Dummy op monitor interval=30s blah=blah")
>         ac(o,"Error: blah is not a valid op option (use --force to override)\n")
>-- 
>1.9.1
>

Actions: View | Diff

Attachments on bug 1107965: 907619