Hello community, here is the log from the commit of package crmsh for openSUSE:Factory checked in at 2014-10-18 09:09:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-10-11 19:28:33.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.crmsh.new/crmsh.changes 2014-10-18 09:10:24.000000000 +0200 @@ -1,0 +2,10 @@ +Fri Oct 17 15:51:21 UTC 2014 - [email protected] + +- medium: xmlutil: Use idmgmt when creating new elements (bnc#901543) +- high: cibconfig: Don't crash if given an invalid pattern (bnc#901714) +- high: xmlutil: Filter list of referenced resources (bnc#901714) +- doc: Clarified note for default-timeouts +- doc: cibconfig: Add note on inner ids after rename +- upstream cs: 2.1.0-108-g0824da1 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crmsh.spec ++++++ --- /var/tmp/diff_new_pack.F61G2S/_old 2014-10-18 09:10:25.000000000 +0200 +++ /var/tmp/diff_new_pack.F61G2S/_new 2014-10-18 09:10:25.000000000 +0200 @@ -41,7 +41,7 @@ Summary: High Availability cluster command-line interface License: GPL-2.0+ Group: %{pkg_group} -Version: 2.1+git98 +Version: 2.1+git108 Release: %{?crmsh_release}%{?dist} Url: http://crmsh.github.io Source0: crmsh.tar.bz2 ++++++ crmsh.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/doc/crm.8.adoc new/crmsh/doc/crm.8.adoc --- old/crmsh/doc/crm.8.adoc 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/doc/crm.8.adoc 2014-10-17 17:46:44.000000000 +0200 @@ -2439,9 +2439,13 @@ .Note on `default-timeouts` **************************** -You may be happy using this, but your applications may not. And -it will tell you so at the worst possible moment. You have been -warned. +The use of this command is discouraged in favor of manually +determining the best timeouts required for the particular +configuration. Relying on the resource agent to supply appropriate +timeouts can cause the resource to fail at the worst possible moment. + +Appropriate timeouts for resource actions are context-sensitive, and +should be carefully considered with the whole configuration in mind. **************************** [[cmdhelp_configure_delete,delete CIB objects]] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/doc/website-v1/documentation.adoc new/crmsh/doc/website-v1/documentation.adoc --- old/crmsh/doc/website-v1/documentation.adoc 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/doc/website-v1/documentation.adoc 2014-10-17 17:46:44.000000000 +0200 @@ -35,9 +35,5 @@ For more information on Pacemaker in general, see the http://clusterlabs.org/doc/[Pacemaker documentation] at `clusterlabs.org`. -On the Pacemaker website, there is a set of guides to configuring -Pacemaker using `crmsh`. To find these guides, go to the documentation -page and search for `crmsh`. - For details on command line usage, see the link:/man[Manual]. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/doc/website-v1/start-guide.adoc new/crmsh/doc/website-v1/start-guide.adoc --- old/crmsh/doc/website-v1/start-guide.adoc 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/doc/website-v1/start-guide.adoc 2014-10-17 17:46:44.000000000 +0200 @@ -19,7 +19,7 @@ on all nodes, and returns a version number that is `2.1` or higher: ........ -crm version +crm --version ........ .Example cluster 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-10-10 19:26:22.000000000 +0200 +++ new/crmsh/modules/cibconfig.py 2014-10-17 17:46:44.000000000 +0200 @@ -1099,6 +1099,8 @@ ''' Return False if this object can't be renamed. ''' + if self.obj_id is None: + return False rscstat = RscState() if not rscstat.can_delete(self.obj_id): common_err("cannot rename a running resource (%s)" % self.obj_id) @@ -2516,7 +2518,7 @@ def find_objects(self, obj_id): "Find objects for id (can be a wildcard-glob)." - if not self.is_cib_sane(): + if not self.is_cib_sane() or obj_id is None: return None matchfn = lambda x: x and fnmatch.fnmatch(x, obj_id) objs = [] @@ -2791,7 +2793,8 @@ matching_tags = [x for x in self.cib_objects if x.obj_type == 'tag' and x.obj_id == t] ret = [] for mt in matching_tags: - ret += [cib_factory.find_object(o) for o in mt.node.xpath('./obj_ref/@id')] + matches = [cib_factory.find_object(o) for o in mt.node.xpath('./obj_ref/@id')] + ret += [m for m in matches if m is not None] return ret def mkobj_set(self, *args): @@ -3138,7 +3141,9 @@ if not new_children_ids: return True old_children = [x for x in obj.children if x.parent == obj] - obj.children = [self.find_object(x) for x in new_children_ids] + new_children = [self.find_object(x) for x in new_children_ids] + new_children = [c for c in new_children if c is not None] + obj.children = new_children # relink orphans to top for child in set(old_children) - set(obj.children): common_debug("relink child %s to top" % str(child)) @@ -3406,7 +3411,7 @@ deleted and the one with the new name created - rename old id to new id in the object ''' - if not self.is_cib_sane(): + if not self.is_cib_sane() or not new_id: return False if idmgmt.id_in_use(new_id): return False @@ -3421,6 +3426,10 @@ rename_id(obj.node, old_id, new_id) obj.obj_id = new_id idmgmt.rename(old_id, new_id) + # FIXME: (bnc#901543) + # for each child node; if id starts with "%(old_id)s-" and + # is not referenced by anything, change that id as well? + # otherwise inner ids will resemble old name, not new obj.set_updated() def erase(self): 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-10-10 19:26:22.000000000 +0200 +++ new/crmsh/modules/ui_configure.py 2014-10-17 17:46:44.000000000 +0200 @@ -112,7 +112,10 @@ def ra_agent_for_template(tmpl): '''@template -> ra.agent''' - return ra.get_ra(cib_factory.find_object(tmpl[1:]).node) + obj = cib_factory.find_object(tmpl[1:]) + if obj is None: + return None + return ra.get_ra(obj.node) def ra_agent_for_cpt(cpt): @@ -210,6 +213,8 @@ agent = ra_agent_for_template(type_word) else: agent = ra_agent_for_cpt(type_word) + if agent is None: + return [] completers_set = { "params": _prim_params_completer, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/modules/ui_resource.py new/crmsh/modules/ui_resource.py --- old/crmsh/modules/ui_resource.py 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/modules/ui_resource.py 2014-10-17 17:46:44.000000000 +0200 @@ -49,7 +49,7 @@ l = [] for p in node.xpath(".//primitive"): diff_attr = False - for meta_set in xmlutil.get_set_nodes(p, "meta_attributes", 0): + for meta_set in xmlutil.get_set_nodes(p, "meta_attributes", create=False): p_value = xmlutil.get_attr_value(meta_set, attr) if p_value is not None and p_value != value: diff_attr = True @@ -90,7 +90,7 @@ for nvpair in nvpairs: nvpair.set("value", value) else: - for n in xmlutil.get_set_nodes(target_node, "meta_attributes", 1): + for n in xmlutil.get_set_nodes(target_node, "meta_attributes", create=True): xmlutil.set_attr(n, attr, value) return True @@ -129,7 +129,9 @@ def resolve(obj): if obj.obj_type == 'tag': - return [cib_factory.find_object(o) for o in obj.node.xpath('./obj_ref/@id')] + ret = [cib_factory.find_object(o) for o in obj.node.xpath('./obj_ref/@id')] + ret = [r for r in ret if r is not None] + return ret return obj objs = cib_factory.find_objects(rsc) 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-10-10 19:26:22.000000000 +0200 +++ new/crmsh/modules/xmlutil.py 2014-10-17 17:46:44.000000000 +0200 @@ -846,7 +846,7 @@ rsc_list = [node.get("first"), node.get("then")] elif xml_obj_type == "rsc_ticket": rsc_list = [node.get("rsc")] - return rsc_list + return [rsc for rsc in rsc_list if rsc is not None] def rename_id(node, old_id, new_id): @@ -1104,13 +1104,6 @@ return e -def new_cib_element(e, tagname, id_pfx): - base_id = e.get("id") - new_e = etree.SubElement(e, tagname) - new_e.set("id", "%s-%s" % (base_id, id_pfx)) - return new_e - - def get_attr_in_set(e, attr): if e is None: return None @@ -1133,18 +1126,26 @@ ''' nvpair = get_attr_in_set(e, attr) if nvpair is None: - nvpair = new_cib_element(e, "nvpair", attr) - nvpair.set("name", attr) - nvpair.set("value", value) + import idmgmt + nvpair = etree.SubElement(e, "nvpair", id="", name=attr, value=value) + nvpair.set("id", idmgmt.new(nvpair, e.get("id"))) + else: + nvpair.set("name", attr) + nvpair.set("value", value) -def get_set_nodes(e, setname, create=0): - 'Return the attributes set nodes (create one if requested)' +def get_set_nodes(e, setname, create=False): + """Return the attributes set nodes (create one if requested) + setname can for example be meta_attributes + """ l = [c for c in e.iterchildren(setname)] if l: return l if create: - l.append(new_cib_element(e, setname, setname)) + import idmgmt + elem = etree.SubElement(e, setname, id="") + elem.set("id", idmgmt.new(elem, e.get("id"))) + l.append(elem) return l diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/confbasic-xml.exp new/crmsh/test/testcases/confbasic-xml.exp --- old/crmsh/test/testcases/confbasic-xml.exp 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/test/testcases/confbasic-xml.exp 2014-10-17 17:46:44.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config> <cluster_property_set id="cib-bootstrap-options"> 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-10-10 19:26:22.000000000 +0200 +++ new/crmsh/test/testcases/node.exp 2014-10-17 17:46:44.000000000 +0200 @@ -9,7 +9,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -30,7 +30,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -51,7 +51,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -73,7 +73,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -95,7 +95,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -119,7 +119,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> @@ -144,7 +144,7 @@ .INP: _regtest on .INP: show xml node1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/resource new/crmsh/test/testcases/resource --- old/crmsh/test/testcases/resource 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/test/testcases/resource 2014-10-17 17:46:44.000000000 +0200 @@ -33,3 +33,7 @@ resource stop p0 resource start cg resource stop cg +resource stop p3 +configure rename p3 p4 +configure primitive p3 Dummy +resource stop p3 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-10-10 19:26:22.000000000 +0200 +++ new/crmsh/test/testcases/resource.exp 2014-10-17 17:46:44.000000000 +0200 @@ -7,7 +7,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -27,7 +27,7 @@ .INP: _regtest on .INP: show xml p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -48,7 +48,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -69,7 +69,7 @@ .INP: _regtest on .INP: show xml c1 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -92,7 +92,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -113,7 +113,7 @@ .INP: _regtest on .INP: show xml cli-prefer-p3 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -134,7 +134,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -156,7 +156,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -178,7 +178,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -197,7 +197,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -220,7 +220,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -243,7 +243,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -262,7 +262,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -288,7 +288,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -314,7 +314,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -340,7 +340,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -370,7 +370,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -400,7 +400,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -432,7 +432,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -464,7 +464,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -492,7 +492,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -516,7 +516,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -540,7 +540,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -568,7 +568,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -592,7 +592,7 @@ .INP: _regtest on .INP: show xml p0 <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes/> @@ -607,6 +607,127 @@ </group> </clone> </resources> + <constraints/> + </configuration> +</cib> + +.TRY resource stop p3 +.INP: configure +.INP: _regtest on +.INP: show xml p0 +<?xml version="1.0" ?> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> + <configuration> + <crm_config/> + <nodes/> + <resources> + <clone id="cg"> + <meta_attributes id="cg-meta_attributes"> + <nvpair id="cg-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + <group id="g"> + <primitive id="p0" class="ocf" provider="pacemaker" type="Dummy"/> + <primitive id="p3" class="ocf" provider="pacemaker" type="Dummy"> + <meta_attributes id="p3-meta_attributes"> + <nvpair id="p3-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + </primitive> + </group> + </clone> + </resources> + <constraints/> + </configuration> +</cib> + +.TRY configure rename p3 p4 +.EXT crm_resource --show-metadata ocf:pacemaker:Dummy +.EXT crm_resource --show-metadata ocf:heartbeat:Delay +.EXT crm_resource --show-metadata stonith:heartbeat:null +.EXT stonithd metadata +.INP: configure +.INP: _regtest on +.INP: show xml p0 +<?xml version="1.0" ?> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> + <configuration> + <crm_config/> + <nodes/> + <resources> + <clone id="cg"> + <meta_attributes id="cg-meta_attributes"> + <nvpair id="cg-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + <group id="g"> + <primitive id="p0" class="ocf" provider="pacemaker" type="Dummy"/> + <primitive id="p4" class="ocf" provider="pacemaker" type="Dummy"> + <meta_attributes id="p3-meta_attributes"> + <nvpair id="p3-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + </primitive> + </group> + </clone> + </resources> + <constraints/> + </configuration> +</cib> + +.TRY configure primitive p3 Dummy +.EXT crm_resource --show-metadata ocf:pacemaker:Dummy +.EXT crm_resource --show-metadata ocf:heartbeat:Delay +.EXT crm_resource --show-metadata stonith:heartbeat:null +.EXT stonithd metadata +.EXT crm_resource --show-metadata ocf:heartbeat:Dummy +.INP: configure +.INP: _regtest on +.INP: show xml p0 +<?xml version="1.0" ?> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> + <configuration> + <crm_config/> + <nodes/> + <resources> + <clone id="cg"> + <meta_attributes id="cg-meta_attributes"> + <nvpair id="cg-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + <group id="g"> + <primitive id="p0" class="ocf" provider="pacemaker" type="Dummy"/> + <primitive id="p4" class="ocf" provider="pacemaker" type="Dummy"> + <meta_attributes id="p3-meta_attributes"> + <nvpair id="p3-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + </primitive> + </group> + </clone> + </resources> + <constraints/> + </configuration> +</cib> + +.TRY resource stop p3 +.INP: configure +.INP: _regtest on +.INP: show xml p0 +<?xml version="1.0" ?> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> + <configuration> + <crm_config/> + <nodes/> + <resources> + <clone id="cg"> + <meta_attributes id="cg-meta_attributes"> + <nvpair id="cg-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + <group id="g"> + <primitive id="p0" class="ocf" provider="pacemaker" type="Dummy"/> + <primitive id="p4" class="ocf" provider="pacemaker" type="Dummy"> + <meta_attributes id="p3-meta_attributes"> + <nvpair id="p3-meta_attributes-target-role" name="target-role" value="Stopped"/> + </meta_attributes> + </primitive> + </group> + </clone> + </resources> <constraints/> </configuration> </cib> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/crmsh/test/testcases/rset-xml.exp new/crmsh/test/testcases/rset-xml.exp --- old/crmsh/test/testcases/rset-xml.exp 2014-10-10 19:26:22.000000000 +0200 +++ new/crmsh/test/testcases/rset-xml.exp 2014-10-17 17:46:44.000000000 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" ?> -<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.0" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> +<cib num_updates="0" crm_feature_set="3.0.9" validate-with="pacemaker-2.1" epoch="1" admin_epoch="0" cib-last-written="Sun Apr 12 21:37:48 2009"> <configuration> <crm_config/> <nodes> -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
