test: Updated test cases

ClusterLabs · May 19, 2015 · 4df8a3d · 4df8a3d
1 parent f6e7fec
commit 4df8a3d
Show file tree

Hide file tree

Showing 20 changed files with 67 additions and 70 deletions.
diff --git a/test/testcases/acl b/test/testcases/acl
@@ -2,7 +2,7 @@ show ACL
 node node1
 property enable-acl=true
 primitive st stonith:ssh \
-	params hostlist='node1' \
+	hostlist='node1' \
 	meta target-role="Started" \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s

diff --git a/test/testcases/acl.exp b/test/testcases/acl.exp
@@ -5,7 +5,7 @@
 .INP: erase nodes
 .INP: node node1
 .INP: property enable-acl=true
-.INP: primitive st stonith:ssh 	params hostlist='node1' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
+.INP: primitive st stonith:ssh 	hostlist='node1' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
 .INP: primitive d0 ocf:pacemaker:Dummy
 .INP: primitive d1 ocf:pacemaker:Dummy
 .INP: role basic-read        read status        read type:node attribute:uname        read type:node attribute:type        read property
@@ -30,7 +30,7 @@ node node1
 primitive d0 ocf:pacemaker:Dummy
 primitive d1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s

diff --git a/test/testcases/bugs b/test/testcases/bugs
@@ -5,7 +5,7 @@ up
 configure
 erase
 primitive st stonith:null \
-	params hostlist='node1' \
+	hostlist='node1' \
 	meta description="some description here" \
 	op start requires=nothing \
 	op monitor interval=60m

diff --git a/test/testcases/bugs.exp b/test/testcases/bugs.exp
@@ -4,7 +4,7 @@
 .INP: up
 .INP: configure
 .INP: erase
-.INP: primitive st stonith:null 	params hostlist='node1' 	meta description="some description here" 	op start requires=nothing 	op monitor interval=60m
+.INP: primitive st stonith:null 	hostlist='node1' 	meta description="some description here" 	op start requires=nothing 	op monitor interval=60m
 .INP: primitive p4 Dummy
 .INP: primitive p3 Dummy
 .INP: primitive p2 Dummy
@@ -24,7 +24,7 @@ colocation c2 inf: ( p1 p2 ) p3 p4
 .INP: show
 node node1
 primitive st stonith:null \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta description="some description here" \
 	op start requires=nothing interval=0 \
 	op monitor interval=60m
@@ -46,7 +46,7 @@ colocation c2 inf: ( p1 p2 ) p3 p4
 .INP: show
 node node1
 primitive st stonith:null \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta description="some description here" \
 	op start requires=nothing interval=0 \
 	op monitor interval=60m
@@ -67,7 +67,7 @@ colocation c2 inf: ( p1 p2 ) p3 p4
 .INP: show
 node node1
 primitive st stonith:null \
-	params hostlist=node1
+	hostlist=node1
 primitive p4 Dummy
 primitive p3 Dummy
 primitive p2 Dummy

diff --git a/test/testcases/commit b/test/testcases/commit
@@ -1,13 +1,13 @@
 show Commits of all kinds
 property default-action-timeout=2m
 primitive st stonith:null \
-	params hostlist='node1' \
+	hostlist='node1' \
 	meta yoyo-meta="yoyo 2" \
 	op start requires=nothing \
 	op monitor interval=60m
 commit
 node node1 \
-	attributes mem=16G
+	mem=16G
 primitive p1 ocf:heartbeat:Dummy \
 	op monitor interval=60m \
 	op monitor interval=120m OCF_CHECK_LEVEL=10

diff --git a/test/testcases/commit.exp b/test/testcases/commit.exp
@@ -4,15 +4,15 @@
 .INP: erase
 .INP: erase nodes
 .INP: property default-action-timeout=2m
-.INP: primitive st stonith:null 	params hostlist='node1' 	meta yoyo-meta="yoyo 2" 	op start requires=nothing 	op monitor interval=60m
+.INP: primitive st stonith:null 	hostlist='node1' 	meta yoyo-meta="yoyo 2" 	op start requires=nothing 	op monitor interval=60m
 .INP: commit
 .EXT crm_resource --show-metadata stonith:null
 .EXT stonithd metadata
 .EXT crmd metadata
 .EXT pengine metadata
 .EXT cib metadata
 ERROR: 7: st: attribute yoyo-meta does not exist
-.INP: node node1 	attributes mem=16G
+.INP: node node1 	mem=16G
 .INP: primitive p1 ocf:heartbeat:Dummy 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
 .INP: primitive p2 ocf:heartbeat:Dummy
 .INP: primitive p3 ocf:heartbeat:Dummy
@@ -52,7 +52,7 @@ INFO: 24: resource references in order:o1 updated
 ERROR: 35: st: attribute yoyo-meta does not exist
 .INP: show
 node node1 \
-	attributes mem=16G
+	mem=16G
 primitive d1 Dummy
 primitive d3 Dummy
 primitive p1 Dummy \
