[Debian-ha-commits] [pcs] 09/10: d/patches: fix seconds output in testsuite
Valentin Vidic
vvidic-guest at moszumanska.debian.org
Fri Apr 13 08:29:59 UTC 2018
This is an automated email from the git hooks/post-receive script.
vvidic-guest pushed a commit to branch master
in repository pcs.
commit 2c8a3e48547236bab04d6f65d4324a238a99461d
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date: Thu Apr 12 22:13:04 2018 +0200
d/patches: fix seconds output in testsuite
---
debian/patches/0011-Fix-testsuite-seconds.patch | 1477 +++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 1478 insertions(+)
diff --git a/debian/patches/0011-Fix-testsuite-seconds.patch b/debian/patches/0011-Fix-testsuite-seconds.patch
new file mode 100644
index 0000000..79a2098
--- /dev/null
+++ b/debian/patches/0011-Fix-testsuite-seconds.patch
@@ -0,0 +1,1477 @@
+Description: add missing second unit to testsuite
+ resource-agents 4.1.1 adds a second unit to agent output
+ so the testsuite needs to be updated as well.
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2018-04-12
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/pcs/test/test_resource.py
++++ b/pcs/test/test_resource.py
+@@ -218,12 +218,12 @@
+ ac(output, outdent(
+ """\
+ Resource: dummy0 (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (dummy0-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (dummy0-migrate_to-interval-0s)
+- monitor interval=10 timeout=20 (dummy0-monitor-interval-10)
+- reload interval=0s timeout=20 (dummy0-reload-interval-0s)
+- start interval=0s timeout=20 (dummy0-start-interval-0s)
+- stop interval=0s timeout=20 (dummy0-stop-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (dummy0-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (dummy0-migrate_to-interval-0s)
++ monitor interval=10s timeout=20s (dummy0-monitor-interval-10s)
++ reload interval=0s timeout=20s (dummy0-reload-interval-0s)
++ start interval=0s timeout=20s (dummy0-start-interval-0s)
++ stop interval=0s timeout=20s (dummy0-stop-interval-0s)
+ """
+ ))
+
+@@ -443,7 +443,7 @@
+ self.assert_pcs_success("resource show OPTest6", outdent(
+ """\
+ Resource: OPTest6 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (OPTest6-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (OPTest6-monitor-interval-10s)
+ monitor interval=30s OCF_CHECK_LEVEL=1 (OPTest6-monitor-interval-30s)
+ """
+ ))
+@@ -487,7 +487,7 @@
+ outdent(
+ """\
+ Error: operation monitor already specified for OCFTest1, use --force to override:
+- monitor interval=10 timeout=20 (OCFTest1-monitor-interval-10)
++ monitor interval=10s timeout=20s (OCFTest1-monitor-interval-10s)
+ """
+ )
+ )
+@@ -505,7 +505,7 @@
+ outdent(
+ """\
+ Resource: OCFTest1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (OCFTest1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (OCFTest1-monitor-interval-10s)
+ monitor interval=31s (OCFTest1-monitor-interval-31s)
+ monitor interval=30s OCF_CHECK_LEVEL=15 (OCFTest1-monitor-interval-30s)
+ """
+@@ -758,13 +758,13 @@
+ self.assert_pcs_success("resource show A", outdent(
+ """\
+ Resource: A (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (A-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (A-migrate_to-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (A-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (A-migrate_to-interval-0s)
+ monitor interval=10 (A-monitor-interval-10)
+ monitor interval=20 (A-monitor-interval-20)
+- reload interval=0s timeout=20 (A-reload-interval-0s)
+- start interval=0s timeout=20 (A-start-interval-0s)
+- stop interval=0s timeout=20 (A-stop-interval-0s)
++ reload interval=0s timeout=20s (A-reload-interval-0s)
++ start interval=0s timeout=20s (A-start-interval-0s)
++ stop interval=0s timeout=20s (A-stop-interval-0s)
+ """
+ ))
+
+@@ -788,13 +788,13 @@
+ self.assert_pcs_success("resource show A", outdent(
+ """\
+ Resource: A (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (A-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (A-migrate_to-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (A-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (A-migrate_to-interval-0s)
+ monitor interval=11 (A-monitor-interval-11)
+ monitor interval=20 (A-monitor-interval-20)
+- reload interval=0s timeout=20 (A-reload-interval-0s)
+- start interval=0s timeout=20 (A-start-interval-0s)
+- stop interval=0s timeout=20 (A-stop-interval-0s)
++ reload interval=0s timeout=20s (A-reload-interval-0s)
++ start interval=0s timeout=20s (A-start-interval-0s)
++ stop interval=0s timeout=20s (A-stop-interval-0s)
+ """
+ ))
+
+@@ -807,7 +807,7 @@
+ ac(output, "")
+ self.assertEqual(0, returnVal)
+
+- self.assert_pcs_success("resource op remove B-monitor-interval-10")
++ self.assert_pcs_success("resource op remove B-monitor-interval-10s")
+
+ output, returnVal = pcs(temp_cib, "resource show B")
+ ac(output, """\
+@@ -1002,15 +1002,15 @@
+ """\
+ Group: AGroup
+ Resource: A1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A1-monitor-interval-10s)
+ Resource: A2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A2-monitor-interval-10s)
+ Resource: A3 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A3-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A3-monitor-interval-10s)
+ Resource: A4 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A4-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A4-monitor-interval-10s)
+ Resource: A5 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A5-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A5-monitor-interval-10s)
+ """
+ ))
+
+@@ -1068,15 +1068,15 @@
+ self.assert_pcs_success("resource show A1 A2 A3 A4 A5", outdent(
+ """\
+ Resource: A1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A1-monitor-interval-10s)
+ Resource: A2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A2-monitor-interval-10s)
+ Resource: A3 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A3-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A3-monitor-interval-10s)
+ Resource: A4 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A4-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A4-monitor-interval-10s)
+ Resource: A5 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A5-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A5-monitor-interval-10s)
+ """
+ ))
+
+@@ -1656,7 +1656,7 @@
+ """\
+ Clone: D1-clone
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -1963,9 +1963,9 @@
+ Master: GroupMaster
+ Group: Group
+ Resource: D0 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D0-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D0-monitor-interval-10s)
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -2041,10 +2041,10 @@
+ """\
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Clone: dummy2-clone
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2056,9 +2056,9 @@
+ """\
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2076,9 +2076,9 @@
+ Clone: gr-clone
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2090,9 +2090,9 @@
+ """\
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2106,9 +2106,9 @@
+ Clone: gr-clone
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2120,9 +2120,9 @@
+ """\
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2136,9 +2136,9 @@
+ Clone: gr-clone
+ Group: gr
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2153,9 +2153,9 @@
+ Clone: gr-clone
+ Group: gr
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ """
+ ))
+
+@@ -2166,9 +2166,9 @@
+ self.assert_pcs_success("resource --full", outdent(
+ """\
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2494,13 +2494,13 @@
+ """\
+ Clone: D0-clone
+ Resource: D0 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D0-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D0-monitor-interval-10s)
+ Master: D1-master-custom
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Master: D2-master
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2527,11 +2527,11 @@
+ """\
+ Master: D1-master-custom
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Resource: D0 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D0-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D0-monitor-interval-10s)
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+@@ -2879,13 +2879,13 @@
+ self.assert_pcs_success("resource --full", outdent(
+ """\
+ Resource: D0 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D0-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D0-monitor-interval-10s)
+ Clone: D1-clone
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Master: D2-master
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+@@ -3059,10 +3059,10 @@
+ self.assert_pcs_success("resource show --full", outdent(
+ """\
+ Resource: dummy-clone (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-clone-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-clone-monitor-interval-10s)
+ Clone: dummy-clone-1
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3081,10 +3081,10 @@
+ self.assert_pcs_success("resource show --full", outdent(
+ """\
+ Resource: dummy-clone (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-clone-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-clone-monitor-interval-10s)
+ Clone: dummy-clone-1
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3110,10 +3110,10 @@
+ self.assert_pcs_success("resource show --full", outdent(
+ """\
+ Resource: dummy-master (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-master-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-master-monitor-interval-10s)
+ Master: dummy-master-1
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3132,10 +3132,10 @@
+ self.assert_pcs_success("resource show --full", outdent(
+ """\
+ Resource: dummy-master (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-master-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-master-monitor-interval-10s)
+ Master: dummy-master0
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3154,10 +3154,10 @@
+ self.assert_pcs_success("resource show --full", outdent(
+ """\
+ Resource: dummy-master (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-master-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-master-monitor-interval-10s)
+ Master: dummy-master-1
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3173,7 +3173,7 @@
+ """\
+ Clone: D1-clone
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3187,7 +3187,7 @@
+ Clone: D1-clone
+ Meta Attrs: foo=bar
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3199,7 +3199,7 @@
+ Clone: D1-clone
+ Meta Attrs: foo=bar bar=baz
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3213,7 +3213,7 @@
+ Clone: D1-clone
+ Meta Attrs: bar=baz
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3241,9 +3241,9 @@
+ self.assert_pcs_success("resource --full", outdent(
+ """\
+ Resource: A (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A-monitor-interval-10s)
+ Resource: B (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (B-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (B-monitor-interval-10s)
+ """
+ ))
+
+@@ -3328,7 +3328,7 @@
+ """\
+ Master: AGMaster
+ Resource: A (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (A-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (A-monitor-interval-10s)
+ """
+ ))
+
+@@ -3356,9 +3356,9 @@
+ Clone: DG-clone
+ Group: DG
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+@@ -3396,9 +3396,9 @@
+ Clone: DG-clone
+ Group: DG
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3410,9 +3410,9 @@
+ """\
+ Clone: DG-clone
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3440,7 +3440,7 @@
+ """\
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+ Meta Attrs: target-role=Stopped
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3451,7 +3451,7 @@
+ self.assert_pcs_success("resource show D1", outdent(
+ """\
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ """
+ ))
+
+@@ -3479,12 +3479,12 @@
+ Clone: group0-clone
+ Group: group0
+ Resource: dummy0 (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (dummy0-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (dummy0-migrate_to-interval-0s)
+- monitor interval=10 timeout=20 (dummy0-monitor-interval-10)
+- reload interval=0s timeout=20 (dummy0-reload-interval-0s)
+- start interval=0s timeout=20 (dummy0-start-interval-0s)
+- stop interval=0s timeout=20 (dummy0-stop-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (dummy0-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (dummy0-migrate_to-interval-0s)
++ monitor interval=10s timeout=20s (dummy0-monitor-interval-10s)
++ reload interval=0s timeout=20s (dummy0-reload-interval-0s)
++ start interval=0s timeout=20s (dummy0-start-interval-0s)
++ stop interval=0s timeout=20s (dummy0-stop-interval-0s)
+ """
+ ))
+ assert retVal == 0
+@@ -3615,7 +3615,7 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3632,7 +3632,7 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3653,7 +3653,7 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3674,7 +3674,7 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3689,7 +3689,7 @@
+ Clone: dummy-clone
+ Meta Attrs: target-role=Stopped
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3701,7 +3701,7 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3718,7 +3718,7 @@
+ Clone: dummy-clone
+ Meta Attrs: target-role=Stopped
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -3730,7 +3730,7 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
+ """
+ ))
+
+@@ -4035,9 +4035,9 @@
+ self.assert_pcs_success("resource show --full", outdent(
+ """\
+ Resource: B (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (B-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (B-monitor-interval-10s)
+ Resource: C (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (C-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (C-monitor-interval-10s)
+ """
+ ))
+
+@@ -4055,7 +4055,7 @@
+ Operations: monitor interval=30s (B-monitor-interval-30s)
+ monitor interval=31s role=Master (B-monitor-interval-31s)
+ Resource: C (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (C-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (C-monitor-interval-10s)
+ """
+ ))
+
+@@ -4180,13 +4180,13 @@
+ Attributes: ip=3.3.3.3
+ Operations: monitor interval=10s timeout=20s (myip2-monitor-interval-10s)
+ Resource: myfs (class=ocf provider=heartbeat type=Filesystem)
+- Operations: monitor interval=20 timeout=40 (myfs-monitor-interval-20)
++ Operations: monitor interval=20s timeout=40s (myfs-monitor-interval-20s)
+ Resource: myfs2 (class=ocf provider=heartbeat type=Filesystem)
+ Attributes: device=x directory=y
+- Operations: monitor interval=20 timeout=40 (myfs2-monitor-interval-20)
++ Operations: monitor interval=20s timeout=40s (myfs2-monitor-interval-20s)
+ Resource: myfs3 (class=ocf provider=heartbeat type=Filesystem)
+ Attributes: device=x directory=y fstype=z
+- Operations: monitor interval=20 timeout=40 (myfs3-monitor-interval-20)
++ Operations: monitor interval=20s timeout=40s (myfs3-monitor-interval-20s)
+ """
+ ))
+
+@@ -4219,11 +4219,11 @@
+ Clone: dummies-clone
+ Group: dummies
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ Resource: dummy3 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy3-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy3-monitor-interval-10s)
+ """
+ ))
+
+@@ -4248,11 +4248,11 @@
+ Clone: dummies-clone
+ Group: dummies
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ Resource: dummy3 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy3-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy3-monitor-interval-10s)
+ """
+ ))
+
+@@ -4297,11 +4297,11 @@
+ Master: dummies-master
+ Group: dummies
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ Resource: dummy3 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy3-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy3-monitor-interval-10s)
+ """
+ ))
+
+@@ -4326,11 +4326,11 @@
+ Master: dummies-master
+ Group: dummies
+ Resource: dummy1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy1-monitor-interval-10s)
+ Resource: dummy2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy2-monitor-interval-10s)
+ Resource: dummy3 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (dummy3-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (dummy3-monitor-interval-10s)
+ """
+ ))
+
+@@ -4743,12 +4743,12 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (dummy-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (dummy-migrate_to-interval-0s)
+- monitor interval=10 timeout=20 (dummy-monitor-interval-10)
+- reload interval=0s timeout=20 (dummy-reload-interval-0s)
+- start interval=0s timeout=20 (dummy-start-interval-0s)
+- stop interval=0s timeout=20 (dummy-stop-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (dummy-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (dummy-migrate_to-interval-0s)
++ monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
++ reload interval=0s timeout=20s (dummy-reload-interval-0s)
++ start interval=0s timeout=20s (dummy-start-interval-0s)
++ stop interval=0s timeout=20s (dummy-stop-interval-0s)
+ """
+ ))
+ self.assert_pcs_fail(
+@@ -4763,12 +4763,12 @@
+ """\
+ Clone: dummy-clone
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (dummy-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (dummy-migrate_to-interval-0s)
+- monitor interval=10 timeout=20 (dummy-monitor-interval-10)
+- reload interval=0s timeout=20 (dummy-reload-interval-0s)
+- start interval=0s timeout=20 (dummy-start-interval-0s)
+- stop interval=0s timeout=20 (dummy-stop-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (dummy-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (dummy-migrate_to-interval-0s)
++ monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
++ reload interval=0s timeout=20s (dummy-reload-interval-0s)
++ start interval=0s timeout=20s (dummy-start-interval-0s)
++ stop interval=0s timeout=20s (dummy-stop-interval-0s)
+ """
+ ))
+
+@@ -4780,12 +4780,12 @@
+ """\
+ Master: dummy-master
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (dummy-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (dummy-migrate_to-interval-0s)
+- monitor interval=10 timeout=20 (dummy-monitor-interval-10)
+- reload interval=0s timeout=20 (dummy-reload-interval-0s)
+- start interval=0s timeout=20 (dummy-start-interval-0s)
+- stop interval=0s timeout=20 (dummy-stop-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (dummy-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (dummy-migrate_to-interval-0s)
++ monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
++ reload interval=0s timeout=20s (dummy-reload-interval-0s)
++ start interval=0s timeout=20s (dummy-start-interval-0s)
++ stop interval=0s timeout=20s (dummy-stop-interval-0s)
+ """
+ ))
+ self.assert_pcs_fail(
+@@ -4800,12 +4800,12 @@
+ """\
+ Master: dummy-master
+ Resource: dummy (class=ocf provider=heartbeat type=Dummy)
+- Operations: migrate_from interval=0s timeout=20 (dummy-migrate_from-interval-0s)
+- migrate_to interval=0s timeout=20 (dummy-migrate_to-interval-0s)
+- monitor interval=10 timeout=20 (dummy-monitor-interval-10)
+- reload interval=0s timeout=20 (dummy-reload-interval-0s)
+- start interval=0s timeout=20 (dummy-start-interval-0s)
+- stop interval=0s timeout=20 (dummy-stop-interval-0s)
++ Operations: migrate_from interval=0s timeout=20s (dummy-migrate_from-interval-0s)
++ migrate_to interval=0s timeout=20s (dummy-migrate_to-interval-0s)
++ monitor interval=10s timeout=20s (dummy-monitor-interval-10s)
++ reload interval=0s timeout=20s (dummy-reload-interval-0s)
++ start interval=0s timeout=20s (dummy-start-interval-0s)
++ stop interval=0s timeout=20s (dummy-stop-interval-0s)
+ """
+ ))
+
+--- a/pcs/test/cib_resource/test_create.py
++++ b/pcs/test/cib_resource/test_create.py
+@@ -21,8 +21,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -53,22 +53,22 @@
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s" name="start"
+- timeout="20"
++ timeout="20s"
+ />
+ <op id="R-stop-interval-0s" interval="0s" name="stop"
+- timeout="20"
++ timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -122,8 +122,8 @@
+ />
+ </instance_attributes>
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -167,8 +167,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -188,8 +188,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -216,8 +216,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -242,8 +242,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -387,22 +387,22 @@
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s" name="start"
+- timeout="20"
++ timeout="20s"
+ />
+ <op id="R-stop-interval-0s" interval="0s" name="stop"
+- timeout="20"
++ timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -416,22 +416,22 @@
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s" name="start"
+ timeout="200"
+ />
+ <op id="R-stop-interval-0s" interval="0s" name="stop"
+- timeout="20"
++ timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -444,8 +444,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -491,8 +491,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-monitro-interval-30s" interval="30s"
+ name="monitro"
+@@ -530,8 +530,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -558,8 +558,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R0-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R0-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -567,8 +567,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -591,8 +591,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R0-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R0-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -600,8 +600,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -609,8 +609,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R1-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R1-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -633,8 +633,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -642,8 +642,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R0-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R0-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -666,8 +666,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -695,22 +695,22 @@
+ </instance_attributes>
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s"
+- name="start" timeout="20"
++ name="start" timeout="20s"
+ />
+ <op id="R-stop-interval-0s" interval="0s"
+- name="stop" timeout="20"
++ name="stop" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -776,8 +776,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -839,22 +839,22 @@
+ </meta_attributes>
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s"
+- name="start" timeout="20"
++ name="start" timeout="20s"
+ />
+ <op id="R-stop-interval-0s" interval="0s"
+- name="stop" timeout="20"
++ name="stop" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -884,22 +884,22 @@
+ >
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+ <op id="R-monitor-interval-10" interval="10"
+ name="monitor"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s"
+- name="start" timeout="20"
++ name="start" timeout="20s"
+ />
+ <op id="R-stop-interval-0s" interval="0s"
+- name="stop" timeout="20"
++ name="stop" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -927,22 +927,22 @@
+ >
+ <operations>
+ <op id="R-migrate_from-interval-0s" interval="0s"
+- name="migrate_from" timeout="20"
++ name="migrate_from" timeout="20s"
+ />
+ <op id="R-migrate_to-interval-0s" interval="0s"
+- name="migrate_to" timeout="20"
++ name="migrate_to" timeout="20s"
+ />
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-reload-interval-0s" interval="0s"
+- name="reload" timeout="20"
++ name="reload" timeout="20s"
+ />
+ <op id="R-start-interval-0s" interval="0s"
+- name="start" timeout="20"
++ name="start" timeout="20s"
+ />
+ <op id="R-stop-interval-0s" interval="0s"
+- name="stop" timeout="20"
++ name="stop" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -1017,8 +1017,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="R1-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R1-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -1399,8 +1399,8 @@
+ <nvpair id="R1-meta_attributes-a" name="a" value="b"/>
+ </meta_attributes>
+ <operations>
+- <op id="R1-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R1-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+--- a/pcs/test/cib_resource/test_manage_unmanage.py
++++ b/pcs/test/cib_resource/test_manage_unmanage.py
+@@ -34,15 +34,15 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+ <primitive class="ocf" id="B" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="B-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="B-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -102,8 +102,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20" enabled="false"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s" enabled="false"
+ />
+ </operations>
+ </primitive>
+@@ -124,8 +124,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -141,8 +141,8 @@
+ <resources>
+ <primitive class="ocf" id="A" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -158,8 +158,8 @@
+ <resources>
+ <primitive class="ocf" id="A" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20" enabled="false"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s" enabled="false"
+ />
+ </operations>
+ </primitive>
+@@ -183,8 +183,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -195,8 +195,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="B-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="B-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -213,15 +213,15 @@
+ <resources>
+ <primitive class="ocf" id="A" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+ <primitive class="ocf" id="B" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="B-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="B-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -241,8 +241,8 @@
+ <resources>
+ <primitive class="ocf" id="A" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -267,8 +267,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="A-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="A-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+--- a/pcs/test/cib_resource/test_operation_add.py
++++ b/pcs/test/cib_resource/test_operation_add.py
+@@ -61,8 +61,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-start-interval-20s" interval="20s"
+ name="start"
+@@ -80,8 +80,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op description="test-description" name="start"
+ id="R-start-interval-20s" interval="20s"
+@@ -106,8 +106,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-start-interval-20s" interval="20s"
+ name="start"
+@@ -121,8 +121,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="R-start-interval-20s" interval="20s"
+ name="start"
+@@ -141,8 +141,8 @@
+ """<resources>
+ <primitive class="ocf" id="R" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="R-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="R-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ <op id="abcd" interval="0s" name="start" timeout="30" />
+ </operations>
+--- a/pcs/test/test_cluster.py
++++ b/pcs/test/test_cluster.py
+@@ -106,10 +106,10 @@
+ """\
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+ Meta Attrs: remote-node=rh7-2g
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+ Meta Attrs: remote-node=rh7-1 remote-port=100 remote-addr=400 remote-connect-timeout=50
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+@@ -151,10 +151,10 @@
+ self.assert_pcs_success("resource --full", outdent(
+ """\
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+ Meta Attrs: remote-node=rh7-1 remote-port=100 remote-addr=400 remote-connect-timeout=50
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+@@ -172,9 +172,9 @@
+ self.assert_pcs_success("resource --full", outdent(
+ """\
+ Resource: D1 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D1-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D1-monitor-interval-10s)
+ Resource: D2 (class=ocf provider=heartbeat type=Dummy)
+- Operations: monitor interval=10 timeout=20 (D2-monitor-interval-10)
++ Operations: monitor interval=10s timeout=20s (D2-monitor-interval-10s)
+ """
+ ))
+
+--- a/pcs/test/test_cluster_pcmk_remote.py
++++ b/pcs/test/test_cluster_pcmk_remote.py
+@@ -160,8 +160,8 @@
+ """<resources>
+ <primitive class="ocf" id="G" provider="heartbeat" type="Dummy">
+ <operations>
+- <op id="G-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="G-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -290,8 +290,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="G-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="G-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -335,8 +335,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="G-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="G-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -484,8 +484,8 @@
+ />
+ </meta_attributes>
+ <operations>
+- <op id="NODE-ID-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="NODE-ID-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
+@@ -510,8 +510,8 @@
+ type="Dummy"
+ >
+ <operations>
+- <op id="NODE-ID-monitor-interval-10" interval="10"
+- name="monitor" timeout="20"
++ <op id="NODE-ID-monitor-interval-10s" interval="10s"
++ name="monitor" timeout="20s"
+ />
+ </operations>
+ </primitive>
diff --git a/debian/patches/series b/debian/patches/series
index 74101af..db1e9d5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
0008-Replace-chkconfig.patch
0009-Fix-python3-build.patch
0010-Fix-SNMP-install.patch
+0011-Fix-testsuite-seconds.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/pcs.git
More information about the Debian-HA-Commits
mailing list