Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-03-28 16:20:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crmsh (Old) and /work/SRC/openSUSE:Factory/.crmsh.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crmsh" Changes: -------- --- /work/SRC/openSUSE:Factory/crmsh/crmsh.changes 2014-03-18 14:13:42.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-03-28 16:20:58.000000000 +0100 @@ -1,0 +2,8 @@ +Thu Mar 27 23:33:58 UTC 2014 - kgronlund@suse.com + +- medium: Enhanced configure syntax (bnc#870753) +- medium: Display without class:provider: prefix if possible (bnc#870755) +- low: Better args error handling in configure load/save (bnc#870654) +- upstream cs: f3309a48f199 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/.hg_archival.txt new/crmsh/.hg_archival.txt --- old/crmsh/.hg_archival.txt 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/.hg_archival.txt 2014-03-28 00:18:14.000000000 +0100 @@ -1,5 +1,5 @@ repo: 13c3bd69e935090cd25213c474cafc3f01b5910b -node: 053db64d9cca33de61567a117573c69079345628 +node: f3309a48f1994938d8be5d8aae2aa470a4ee415c branch: default latesttag: 1.2.6-rc1 -latesttagdistance: 476 +latesttagdistance: 489 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/doc/crm.8.txt new/crmsh/doc/crm.8.txt --- old/crmsh/doc/crm.8.txt 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/doc/crm.8.txt 2014-03-28 00:18:14.000000000 +0100 @@ -12,7 +12,7 @@ SYNOPSIS -------- -*crm* [OPTIONS] [ARGS...] +*crm* [OPTIONS] [SUBCOMMAND ARGS...] [[topics_Description,Program description]] @@ -100,13 +100,12 @@ Print crmsh version and build information (Mercurial Hg changeset hash). -*-R, --regression-tests*:: - Run in the regression test mode. Used mainly by the regression - testing suite. - *-d, --debug*:: - Print some debug information. Used by developers. [Not yet refined - enough to print useful information for other users.] + Print verbose debugging information. + +*-R, --regression-tests*:: + Enables extra verbose trace logging used by the regression + tests. Logs all external calls made by crmsh. *--scriptdir*='DIR':: Extra directory where crm looks for cluster scripts. Can be a semi-colon @@ -312,9 +311,9 @@ configuration: ............... crm(live)configure template# show -primitive virtual-ip ocf:heartbeat:IPaddr \ - params ip="192.168.1.101" -primitive apache ocf:heartbeat:apache \ +primitive virtual-ip IPaddr \ + params ip=192.168.1.101 +primitive apache apache \ params configfile="/etc/apache2/httpd.conf" monitor apache 120s:60s group websvc \ @@ -339,11 +338,11 @@ crm(live)configure# show node xen-b node xen-c -primitive apache ocf:heartbeat:apache \ +primitive apache apache \ params configfile="/etc/apache2/httpd.conf" \ - op monitor interval="120s" timeout="60s" -primitive virtual-ip ocf:heartbeat:IPaddr \ - params ip="192.168.1.101" + op monitor interval=120s timeout=60s +primitive virtual-ip IPaddr \ + params ip=192.168.1.101 group websvc apache virtual-ip ............... @@ -365,11 +364,11 @@ crm(live)configure# show node xen-b node xen-c -primitive apache ocf:heartbeat:apache \ +primitive apache apache \ params configfile="/etc/apache2/httpd.conf" \ - op monitor interval="120s" timeout="60s" -primitive intranet-ip ocf:heartbeat:IPaddr \ - params ip="192.168.1.101" + op monitor interval=120s timeout=60s +primitive intranet-ip IPaddr \ + params ip=192.168.1.101 group websvc apache intranet-ip location websvc-pref websvc 100: xen-b ............... @@ -399,16 +398,16 @@ primitive fencer stonith:external/libvirt \ params hypervisor_uri="qemu+tcp://10.2.13.1/system" \ hostlist="xen-b xen-c xen-d" \ - op monitor interval="2h" -primitive svc ocf:heartbeat:Xinetd \ - params service="systat" \ - op monitor interval="30s" -primitive intranet-ip ocf:heartbeat:IPaddr2 \ - params ip="10.2.13.100" \ - op monitor interval="30s" -primitive apache ocf:heartbeat:apache \ + op monitor interval=2h +primitive svc Xinetd \ + params service=systat \ + op monitor interval=30s +primitive intranet-ip IPaddr2 \ + params ip=10.2.13.100 \ + op monitor interval=30s +primitive apache apache \ params configfile="/etc/apache2/httpd.conf" \ - op monitor interval="120s" timeout="60s" + op monitor interval=120s timeout=60s group websvc apache intranet-ip location websvc-pref websvc 100: xen-b ............... @@ -431,7 +430,7 @@ possible to tell Pacemaker not to start any resources: ............... -crm(live)configure# property stop-all-resources="yes" +crm(live)configure# property stop-all-resources=yes ............... Almost none---resources of class stonith are still started. But shell is not as strict when it comes to stonith resources. @@ -1943,7 +1942,7 @@ For instance, with adding quotes enabled, it is possible to do the following: ............... -# crm configure primitive d1 ocf:heartbeat:Dummy \ +# crm configure primitive d1 Dummy \ meta description="some description here" # crm configure filter 'sed "s/hostlist=./&node-c /"' fencing ............... @@ -1959,17 +1958,17 @@ values. Consider the following construct: ............... crm(live)# configure show svc fs virtual-ip -primitive fs ocf:heartbeat:Filesystem \ - params device="/dev/drbd0" directory="/srv/nfs" fstype="ext3" \ - op monitor interval="10s" \ - meta target-role="Started" -primitive virtual-ip ocf:heartbeat:IPaddr2 \ - params ip="10.2.13.110" iflabel="1" \ - op monitor interval="10s" \ - op start interval="0" \ - meta target-role="Started" +primitive fs Filesystem \ + params device="/dev/drbd0" directory="/srv/nfs" fstype=ext3 \ + op monitor interval=10s \ + meta target-role=Started +primitive virtual-ip IPaddr2 \ + params ip=10.2.13.110 iflabel=1 \ + op monitor interval=10s \ + op start interval=0 \ + meta target-role=Started group svc fs virtual-ip \ - meta target-role="Stopped" + meta target-role=Stopped ............... Even though the element `svc` should be stopped, the group is @@ -2346,8 +2345,8 @@ ............... crm(live)configure# primitive a2 www-2 meta $id-ref=a1 crm(live)configure# show a2 -primitive a2 ocf:heartbeat:apache \ - meta $id-ref="a1-meta_attributes" +primitive a2 apache \ + meta $id-ref=a1-meta_attributes [...] ............... It is advisable to give meaningful names to attribute sets which @@ -2377,7 +2376,7 @@ ............... Example: ............... -rsc_template public_vm ocf:heartbeat:Xen \ +rsc_template public_vm Xen \ op start timeout=300s \ op stop timeout=300s \ op monitor interval=30s timeout=60s \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cibconfig.py new/crmsh/modules/cibconfig.py --- old/crmsh/modules/cibconfig.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/cibconfig.py 2014-03-28 00:18:14.000000000 +0100 @@ -514,7 +514,7 @@ rc = False id_set.add(id) edit_d[id] = cli_list - elif cli_list == False: + elif cli_list is False: rc = False err_buf.stop_tmp_lineno() # we can't proceed if there was a syntax error, but we @@ -720,7 +720,7 @@ for n, v in e[1]: nvpair = etree.SubElement(node, "nvpair") nvpair.set("name", n) - if v != None: + if v is not None: nvpair.set("value", v) set_id(nvpair, lookup_node(nvpair, match_node), nvpair_pfx) return node @@ -1254,7 +1254,10 @@ uname = self.node.get("uname") s = cli_display.keyword(self.obj_type) if self.obj_id != uname: - s = '%s $id="%s"' % (s, self.obj_id) + if utils.noquotes(self.obj_id): + s = "%s %s:" % (s, self.obj_id) + else: + s = '%s $id="%s"' % (s, self.obj_id) s = '%s %s' % (s, cli_display.id(uname)) type = self.node.get("type") if type and type != vars.node_default_type: @@ -1930,8 +1933,12 @@ ''' def _repr_cli_head(self, format): - return '%s $id="%s"' % \ - (cli_display.keyword(self.obj_type), self.obj_id) + s = cli_display.keyword(self.obj_type) + if utils.noquotes(self.obj_id): + s = "%s %s:" % (s, self.obj_id) + else: + s = '%s $id="%s"' % (s, self.obj_id) + return s def _repr_cli_child(self, c, format): name = c.get("name") @@ -2177,9 +2184,8 @@ "acl_user": ("user", CibAcl, "acls"), } -backtrans = odict() # generate a translation cli -> tag -for key in cib_object_map: - backtrans[cib_object_map[key][0]] = key +# generate a translation cli -> tag +backtrans = odict((item[0], key) for key, item in cib_object_map.iteritems()) def can_migrate(node): @@ -2290,7 +2296,7 @@ schema.init_schema(self.cib_elem) rc = True for obj in self.cib_objects: - if schema.get('sub', obj.node.tag, 'a') == None: + if schema.get('sub', obj.node.tag, 'a') is None: common_err("%s not supported by the RNG schema" % obj.node.tag) rc = False if not rc: @@ -2306,7 +2312,7 @@ def is_elem_supported(self, obj_type): 'Do we support this element?' try: - if schema.get('sub', backtrans[obj_type], 'a') == None: + if schema.get('sub', backtrans[obj_type], 'a') is None: return False except KeyError: pass diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/cliformat.py new/crmsh/modules/cliformat.py --- old/crmsh/modules/cliformat.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/cliformat.py 2014-03-28 00:18:14.000000000 +0100 @@ -54,7 +54,10 @@ def nvpair_format(n, v): if v is None: return cli_display.attr_name(n) - return '%s="%s"' % (cli_display.attr_name(n), cli_display.attr_value(v)) + elif utils.noquotes(v): + return '%s=%s' % (cli_display.attr_name(n), cli_display.attr_value(v)) + else: + return '%s="%s"' % (cli_display.attr_name(n), cli_display.attr_value(v)) def cli_pairs(pl): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/main.py new/crmsh/modules/main.py --- old/crmsh/modules/main.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/main.py 2014-03-28 00:18:14.000000000 +0100 @@ -142,17 +142,16 @@ f = sys.stderr if rc == 0: f = sys.stdout - print >> f, """ -usage: - crm [OPTIONS] [ARGS...] + print >> f, """Usage: crm [OPTIONS] [SUBCOMMAND ARGS...] -f, --file='FILE':: - Load commands from the given file. If the file is - then - use terminal stdin. + Load commands from the given file. If a dash `-` is used in place + of a file name, `crm` will read commands from the shell standard + input (`stdin`). -c, --cib='CIB':: - Start the session with the given shadow CIB file. - Equivalent to cib use. + Start the session using the given shadow CIB file. + Equivalent to `cib use <CIB>`. -D, --display='OUTPUT_TYPE':: Choose one of the output options: plain, color, or @@ -160,25 +159,26 @@ supports colors. Otherwise, plain is used. -F, --force:: - Make crm proceed with doing changes even though it would - normally ask user to confirm some of them. Mostly useful in - scripts. + Make `crm` proceed with applying changes where it would normally + ask the user to confirm before proceeding. This option is mainly + useful in scripts, and should be used with care. -w, --wait:: Make crm wait for the cluster transition to finish (for the changes to take effect) after each processed line. -H, --history='DIR|FILE':: - The history commands can examine either live cluster - (default) or a report generated by hb_report. Use this - option to specify a directory or file containing the report. + The `history` commands can either work directly on the live + cluster (default), or on a report generated by the `report` + command. Use this option to specify a directory or file containing + the previously generated report. -h, --help:: Print help page. --version:: - Print Pacemaker version and build information (Mercurial Hg - changeset hash). + Print crmsh version and build information (Mercurial Hg changeset + hash). -d, --debug:: Print verbose debugging information. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/parse.py new/crmsh/modules/parse.py --- old/crmsh/modules/parse.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/parse.py 2014-03-28 00:18:14.000000000 +0100 @@ -45,6 +45,8 @@ _DESC_RE = re.compile(r'description=(.+)$', re.IGNORECASE) _RESOURCE_RE = re.compile(r'([a-z_#$][^=]*)$', re.IGNORECASE) _IDSPEC_RE = re.compile(r'(\$id-ref|\$id)=(.*)$', re.IGNORECASE) + _ID_RE = re.compile(r'\$id=(.+)$', re.IGNORECASE) + _ID_NEW_RE = re.compile(r'([\w-]+):$', re.IGNORECASE) def can_parse(self): "Returns a list of commands this parser understands" @@ -214,6 +216,19 @@ """ return self.try_match(self._IDSPEC_RE) + def try_match_initial_id(self): + """ + Used as the first match on certain commands + like node and property, to match either + node $id=<id> + or + node <id>: + """ + m = self.try_match(self._ID_RE) + if m: + return m + return self.try_match(self._ID_NEW_RE) + def match_split(self, sep=':', order=None): """ matches *:*:*... @@ -271,7 +286,6 @@ class NodeParser(BaseParser): - _ID_RE = re.compile(r'\$id=(.+)$', re.IGNORECASE) _UNAME_RE = re.compile(r'([^:]+)(:(normal|member|ping))?$', re.IGNORECASE) def can_parse(self): @@ -289,7 +303,7 @@ def parse(self, cmd): """ - node [$id=<id>] <uname>[:<type>] + node [<id>:|$id=<id>] <uname>[:<type>] [description=<description>] [attributes <param>=<value> [<param>=<value>...]] [utilization <param>=<value> [<param>=<value>...]] @@ -299,7 +313,7 @@ self.begin(cmd, min_args=1) self.match('node') out = Node() - if self.try_match(self._ID_RE): + if self.try_match_initial_id(): out.id = self.matched(1) self.match(self._UNAME_RE, errmsg="Expected uname[:type]") out.uname, out.type = self.matched(1), self.matched(3) @@ -764,7 +778,9 @@ self.match('(%s)$' % '|'.join(self.can_parse())) out = Property() out.type = self.matched(1) - if self.try_match_idspec(): + if self.try_match_initial_id(): + out.values.append(('$id', self.matched(1))) + elif self.try_match_idspec(): out.values.append(('$id', self.matched(2))) out.values.extend(self.match_nvpairs()) return out diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_configure.py new/crmsh/modules/ui_configure.py --- old/crmsh/modules/ui_configure.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/ui_configure.py 2014-03-28 00:18:14.000000000 +0100 @@ -392,13 +392,17 @@ "usage: save [xml] <filename>" if not cib_factory.is_cib_sane(): context.fatal_error("CIB is not valid") + if not args: + context.fatal_error("Expected 1 argument (0 given)") if args[0] == "xml": - f = args[1] + if len(args) != 2: + context.fatal_error("Expected 2 arguments (%d given)" % (len(args))) + filename = args[1] set_obj = mkset_obj("xml") else: - f = args[0] + filename = args[0] set_obj = mkset_obj() - return set_obj.save_to_file(f) + return set_obj.save_to_file(filename) @command.skill_level('administrator') @command.completers(compl.choice(['xml', 'replace', 'update']), _load_2nd_completer) @@ -406,6 +410,8 @@ "usage: load [xml] {replace|update} {<url>|<path>}" if not cib_factory.is_cib_sane(): context.fatal_error("CIB is not valid") + if len(args) < 2: + context.fatal_error("Expected 2 arguments (0 given)") if args[0] == "xml": if len(args) != 3: context.fatal_error("Expected 3 arguments (%d given)" % len(args)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/utils.py new/crmsh/modules/utils.py --- old/crmsh/modules/utils.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/utils.py 2014-03-28 00:18:14.000000000 +0100 @@ -1320,5 +1320,13 @@ return None +# This RE matches nvpair values that can +# be left unquoted +_NOQUOTES_RE = re.compile(r'^[\w\.-]+$') + + +def noquotes(v): + return _NOQUOTES_RE.match(v) is not None + termctrl = TerminalController.getInstance() # vim:ts=4:sw=4:et: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/xmlutil.py new/crmsh/modules/xmlutil.py --- old/crmsh/modules/xmlutil.py 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/modules/xmlutil.py 2014-03-28 00:18:14.000000000 +0100 @@ -308,10 +308,31 @@ (n.get("type") == "normal" or not n.get("type")) +def unique_ra(typ, klass, provider): + """ + Unique: + * it's explicitly ocf:heartbeat: or ocf:pacemaker: + * no explicit class or provider + * only one provider (heartbeat and pacemaker counts as one provider) + Not unique: + * class is not ocf + * multiple providers + """ + if klass is None and provider is None: + return True + return klass == 'ocf' and provider is None or provider == 'heartbeat' + + def mk_rsc_type(n): + """ + Returns prefixless for unique RAs + """ ra_type = n.get("type") ra_class = n.get("class") ra_provider = n.get("provider") + if unique_ra(ra_type, ra_class, ra_provider): + ra_class = None + ra_provider = None s1 = s2 = '' if ra_class: s1 = "%s:" % ra_class diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/acl.exp new/crmsh/test/testcases/acl.exp --- old/crmsh/test/testcases/acl.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/acl.exp 2014-03-28 00:18:14.000000000 +0100 @@ -2,6 +2,8 @@ .INP: configure .INP: _regtest on .INP: erase +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: erase nodes .INP: node node1 .INP: primitive st stonith:ssh params hostlist='node1' meta target-role="Started" op start requires=nothing timeout=60s op monitor interval=60m timeout=60s @@ -19,7 +21,6 @@ .INP: .INP: _test .INP: verify -.EXT crm_resource --list-standards .EXT crm_resource --show-metadata stonith:heartbeat:ssh .EXT stonithd metadata .EXT crm_resource --show-metadata ocf:pacemaker:Dummy @@ -29,10 +30,10 @@ primitive d0 ocf:pacemaker:Dummy primitive d1 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s role basic-read \ read status \ read node attribute:uname \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/confbasic.exp new/crmsh/test/testcases/confbasic.exp --- old/crmsh/test/testcases/confbasic.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/confbasic.exp 2014-03-28 00:18:14.000000000 +0100 @@ -2,6 +2,8 @@ .INP: configure .INP: _regtest on .INP: erase +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: erase nodes .INP: node node1 .INP: delete node1 @@ -47,7 +49,6 @@ .INP: op_defaults $id=opsdef2 record-pending=true .INP: _test .INP: verify -.EXT crm_resource --list-standards .EXT crm_resource --show-metadata stonith:heartbeat:ssh .EXT stonithd metadata .EXT crm_resource --show-metadata ocf:pacemaker:Dummy @@ -58,19 +59,19 @@ .EXT cib metadata .INP: show node node1 \ - attributes mem="16G" + attributes mem=16G node node2 \ - utilization cpu="4" + utilization cpu=4 primitive d1 ocf:pacemaker:Dummy \ operations $id="d1-ops" \ - op monitor interval="60m" \ - op monitor interval="120m" OCF_CHECK_LEVEL="10" \ - op monitor interval="60s" timeout="30s" -primitive d2 ocf:heartbeat:Delay \ - params mondelay="60" \ - op start timeout="60s" interval="0" \ - op stop timeout="60s" interval="0" \ - op monitor role="Started" interval="60s" timeout="30s" + op monitor interval=60m \ + op monitor interval=120m OCF_CHECK_LEVEL=10 \ + op monitor interval=60s timeout=30s +primitive d2 Delay \ + params mondelay=60 \ + op start timeout=60s interval=0 \ + op stop timeout=60s interval=0 \ + op monitor role=Started interval=60s timeout=30s primitive d3 ocf:pacemaker:Dummy primitive d4 ocf:pacemaker:Dummy primitive s5 ocf:pacemaker:Stateful \ @@ -79,9 +80,9 @@ operations $id-ref="d1-ops" primitive st stonith:ssh \ params hostlist="node1 node2" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + 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" group g1 d1 d2 @@ -89,7 +90,7 @@ ms m5 s5 ms m6 s6 clone c d3 \ - meta clone-max="1" + meta clone-max=1 location l1 g1 100: node1 location l2 c \ rule $id="l2-rule1" 100: #uname eq node1 @@ -100,7 +101,7 @@ location l5 m5 \ rule $id="l5-rule" -inf: not_defined pingd or pingd lte 0 \ rule $id="l5-rule-0" inf: #uname eq node1 and pingd gt 0 \ - rule $id="l5-rule-1" inf: date lt "2009-05-26" and date in_range start="2009-05-26" end="2009-07-26" and date in_range start="2009-05-26" years="2009" and date date_spec years="2009" hours="09-17" + rule $id="l5-rule-1" inf: date lt "2009-05-26" and date in_range start=2009-05-26 end=2009-07-26 and date in_range start=2009-05-26 years=2009 and date date_spec years=2009 hours=09-17 location l6 m5 \ rule $id-ref="l2-rule1" location l7 m5 \ @@ -115,12 +116,12 @@ rsc_ticket ticket-B_m6_m5 ticket-B: m6 m5 loss-policy=fence rsc_ticket ticket-C_master ticket-C: m6 m5:Master loss-policy=fence fencing_topology st st2 -property $id="cib-bootstrap-options" \ - stonith-enabled="true" -property $id="cpset2" \ - maintenance-mode="true" -rsc_defaults $id="rsc-options" \ - failure-timeout="10m" -op_defaults $id="opsdef2" \ - record-pending="true" +property cib-bootstrap-options: \ + stonith-enabled=true +property cpset2: \ + maintenance-mode=true +rsc_defaults rsc-options: \ + failure-timeout=10m +op_defaults opsdef2: \ + record-pending=true .INP: commit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/delete.exp new/crmsh/test/testcases/delete.exp --- old/crmsh/test/testcases/delete.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/delete.exp 2014-03-28 00:18:14.000000000 +0100 @@ -2,6 +2,8 @@ .INP: configure .INP: # erase to start from scratch .INP: erase +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: erase nodes .INP: node node1 .INP: # create one stonith so that verify does not complain @@ -14,10 +16,10 @@ primitive d1 ocf:pacemaker:Dummy primitive d2 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s location d1-pref d1 100: node1 .INP: _test .INP: rename d1 p1 @@ -27,10 +29,10 @@ primitive d2 ocf:pacemaker:Dummy primitive p1 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s location d1-pref p1 100: node1 .INP: # delete primitive .INP: delete d2 @@ -39,10 +41,10 @@ node node1 primitive p1 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s location d1-pref p1 100: node1 .INP: # delete primitive with constraint .INP: delete p1 @@ -51,10 +53,10 @@ .INP: show node node1 primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s .INP: primitive d1 ocf:pacemaker:Dummy .INP: location d1-pref d1 100: node1 .INP: _test @@ -68,10 +70,10 @@ node node1 primitive d1 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s group g1 d1 location d1-pref g1 100: node1 .INP: _test @@ -81,13 +83,12 @@ node node1 primitive d1 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s location d1-pref d1 100: node1 .INP: verify -.EXT crm_resource --list-standards .EXT crm_resource --show-metadata stonith:heartbeat:ssh .EXT stonithd metadata .EXT crm_resource --show-metadata ocf:pacemaker:Dummy @@ -106,10 +107,10 @@ primitive d1 ocf:pacemaker:Dummy primitive d2 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s location d1-pref d2 100: node1 .INP: _test .INP: group g1 d2 d1 @@ -126,10 +127,10 @@ primitive d1 ocf:pacemaker:Dummy primitive d2 ocf:pacemaker:Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s location d1-pref d2 100: node1 .INP: _test .INP: group g1 d2 d1 @@ -144,10 +145,10 @@ .INP: show node node1 primitive st stonith:ssh \ - params hostlist="node1" \ - meta target-role="Started" \ - op start requires="nothing" timeout="60s" interval="0" \ - op monitor interval="60m" timeout="60s" + params hostlist=node1 \ + meta target-role=Started \ + op start requires=nothing timeout=60s interval=0 \ + op monitor interval=60m timeout=60s .INP: _test .INP: # verify .INP: verify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/edit new/crmsh/test/testcases/edit --- old/crmsh/test/testcases/edit 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/edit 2014-03-28 00:18:14.000000000 +0100 @@ -55,5 +55,5 @@ configure show rsc_options configure property stonith-enabled=true configure show cib-bootstrap-options -configure filter 'sed "s/stonith-enabled=.true.//"' +configure filter 'sed "s/stonith-enabled=true//"' configure show cib-bootstrap-options diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/edit.exp new/crmsh/test/testcases/edit.exp --- old/crmsh/test/testcases/edit.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/edit.exp 2014-03-28 00:18:14.000000000 +0100 @@ -2,11 +2,14 @@ .INP: configure .INP: _regtest on .INP: erase +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .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: primitive p1 ocf:heartbeat:Dummy op monitor interval=60m op monitor interval=120m OCF_CHECK_LEVEL=10 +.EXT crm_resource --list-ocf-alternatives Dummy .INP: filter "sed '$aprimitive p2 ocf:heartbeat:Dummy'" .INP: filter "sed '$agroup g1 p1 p2'" .INP: filter "sed 's/p2/p3/;$aprimitive p3 ocf:heartbeat:Dummy'" g1 @@ -52,7 +55,6 @@ .INP: filter "sed 's/^/# this is a comment\n/'" loc-d1 .INP: _test .INP: verify -.EXT crm_resource --list-standards .EXT crm_resource --show-metadata stonith:heartbeat:null .EXT stonithd metadata .EXT crm_resource --show-metadata ocf:heartbeat:Dummy @@ -61,20 +63,20 @@ .EXT cib metadata .INP: show node node1 \ - attributes mem="16G" -primitive d1 ocf:heartbeat:Dummy -primitive d2 ocf:heartbeat:Dummy -primitive d3 ocf:heartbeat:Dummy -primitive p1 ocf:heartbeat:Dummy \ - op monitor interval="60m" \ - op monitor interval="120m" OCF_CHECK_LEVEL="10" -primitive p2 ocf:heartbeat:Dummy -primitive p3 ocf:heartbeat:Dummy + attributes mem=16G +primitive d1 Dummy +primitive d2 Dummy +primitive d3 Dummy +primitive p1 Dummy \ + op monitor interval=60m \ + op monitor interval=120m OCF_CHECK_LEVEL=10 +primitive p2 Dummy +primitive p3 Dummy primitive st stonith:null \ - params hostlist="node1" \ + params hostlist=node1 \ meta description="some description here" \ - op start requires="nothing" interval="0" \ - op monitor interval="60m" + op start requires=nothing interval=0 \ + op monitor interval=60m group g1 p1 p2 d3 group g2 d1 d2 clone c1 g1 @@ -85,29 +87,43 @@ rule $id="loc-d1-rule" -inf: not_defined a2 \ rule $id="r2" webserver: defined webserver order o1 inf: p3 c1 -property $id="cib-bootstrap-options" \ - default-action-timeout="2m" +property cib-bootstrap-options: \ + default-action-timeout=2m .INP: commit .TRY configure rsc_defaults $id="rsc_options" failure-timeout=10m +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy .TRY configure filter "sed 's/2m/60s/'" cib-bootstrap-options +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy .EXT crmd metadata .EXT pengine metadata .EXT cib metadata .TRY configure show rsc_options -rsc_defaults $id="rsc_options" \ - failure-timeout="10m" +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy +rsc_defaults rsc_options: \ + failure-timeout=10m .TRY configure property stonith-enabled=true +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy .EXT crmd metadata .EXT pengine metadata .EXT cib metadata .TRY configure show cib-bootstrap-options -property $id="cib-bootstrap-options" \ - default-action-timeout="60s" \ - stonith-enabled="true" -.TRY configure filter 'sed "s/stonith-enabled=.true.//"' +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy +property cib-bootstrap-options: \ + default-action-timeout=60s \ + stonith-enabled=true +.TRY configure filter 'sed "s/stonith-enabled=true//"' +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy .EXT crmd metadata .EXT pengine metadata .EXT cib metadata .TRY configure show cib-bootstrap-options -property $id="cib-bootstrap-options" \ - default-action-timeout="60s" +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Dummy +property cib-bootstrap-options: \ + default-action-timeout=60s diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/file.exp new/crmsh/test/testcases/file.exp --- old/crmsh/test/testcases/file.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/file.exp 2014-03-28 00:18:14.000000000 +0100 @@ -1,20 +1,25 @@ .TRY configure save sample.txt +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .EXT cat sample.txt node node1 primitive p0 ocf:pacemaker:Dummy primitive p1 ocf:pacemaker:Dummy -primitive p2 ocf:heartbeat:Delay \ - params startdelay="2" mondelay="2" stopdelay="2" +primitive p2 Delay \ + params startdelay=2 mondelay=2 stopdelay=2 primitive p3 ocf:pacemaker:Dummy primitive st stonith:null \ - params hostlist="node1" + params hostlist=node1 ms m1 p2 clone c1 p1 -property $id="cib-bootstrap-options" \ - default-action-timeout="60s" +property cib-bootstrap-options: \ + default-action-timeout=60s .TRY configure erase nodes +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .TRY configure load replace sample.txt .EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .EXT crm_resource --show-metadata ocf:pacemaker:Dummy .EXT crm_resource --show-metadata ocf:heartbeat:Delay .EXT crm_resource --show-metadata stonith:heartbeat:null @@ -27,9 +32,10 @@ .TRY Load update .INP: configure .INP: delete m1 p1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: property cluster-recheck-interval="10m" .INP: load update sample.txt -.EXT crm_resource --list-standards .EXT crm_resource --show-metadata ocf:pacemaker:Dummy .EXT crm_resource --show-metadata stonith:heartbeat:null .EXT stonithd metadata @@ -38,18 +44,20 @@ .EXT pengine metadata .EXT cib metadata .TRY configure show +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay node node1 primitive p0 ocf:pacemaker:Dummy primitive p1 ocf:pacemaker:Dummy -primitive p2 ocf:heartbeat:Delay \ - params startdelay="2" mondelay="2" stopdelay="2" +primitive p2 Delay \ + params startdelay=2 mondelay=2 stopdelay=2 primitive p3 ocf:pacemaker:Dummy primitive st stonith:null \ - params hostlist="node1" + params hostlist=node1 # comment ms m1 p2 clone c1 p1 -property $id="cib-bootstrap-options" \ - default-action-timeout="2m" \ - cluster-recheck-interval="10m" +property cib-bootstrap-options: \ + default-action-timeout=2m \ + cluster-recheck-interval=10m .EXT rm sample.txt diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/node.exp new/crmsh/test/testcases/node.exp --- old/crmsh/test/testcases/node.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/node.exp 2014-03-28 00:18:14.000000000 +0100 @@ -8,6 +8,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -29,6 +31,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -50,6 +54,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -72,6 +78,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -94,6 +102,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -118,6 +128,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -143,6 +155,8 @@ .INP: configure .INP: _regtest on .INP: show xml node1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/resource.exp new/crmsh/test/testcases/resource.exp --- old/crmsh/test/testcases/resource.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/resource.exp 2014-03-28 00:18:14.000000000 +0100 @@ -7,6 +7,8 @@ .INP: configure .INP: _regtest on .INP: show xml p3 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -28,6 +30,8 @@ .INP: configure .INP: _regtest on .INP: show xml p3 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -50,6 +54,8 @@ .INP: configure .INP: _regtest on .INP: show xml c1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -72,6 +78,8 @@ .INP: configure .INP: _regtest on .INP: show xml c1 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -95,6 +103,8 @@ .INP: configure .INP: _regtest on .INP: show xml cli-prefer-p3 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -116,6 +126,8 @@ .INP: configure .INP: _regtest on .INP: show xml cli-prefer-p3 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -137,6 +149,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -159,6 +173,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -181,6 +197,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -198,6 +216,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -220,6 +240,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -242,6 +264,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -255,9 +279,13 @@ </cib> .TRY configure group g p0 p3 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -281,6 +309,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -305,6 +335,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -332,6 +364,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -363,6 +397,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -390,9 +426,13 @@ </cib> .TRY configure clone cg g +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -425,6 +465,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -458,6 +500,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -487,6 +531,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -512,6 +558,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -537,6 +585,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -566,6 +616,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> @@ -591,6 +643,8 @@ .INP: configure .INP: _regtest on .INP: show xml p0 +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay <?xml version="1.0" ?> <cib admin_epoch="0" epoch="1" num_updates="1" validate-with="pacemaker-1.2" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/rset.exp new/crmsh/test/testcases/rset.exp --- old/crmsh/test/testcases/rset.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/rset.exp 2014-03-28 00:18:14.000000000 +0100 @@ -2,11 +2,14 @@ .INP: configure .INP: _regtest on .INP: erase +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: erase nodes .INP: node node1 .INP: primitive st stonith:ssh params hostlist='node1' op start timeout=60s .INP: primitive d1 ocf:pacemaker:Dummy .INP: primitive d2 ocf:heartbeat:Dummy +.EXT crm_resource --list-ocf-alternatives Dummy .INP: primitive d3 ocf:heartbeat:Dummy .INP: primitive d4 ocf:heartbeat:Dummy .INP: primitive d5 ocf:heartbeat:Dummy @@ -36,7 +39,6 @@ order o1 Serialize: d1 d3 .INP: _test .INP: verify -.EXT crm_resource --list-standards .EXT crm_resource --show-metadata stonith:heartbeat:ssh .EXT stonithd metadata .EXT crm_resource --show-metadata ocf:pacemaker:Dummy @@ -45,11 +47,11 @@ .INP: show node node1 primitive d1 ocf:pacemaker:Dummy -primitive d3 ocf:heartbeat:Dummy -primitive d5 ocf:heartbeat:Dummy +primitive d3 Dummy +primitive d5 Dummy primitive st stonith:ssh \ - params hostlist="node1" \ - op start timeout="60s" interval="0" + params hostlist=node1 \ + op start timeout=60s interval=0 colocation c1 inf: ( d1 d3 ) colocation c2 inf: d3 d1 colocation c3 inf: d3 d1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/shadow.exp new/crmsh/test/testcases/shadow.exp --- old/crmsh/test/testcases/shadow.exp 2014-03-17 13:09:30.000000000 +0100 +++ new/crmsh/test/testcases/shadow.exp 2014-03-28 00:18:14.000000000 +0100 @@ -1,4 +1,6 @@ .TRY Shadow CIB management +.EXT crm_resource --list-standards +.EXT crm_resource --list-ocf-alternatives Delay .INP: cib .INP: new regtest force .EXT >/dev/null