@@ -61,7 +61,7 @@ primitive p1 Dummy \
 primitive p2 Dummy
 primitive p3 Dummy
 primitive st stonith:null \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta yoyo-meta="yoyo 2" \
 	op start requires=nothing interval=0 \
 	op monitor interval=60m

diff --git a/test/testcases/confbasic b/test/testcases/confbasic
@@ -2,22 +2,22 @@ show Basic configure
 node node1
 delete node1
 node node1 \
-	attributes mem=16G
+	mem=16G
 node node2 utilization cpu=4
 primitive st stonith:ssh \
-	params hostlist='node1 node2' \
+	hostlist='node1 node2' \
 	meta target-role="Started" \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s
 primitive st2 stonith:ssh \
-	params hostlist='node1 node2'
+	hostlist='node1 node2'
 primitive d1 ocf:pacemaker:Dummy \
 	operations $id=d1-ops \
 	op monitor interval=60m \
 	op monitor interval=120m OCF_CHECK_LEVEL=10
 monitor d1 60s:30s
 primitive d2 ocf:heartbeat:Delay \
-	params mondelay=60 \
+	mondelay=60 \
 	op start timeout=60s \
 	op stop timeout=60s
 monitor d2:Started 60s:30s

diff --git a/test/testcases/confbasic-xml b/test/testcases/confbasic-xml
@@ -2,22 +2,22 @@ showxml Basic configure (xml dump)
 node node1
 delete node1
 node node1 \
-	attributes mem=16G
+	mem=16G
 node node2 utilization cpu=4
 primitive st stonith:ssh \
-	params hostlist='node1 node2' \
+	hostlist='node1 node2' \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s
 primitive st2 stonith:ssh \
-	params hostlist='node1 node2'
+	hostlist='node1 node2'
 primitive d1 ocf:pacemaker:Dummy \
 	operations $id=d1-ops \
 	op monitor interval=60m \
 	op monitor interval=120m OCF_CHECK_LEVEL=10
 monitor d1 60s:30s
 primitive d2 ocf:heartbeat:Delay \
-	params mondelay=60 \
+	mondelay=60 \
 	op start timeout=60s \
 	op stop timeout=60s
 monitor d2:Started 60s:30s

diff --git a/test/testcases/confbasic.exp b/test/testcases/confbasic.exp
@@ -5,13 +5,13 @@
 .INP: erase nodes
 .INP: node node1
 .INP: delete node1
-.INP: node node1 	attributes mem=16G
+.INP: node node1 	mem=16G
 .INP: node node2 utilization cpu=4
-.INP: primitive st stonith:ssh 	params hostlist='node1 node2' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
-.INP: primitive st2 stonith:ssh 	params hostlist='node1 node2'
+.INP: primitive st stonith:ssh 	hostlist='node1 node2' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
+.INP: primitive st2 stonith:ssh 	hostlist='node1 node2'
 .INP: primitive d1 ocf:pacemaker:Dummy 	operations $id=d1-ops 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
 .INP: monitor d1 60s:30s
-.INP: primitive d2 ocf:heartbeat:Delay 	params mondelay=60 	op start timeout=60s 	op stop timeout=60s
+.INP: primitive d2 ocf:heartbeat:Delay 	mondelay=60 	op start timeout=60s 	op stop timeout=60s
 .INP: monitor d2:Started 60s:30s
 .INP: group g1 d1 d2
 .INP: primitive d3 ocf:pacemaker:Dummy
@@ -61,7 +61,7 @@
 .EXT cib metadata
 .INP: show
 node node1 \
-	attributes mem=16G
+	mem=16G
 node node2 \
 	utilization cpu=4
 primitive d1 ocf:pacemaker:Dummy \
@@ -70,7 +70,7 @@ primitive d1 ocf:pacemaker:Dummy \
 	op monitor interval=120m OCF_CHECK_LEVEL=10 \
 	op monitor interval=60s timeout=30s
 primitive d2 Delay \
-	params mondelay=45 \
+	mondelay=45 \
 	op start timeout=60s interval=0 \
 	op stop timeout=60s interval=0 \
 	op monitor role=Started interval=60s timeout=30s
@@ -84,12 +84,12 @@ primitive s5 ocf:pacemaker:Stateful \
 primitive s6 ocf:pacemaker:Stateful \
 	operations  $id-ref=d1-ops
 primitive st stonith:ssh \
-	params hostlist="node1 node2" \
+	hostlist="node1 node2" \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
 primitive st2 stonith:ssh \
-	params hostlist="node1 node2"
+	hostlist="node1 node2"
 group g1 d1 d2
 ms m d4
 ms m5 s5

diff --git a/test/testcases/delete b/test/testcases/delete
@@ -6,7 +6,7 @@ erase nodes
 node node1
 # create one stonith so that verify does not complain
 primitive st stonith:ssh \
-	params hostlist='node1' \
+	hostlist='node1' \
 	meta target-role="Started" \
 	op start requires=nothing timeout=60s \
 	op monitor interval=60m timeout=60s

