summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJan Pokorný <jpokorny@redhat.com>2015-12-16 18:38:43 +0100
committerJan Pokorný <jpokorny@redhat.com>2015-12-17 23:39:01 +0100
commit47d3d0143ff0bc9255dddc5a552938b1d30ebfd0 (patch)
tree732fdeab00b3ef3817735031c9ca7860a184b684 /tests
parent131830b15b88575d2550b3c5329b1fe923bcba39 (diff)
downloadclufter-47d3d0143ff0bc9255dddc5a552938b1d30ebfd0.tar.gz
clufter-47d3d0143ff0bc9255dddc5a552938b1d30ebfd0.tar.xz
clufter-47d3d0143ff0bc9255dddc5a552938b1d30ebfd0.zip
filters~ccs2pcs: propagate "monitor" op for primitives
For this monitor operation, either use the interval as designated in the original rgmanager agent (sticking with the most basic=lowest depth only), or use the default of 60 seconds (the same is automatically injected as a default by pcs). Resolves: <https://bugzilla.redhat.com/1272570>. Also adjust the (unit) tests respectively. Reported-by: Miroslav Lisik <mlisik@redhat.com> Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/filters/ccsflat2cibprelude.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/filters/ccsflat2cibprelude.py b/tests/filters/ccsflat2cibprelude.py
index 3e30640..09348af 100644
--- a/tests/filters/ccsflat2cibprelude.py
+++ b/tests/filters/ccsflat2cibprelude.py
@@ -27,6 +27,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase):
</instance_attributes>
<meta_attributes id="RESOURCE-nfsclient-test1-META">
<nvpair id="RESOURCE-nfsclient-test1-META-service" name="rgmanager-service" value="RESOURCES-"/>
+ <nvpair id="RESOURCE-nfsclient-test1-META-monitor" name="rgmanager-monitor" value="60s"/>
</meta_attributes>
</primitive>
'''),
@@ -43,6 +44,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase):
</instance_attributes>
<meta_attributes id="RESOURCE-nfsclient-test2-META">
<nvpair id="RESOURCE-nfsclient-test2-META-service" name="rgmanager-service" value="RESOURCES-"/>
+ <nvpair id="RESOURCE-nfsclient-test2-META-monitor" name="rgmanager-monitor" value="60s"/>
</meta_attributes>
</primitive>
'''),
@@ -75,6 +77,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase):
</instance_attributes>
<meta_attributes id="RESOURCE-SAPDatabase-SAP1-META">
<nvpair id="RESOURCE-SAPDatabase-SAP1-META-service" name="rgmanager-service" value="RESOURCES-"/>
+ <nvpair id="RESOURCE-SAPDatabase-SAP1-META-monitor" name="rgmanager-monitor" value="60s"/>
</meta_attributes>
</primitive>
'''),
@@ -90,6 +93,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase):
</instance_attributes>
<meta_attributes id="RESOURCE-SAPDatabase-GT1-META">
<nvpair id="RESOURCE-SAPDatabase-GT1-META-service" name="rgmanager-service" value="RESOURCES-"/>
+ <nvpair id="RESOURCE-SAPDatabase-GT1-META-monitor" name="rgmanager-monitor" value="60s"/>
</meta_attributes>
</primitive>
'''),
@@ -122,6 +126,7 @@ class FiltersCcsFlat2CibPreludeTestCase(TeardownFilterTestCase):
</instance_attributes>
<meta_attributes id="RESOURCE-SAPInstance-GT1_foobar-META">
<nvpair id="RESOURCE-SAPInstance-GT1_foobar-META-service" name="rgmanager-service" value="RESOURCES-"/>
+ <nvpair id="RESOURCE-SAPInstance-GT1_foobar-META-monitor" name="rgmanager-monitor" value="60s"/>
</meta_attributes>
</primitive>
'''),