diff --git a/test/testcases/delete.exp b/test/testcases/delete.exp
@@ -5,7 +5,7 @@
 .INP: erase nodes
 .INP: node node1
 .INP: # create one stonith so that verify does not complain
-.INP: primitive st stonith:ssh 	params hostlist='node1' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
+.INP: primitive st stonith:ssh 	hostlist='node1' 	meta target-role="Started" 	op start requires=nothing timeout=60s 	op monitor interval=60m timeout=60s
 .INP: primitive d1 ocf:pacemaker:Dummy
 .INP: primitive d2 ocf:pacemaker:Dummy
 .INP: location d1-pref d1 100: node1
@@ -14,7 +14,7 @@ node node1
 primitive d1 ocf:pacemaker:Dummy
 primitive d2 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -27,7 +27,7 @@ node node1
 primitive d2 ocf:pacemaker:Dummy
 primitive p1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -39,7 +39,7 @@ location d1-pref p1 100: node1
 node node1
 primitive p1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -51,7 +51,7 @@ INFO: 20: hanging location:d1-pref deleted
 .INP: show
 node node1
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -68,7 +68,7 @@ INFO: 29: resource references in location:d1-pref updated
 node node1
 primitive d1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -81,7 +81,7 @@ INFO: 33: resource references in location:d1-pref updated
 node node1
 primitive d1 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -105,7 +105,7 @@ node node1
 primitive d1 ocf:pacemaker:Dummy
 primitive d2 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -125,7 +125,7 @@ node node1
 primitive d1 ocf:pacemaker:Dummy
 primitive d2 ocf:pacemaker:Dummy
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s
@@ -143,7 +143,7 @@ INFO: 53: hanging location:d1-pref deleted
 .INP: show
 node node1
 primitive st stonith:ssh \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta target-role=Started \
 	op start requires=nothing timeout=60s interval=0 \
 	op monitor interval=60m timeout=60s

diff --git a/test/testcases/edit b/test/testcases/edit
@@ -1,9 +1,9 @@
 show Configuration editing
 property default-action-timeout=2m
 node node1 \
-	attributes mem=16G
+	mem=16G
 primitive st stonith:null \
-	params hostlist='node1' \
+	hostlist='node1' \
 	meta description="some description here" \
 	op start requires=nothing \
 	op monitor interval=60m

diff --git a/test/testcases/edit.exp b/test/testcases/edit.exp
@@ -4,8 +4,8 @@
 .INP: erase
 .INP: erase nodes
 .INP: property default-action-timeout=2m
-.INP: node node1 	attributes mem=16G
-.INP: primitive st stonith:null 	params hostlist='node1' 	meta description="some description here" 	op start requires=nothing 	op monitor interval=60m
+.INP: node node1 	mem=16G
+.INP: primitive st stonith:null 	hostlist='node1' 	meta description="some description here" 	op start requires=nothing 	op monitor interval=60m
 .INP: primitive p1 ocf:heartbeat:Dummy 	op monitor interval=60m 	op monitor interval=120m OCF_CHECK_LEVEL=10
 .INP: filter "sed '$aprimitive p2 ocf:heartbeat:Dummy'"
 .INP: filter "sed '$agroup g1 p1 p2'"
@@ -87,7 +87,7 @@ order o-d456 d4 d5 d6
 .EXT cib metadata
 .INP: show
 node node1 \
-	attributes mem=16G
+	mem=16G
 primitive d1 Dummy
 primitive d2 Dummy
 primitive d3 Dummy
@@ -100,7 +100,7 @@ primitive p1 Dummy \
 primitive p2 Dummy
 primitive p3 Dummy
 primitive st stonith:null \
-	params hostlist=node1 \
+	hostlist=node1 \
 	meta description="some description here" \
 	op start requires=nothing interval=0 \
 	op monitor interval=60m

diff --git a/test/testcases/file.exp b/test/testcases/file.exp
@@ -4,10 +4,10 @@ node node1
 primitive p0 ocf:pacemaker:Dummy
 primitive p1 ocf:pacemaker:Dummy
 primitive p2 Delay \
-	params startdelay=2 mondelay=2 stopdelay=2
+	startdelay=2 mondelay=2 stopdelay=2
 primitive p3 ocf:pacemaker:Dummy
 primitive st stonith:null \
-	params hostlist=node1
+	hostlist=node1
 ms m1 p2
 clone c1 p1
 property cib-bootstrap-options: \
@@ -40,10 +40,10 @@ node node1
 primitive p0 ocf:pacemaker:Dummy
 primitive p1 ocf:pacemaker:Dummy
 primitive p2 Delay \
-	params startdelay=2 mondelay=2 stopdelay=2
+	startdelay=2 mondelay=2 stopdelay=2
 primitive p3 ocf:pacemaker:Dummy
 primitive st stonith:null \
-	params hostlist=node1
+	hostlist=node1
 # comment
 ms m1 p2
 clone c1 p1