No OneTemporary
Actions

Size

105 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/lib/pengine/clone.c b/lib/pengine/clone.c
	index 7ce24671cd..1ce67cdf51 100644
	--- a/lib/pengine/clone.c
	+++ b/lib/pengine/clone.c
	@@ -1,555 +1,559 @@
	/*
	* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	#include <crm_internal.h>

	#include <crm/pengine/rules.h>
	#include <crm/pengine/status.h>
	#include <crm/pengine/internal.h>
	#include <unpack.h>
	#include <crm/msg_xml.h>

	#define VARIANT_CLONE 1
	#include "./variant.h"

	void clone_create_notifications(resource_t * rsc, action_t * action, action_t * action_complete,
	pe_working_set_t * data_set);
	void force_non_unique_clone(resource_t * rsc, const char rid, pe_working_set_t data_set);
	resource_t create_child_clone(resource_t rsc, int sub_id, pe_working_set_t * data_set);

	static void
	mark_as_orphan(resource_t * rsc)
	{
	GListPtr gIter = rsc->children;

	set_bit(rsc->flags, pe_rsc_orphan);

	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child = (resource_t ) gIter->data;

	mark_as_orphan(child);
	}
	}

	static void
	clear_bit_recursive(resource_t * rsc, unsigned long long flag)
	{
	GListPtr gIter = rsc->children;

	clear_bit(rsc->flags, flag);
	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child_rsc = (resource_t ) gIter->data;

	clear_bit_recursive(child_rsc, flag);
	}
	}

	void
	force_non_unique_clone(resource_t * rsc, const char rid, pe_working_set_t data_set)
	{
	if (rsc->variant == pe_clone \|\| rsc->variant == pe_master) {
	clone_variant_data_t *clone_data = NULL;

	get_clone_variant_data(clone_data, rsc);

	crm_config_warn("Clones %s contains non-OCF resource %s and so "
	"can only be used as an anonymous clone. "
	"Set the " XML_RSC_ATTR_UNIQUE " meta attribute to false", rsc->id, rid);

	clone_data->clone_node_max = 1;
	clone_data->clone_max = g_list_length(data_set->nodes);
	clear_bit_recursive(rsc, pe_rsc_unique);
	}
	}

	resource_t *
	find_clone_instance(resource_t * rsc, const char sub_id, pe_working_set_t data_set)
	{
	char *child_id = NULL;
	resource_t *child = NULL;
	const char *child_base = NULL;
	clone_variant_data_t *clone_data = NULL;

	get_clone_variant_data(clone_data, rsc);

	child_base = ID(clone_data->xml_obj_child);
	child_id = crm_concat(child_base, sub_id, ':');
	child = pe_find_resource(rsc->children, child_id);

	free(child_id);
	return child;
	}

	resource_t *
	create_child_clone(resource_t * rsc, int sub_id, pe_working_set_t * data_set)
	{
	gboolean as_orphan = FALSE;
	char *inc_num = NULL;
	char *inc_max = NULL;
	resource_t *child_rsc = NULL;
	xmlNode *child_copy = NULL;
	clone_variant_data_t *clone_data = NULL;

	get_clone_variant_data(clone_data, rsc);

	CRM_CHECK(clone_data->xml_obj_child != NULL, return FALSE);

	if (sub_id < 0) {
	as_orphan = TRUE;
	sub_id = clone_data->total_clones;
	}
	inc_num = crm_itoa(sub_id);
	inc_max = crm_itoa(clone_data->clone_max);

	child_copy = copy_xml(clone_data->xml_obj_child);

	crm_xml_add(child_copy, XML_RSC_ATTR_INCARNATION, inc_num);

	if (common_unpack(child_copy, &child_rsc, rsc, data_set) == FALSE) {
	pe_err("Failed unpacking resource %s", crm_element_value(child_copy, XML_ATTR_ID));
	child_rsc = NULL;
	goto bail;
	}
	/* child_rsc->globally_unique = rsc->globally_unique; */

	clone_data->total_clones += 1;
	pe_rsc_trace(child_rsc, "Setting clone attributes for: %s", child_rsc->id);
	rsc->children = g_list_append(rsc->children, child_rsc);
	if (as_orphan) {
	mark_as_orphan(child_rsc);
	}

	add_hash_param(child_rsc->meta, XML_RSC_ATTR_INCARNATION_MAX, inc_max);

	print_resource(LOG_DEBUG_3, "Added", child_rsc, FALSE);

	bail:
	free(inc_num);
	free(inc_max);

	return child_rsc;
	}

	gboolean
	master_unpack(resource_t * rsc, pe_working_set_t * data_set)
	{
	const char *master_max = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_MASTER_MAX);
	const char *master_node_max = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_MASTER_NODEMAX);

	g_hash_table_replace(rsc->meta, strdup("stateful"), strdup(XML_BOOLEAN_TRUE));
	if (clone_unpack(rsc, data_set)) {
	clone_variant_data_t *clone_data = NULL;

	get_clone_variant_data(clone_data, rsc);
	clone_data->master_max = crm_parse_int(master_max, "1");
	clone_data->master_node_max = crm_parse_int(master_node_max, "1");
	return TRUE;
	}
	return FALSE;
	}

	gboolean
	clone_unpack(resource_t * rsc, pe_working_set_t * data_set)
	{
	int lpc = 0;
	const char *type = NULL;
	resource_t *self = NULL;
	int num_xml_children = 0;
	xmlNode *a_child = NULL;
	xmlNode *xml_tmp = NULL;
	xmlNode *xml_self = NULL;
	xmlNode *xml_obj = rsc->xml;
	clone_variant_data_t *clone_data = NULL;

	const char *ordered = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_ORDERED);
	const char *interleave = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_INTERLEAVE);
	const char *max_clones = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_INCARNATION_MAX);
	const char *max_clones_node = g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_INCARNATION_NODEMAX);

	pe_rsc_trace(rsc, "Processing resource %s...", rsc->id);

	clone_data = calloc(1, sizeof(clone_variant_data_t));
	rsc->variant_opaque = clone_data;
	clone_data->interleave = FALSE;
	clone_data->ordered = FALSE;

	clone_data->active_clones = 0;
	clone_data->xml_obj_child = NULL;
	clone_data->clone_node_max = crm_parse_int(max_clones_node, "1");

	if (max_clones) {
	clone_data->clone_max = crm_parse_int(max_clones, "1");

	} else if (g_list_length(data_set->nodes) > 0) {
	clone_data->clone_max = g_list_length(data_set->nodes);

	} else {
	clone_data->clone_max = 1; /* Handy during crm_verify */
	}

	if (crm_is_true(interleave)) {
	clone_data->interleave = TRUE;
	}
	if (crm_is_true(ordered)) {
	clone_data->ordered = TRUE;
	}
	if ((rsc->flags & pe_rsc_unique) == 0 && clone_data->clone_node_max > 1) {
	crm_config_err("Anonymous clones (%s) may only support one copy" " per node", rsc->id);
	clone_data->clone_node_max = 1;
	}

	pe_rsc_trace(rsc, "Options for %s", rsc->id);
	pe_rsc_trace(rsc, "\tClone max: %d", clone_data->clone_max);
	pe_rsc_trace(rsc, "\tClone node max: %d", clone_data->clone_node_max);
	pe_rsc_trace(rsc, "\tClone is unique: %s", is_set(rsc->flags, pe_rsc_unique) ? "true" : "false");

	clone_data->xml_obj_child = find_xml_node(xml_obj, XML_CIB_TAG_GROUP, FALSE);

	if (clone_data->xml_obj_child == NULL) {
	clone_data->xml_obj_child = find_xml_node(xml_obj, XML_CIB_TAG_RESOURCE, TRUE);
	for (a_child = __xml_first_child(xml_obj); a_child != NULL; a_child = __xml_next(a_child)) {
	if (crm_str_eq((const char *)a_child->name, XML_CIB_TAG_RESOURCE, TRUE)) {
	num_xml_children++;
	}
	}
	}

	if (clone_data->xml_obj_child == NULL) {
	crm_config_err("%s has nothing to clone", rsc->id);
	return FALSE;
	}

	for (a_child = __xml_first_child(xml_obj); a_child != NULL; a_child = __xml_next(a_child)) {
	if (crm_str_eq((const char *)a_child->name, type, TRUE)) {
	num_xml_children++;
	}
	}

	if (num_xml_children > 1) {
	crm_config_err("%s has too many children. Only the first (%s) will be cloned.",
	rsc->id, ID(clone_data->xml_obj_child));
	}

	xml_self = copy_xml(rsc->xml);
	/* this is a bit of a hack - but simplifies everything else */
	xmlNodeSetName(xml_self, ((const xmlChar *)XML_CIB_TAG_RESOURCE));
	xml_tmp = find_xml_node(xml_obj, "operations", FALSE);
	if (xml_tmp != NULL) {
	add_node_copy(xml_self, xml_tmp);
	}

	/*
	* Make clones ever so slightly sticky by default
	*
	* This helps ensure clone instances are not shuffled around the cluster
	* for no benefit in situations when pre-allocation is not appropriate
	*/
	if (g_hash_table_lookup(rsc->meta, XML_RSC_ATTR_STICKINESS) == NULL) {
	add_hash_param(rsc->meta, XML_RSC_ATTR_STICKINESS, "1");
	}

	if (common_unpack(xml_self, &self, rsc, data_set)) {
	clone_data->self = self;

	} else {
	crm_log_xml_err(xml_self, "Couldnt unpack dummy child");
	clone_data->self = self;
	return FALSE;
	}

	pe_rsc_trace(rsc, "\tClone is unique (fixed): %s",
	is_set(rsc->flags, pe_rsc_unique) ? "true" : "false");
	clone_data->notify_confirm = is_set(rsc->flags, pe_rsc_notify);
	add_hash_param(rsc->meta, XML_RSC_ATTR_UNIQUE,
	is_set(rsc->flags, pe_rsc_unique) ? XML_BOOLEAN_TRUE : XML_BOOLEAN_FALSE);

	for (lpc = 0; lpc < clone_data->clone_max; lpc++) {
	create_child_clone(rsc, lpc, data_set);
	}

	if (clone_data->clone_max == 0) {
	/* create one so that unpack_find_resource() will hook up
	* any orphans up to the parent correctly
	*/
	create_child_clone(rsc, -1, data_set);
	}

	pe_rsc_trace(rsc, "Added %d children to resource %s...", clone_data->clone_max, rsc->id);
	return TRUE;
	}

	gboolean
	clone_active(resource_t * rsc, gboolean all)
	{
	GListPtr gIter = rsc->children;

	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child_rsc = (resource_t ) gIter->data;
	gboolean child_active = child_rsc->fns->active(child_rsc, all);

	if (all == FALSE && child_active) {
	return TRUE;
	} else if (all && child_active == FALSE) {
	return FALSE;
	}
	}

	if (all) {
	return TRUE;
	} else {
	return FALSE;
	}
	}

	static void
	short_print(char list, const char prefix, const char type, long options, void print_data)
	{
	if (list) {
	if (options & pe_print_html) {
	status_print("<li>");
	}
	status_print("%s%s: [%s ]", prefix, type, list);

	if (options & pe_print_html) {
	status_print("</li>\n");

	} else if (options & pe_print_suppres_nl) {
	/* nothing */
	} else if ((options & pe_print_printf) \|\| (options & pe_print_ncurses)) {
	status_print("\n");
	}

	}
	}

	static void
	clone_print_xml(resource_t * rsc, const char pre_text, long options, void print_data)
	{
	int is_master_slave = rsc->variant == pe_master ? 1 : 0;
	char *child_text = crm_concat(pre_text, " ", ' ');
	GListPtr gIter = rsc->children;

	status_print("%s<clone ", pre_text);
	status_print("id=\"%s\" ", rsc->id);
	status_print("multi_state=\"%s\" ", is_master_slave ? "true" : "false");
	status_print("unique=\"%s\" ", is_set(rsc->flags, pe_rsc_unique) ? "true" : "false");
	status_print("managed=\"%s\" ", is_set(rsc->flags, pe_rsc_managed) ? "true" : "false");
	status_print("failed=\"%s\" ", is_set(rsc->flags, pe_rsc_failed) ? "true" : "false");
	status_print("failure_ignored=\"%s\" ",
	is_set(rsc->flags, pe_rsc_failure_ignored) ? "true" : "false");
	status_print(">\n");

	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child_rsc = (resource_t ) gIter->data;

	child_rsc->fns->print(child_rsc, child_text, options, print_data);
	}

	status_print("%s</clone>\n", pre_text);
	free(child_text);
	}

	void
	clone_print(resource_t * rsc, const char pre_text, long options, void print_data)
	{
	char *list_text = NULL;
	char *child_text = NULL;
	char *stopped_list = NULL;
	const char *type = "Clone";

	GListPtr master_list = NULL;
	GListPtr started_list = NULL;
	GListPtr gIter = rsc->children;

	clone_variant_data_t *clone_data = NULL;

	if (pre_text == NULL) {
	pre_text = " ";
	}

	if (options & pe_print_xml) {
	clone_print_xml(rsc, pre_text, options, print_data);
	return;
	}

	get_clone_variant_data(clone_data, rsc);

	child_text = crm_concat(pre_text, " ", ' ');

	if (rsc->variant == pe_master) {
	type = "Master/Slave";
	}

	status_print("%s%s Set: %s [%s]%s%s",
	pre_text ? pre_text : "", type, rsc->id, ID(clone_data->xml_obj_child),
	is_set(rsc->flags, pe_rsc_unique) ? " (unique)" : "",
	is_set(rsc->flags, pe_rsc_managed) ? "" : " (unmanaged)");

	if (options & pe_print_html) {
	status_print("\n<ul>\n");

	} else if ((options & pe_print_log) == 0) {
	status_print("\n");
	}

	for (; gIter != NULL; gIter = gIter->next) {
	gboolean print_full = FALSE;
	resource_t child_rsc = (resource_t ) gIter->data;

	if (child_rsc->fns->active(child_rsc, FALSE) == FALSE) {
	/* Inactive clone */
	if (is_set(child_rsc->flags, pe_rsc_orphan)) {
	continue;

	} else if (is_set(rsc->flags, pe_rsc_unique)) {
	print_full = TRUE;
	} else {
	stopped_list = add_list_element(stopped_list, child_rsc->id);
	}

	} else if (is_set(child_rsc->flags, pe_rsc_unique)
	\|\| is_set(child_rsc->flags, pe_rsc_orphan)
	\|\| is_set(child_rsc->flags, pe_rsc_managed) == FALSE
	\|\| is_set(child_rsc->flags, pe_rsc_failed)) {

	/* Unique, unmanaged or failed clone */
	print_full = TRUE;

	} else if (child_rsc->fns->active(child_rsc, TRUE)) {
	/* Fully active anonymous clone */
	node_t *location = child_rsc->fns->location(child_rsc, NULL, TRUE);

	if (location) {
	enum rsc_role_e a_role = child_rsc->fns->state(child_rsc, TRUE);

	if (a_role > RSC_ROLE_SLAVE) {
	/* And active on a single node as master */
	master_list = g_list_append(master_list, location);

	} else {
	/* And active on a single node as started/slave */
	started_list = g_list_append(started_list, location);
	}

	} else {
	/* uncolocated group - bleh */
	print_full = TRUE;
	}

	} else {
	/* Partially active anonymous clone */
	print_full = TRUE;
	}

	if (print_full) {
	if (options & pe_print_html) {
	status_print("<li>\n");
	}
	child_rsc->fns->print(child_rsc, child_text, options, print_data);
	if (options & pe_print_html) {
	status_print("</li>\n");
	}
	}
	}

	/* Masters */
	master_list = g_list_sort(master_list, sort_node_uname);
	for(gIter = master_list; gIter; gIter = gIter->next) {
	node_t *host = gIter->data;
	list_text = add_list_element(list_text, host->details->uname);
	}

	short_print(list_text, child_text, "Masters", options, print_data);
	g_list_free(master_list);
	free(list_text);
	list_text = NULL;

	/* Started/Slaves */
	started_list = g_list_sort(started_list, sort_node_uname);
	for(gIter = started_list; gIter; gIter = gIter->next) {
	node_t *host = gIter->data;
	list_text = add_list_element(list_text, host->details->uname);
	}

	short_print(list_text, child_text, rsc->variant == pe_master ? "Slaves" : "Started", options, print_data);
	g_list_free(started_list);
	free(list_text);
	list_text = NULL;

	/* Stopped */
	short_print(stopped_list, child_text, "Stopped", options, print_data);
	free(stopped_list);

	if (options & pe_print_html) {
	status_print("</ul>\n");
	}

	free(child_text);
	}

	void
	clone_free(resource_t * rsc)
	{
	GListPtr gIter = rsc->children;
	clone_variant_data_t *clone_data = NULL;

	get_clone_variant_data(clone_data, rsc);

	pe_rsc_trace(rsc, "Freeing %s", rsc->id);

	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child_rsc = (resource_t ) gIter->data;

	pe_rsc_trace(child_rsc, "Freeing child %s", child_rsc->id);
	free_xml(child_rsc->xml);
	+ child_rsc->xml = NULL;
	+ /* There could be a saved unexpanded xml */
	+ free_xml(child_rsc->orig_xml);
	+ child_rsc->orig_xml = NULL;
	child_rsc->fns->free(child_rsc);
	}

	g_list_free(rsc->children);

	if (clone_data->self) {
	free_xml(clone_data->self->xml);
	clone_data->self->fns->free(clone_data->self);
	}

	CRM_ASSERT(clone_data->demote_notify == NULL);
	CRM_ASSERT(clone_data->stop_notify == NULL);
	CRM_ASSERT(clone_data->start_notify == NULL);
	CRM_ASSERT(clone_data->promote_notify == NULL);

	common_free(rsc);
	}

	enum rsc_role_e
	clone_resource_state(const resource_t * rsc, gboolean current)
	{
	enum rsc_role_e clone_role = RSC_ROLE_UNKNOWN;
	GListPtr gIter = rsc->children;

	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child_rsc = (resource_t ) gIter->data;
	enum rsc_role_e a_role = child_rsc->fns->state(child_rsc, current);

	if (a_role > clone_role) {
	clone_role = a_role;
	}
	}

	pe_rsc_trace(rsc, "%s role: %s", rsc->id, role2text(clone_role));
	return clone_role;
	}
	diff --git a/lib/pengine/complex.c b/lib/pengine/complex.c
	index 88923e251c..1fdf59a033 100644
	--- a/lib/pengine/complex.c
	+++ b/lib/pengine/complex.c
	@@ -1,715 +1,717 @@
	/*
	* Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	*
	* This library is free software; you can redistribute it and/or
	* modify it under the terms of the GNU Lesser General Public
	* License as published by the Free Software Foundation; either
	* version 2.1 of the License, or (at your option) any later version.
	*
	* This library is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	* Lesser General Public License for more details.
	*
	* You should have received a copy of the GNU Lesser General Public
	* License along with this library; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	*/

	#include <crm_internal.h>

	#include <crm/pengine/rules.h>
	#include <crm/pengine/internal.h>
	#include <crm/msg_xml.h>

	extern xmlNode get_object_root(const char object_type, xmlNode * the_root);
	void populate_hash(xmlNode * nvpair_list, GHashTable * hash, const char **attrs, int attrs_length);

	resource_object_functions_t resource_class_functions[] = {
	{
	native_unpack,
	native_find_rsc,
	native_parameter,
	native_print,
	native_active,
	native_resource_state,
	native_location,
	native_free},
	{
	group_unpack,
	native_find_rsc,
	native_parameter,
	group_print,
	group_active,
	group_resource_state,
	native_location,
	group_free},
	{
	clone_unpack,
	native_find_rsc,
	native_parameter,
	clone_print,
	clone_active,
	clone_resource_state,
	native_location,
	clone_free},
	{
	master_unpack,
	native_find_rsc,
	native_parameter,
	clone_print,
	clone_active,
	clone_resource_state,
	native_location,
	clone_free}
	};

	enum pe_obj_types
	get_resource_type(const char *name)
	{
	if (safe_str_eq(name, XML_CIB_TAG_RESOURCE)) {
	return pe_native;

	} else if (safe_str_eq(name, XML_CIB_TAG_GROUP)) {
	return pe_group;

	} else if (safe_str_eq(name, XML_CIB_TAG_INCARNATION)) {
	return pe_clone;

	} else if (safe_str_eq(name, XML_CIB_TAG_MASTER)) {
	return pe_master;
	}

	return pe_unknown;
	}

	const char *
	get_resource_typename(enum pe_obj_types type)
	{
	switch (type) {
	case pe_native:
	return XML_CIB_TAG_RESOURCE;
	case pe_group:
	return XML_CIB_TAG_GROUP;
	case pe_clone:
	return XML_CIB_TAG_INCARNATION;
	case pe_master:
	return XML_CIB_TAG_MASTER;
	case pe_unknown:
	return "unknown";
	}
	return "<unknown>";
	}

	static void
	dup_attr(gpointer key, gpointer value, gpointer user_data)
	{
	add_hash_param(user_data, key, value);
	}

	void
	get_meta_attributes(GHashTable * meta_hash, resource_t * rsc,
	node_t * node, pe_working_set_t * data_set)
	{
	GHashTable *node_hash = NULL;

	if (node) {
	node_hash = node->details->attrs;
	}

	if (rsc->xml) {
	xmlAttrPtr xIter = NULL;

	for (xIter = rsc->xml->properties; xIter; xIter = xIter->next) {
	const char prop_name = (const char )xIter->name;
	const char *prop_value = crm_element_value(rsc->xml, prop_name);

	add_hash_param(meta_hash, prop_name, prop_value);
	}
	}

	unpack_instance_attributes(data_set->input, rsc->xml, XML_TAG_META_SETS, node_hash,
	meta_hash, NULL, FALSE, data_set->now);

	/* populate from the regular attributes until the GUI can create
	* meta attributes
	*/
	unpack_instance_attributes(data_set->input, rsc->xml, XML_TAG_ATTR_SETS, node_hash,
	meta_hash, NULL, FALSE, data_set->now);

	/* set anything else based on the parent */
	if (rsc->parent != NULL) {
	g_hash_table_foreach(rsc->parent->meta, dup_attr, meta_hash);
	}

	/* and finally check the defaults */
	unpack_instance_attributes(data_set->input, data_set->rsc_defaults, XML_TAG_META_SETS,
	node_hash, meta_hash, NULL, FALSE, data_set->now);
	}

	void
	get_rsc_attributes(GHashTable * meta_hash, resource_t * rsc,
	node_t * node, pe_working_set_t * data_set)
	{
	GHashTable *node_hash = NULL;

	if (node) {
	node_hash = node->details->attrs;
	}

	unpack_instance_attributes(data_set->input, rsc->xml, XML_TAG_ATTR_SETS, node_hash,
	meta_hash, NULL, FALSE, data_set->now);

	/* set anything else based on the parent */
	if (rsc->parent != NULL) {
	get_rsc_attributes(meta_hash, rsc->parent, node, data_set);

	} else {
	/* and finally check the defaults */
	unpack_instance_attributes(data_set->input, data_set->rsc_defaults, XML_TAG_ATTR_SETS,
	node_hash, meta_hash, NULL, FALSE, data_set->now);
	}
	}

	static char *
	template_op_key(xmlNode * op)
	{
	const char *name = crm_element_value(op, "name");
	const char *role = crm_element_value(op, "role");
	char *key = NULL;

	if (role == NULL \|\| crm_str_eq(role, RSC_ROLE_STARTED_S, TRUE)
	\|\| crm_str_eq(role, RSC_ROLE_SLAVE_S, TRUE)) {
	role = RSC_ROLE_UNKNOWN_S;
	}

	key = crm_concat(name, role, '-');
	return key;
	}

	static gboolean
	unpack_template(xmlNode * xml_obj, xmlNode ** expanded_xml, pe_working_set_t * data_set)
	{
	xmlNode *cib_resources = NULL;
	xmlNode *template = NULL;
	xmlNode *new_xml = NULL;
	xmlNode *child_xml = NULL;
	xmlNode *rsc_ops = NULL;
	xmlNode *template_ops = NULL;
	const char *template_ref = NULL;
	const char *id = NULL;

	if (xml_obj == NULL) {
	pe_err("No resource object for template unpacking");
	return FALSE;
	}

	template_ref = crm_element_value(xml_obj, XML_CIB_TAG_RSC_TEMPLATE);
	if (template_ref == NULL) {
	return TRUE;
	}

	id = ID(xml_obj);
	if (id == NULL) {
	pe_err("'%s' object must have a id", crm_element_name(xml_obj));
	return FALSE;
	}

	if (crm_str_eq(template_ref, id, TRUE)) {
	pe_err("The resource object '%s' should not reference itself", id);
	return FALSE;
	}

	cib_resources = get_object_root(XML_CIB_TAG_RESOURCES, data_set->input);
	if (cib_resources == NULL) {
	pe_err("Cannot get the root of object '%s'", XML_CIB_TAG_RESOURCES);
	return FALSE;
	}

	template = find_entity(cib_resources, XML_CIB_TAG_RSC_TEMPLATE, template_ref);
	if (template == NULL) {
	pe_err("No template named '%s'", template_ref);
	return FALSE;
	}

	new_xml = copy_xml(template);
	xmlNodeSetName(new_xml, xml_obj->name);
	crm_xml_replace(new_xml, XML_ATTR_ID, id);
	template_ops = find_xml_node(new_xml, "operations", FALSE);

	for (child_xml = __xml_first_child(xml_obj); child_xml != NULL;
	child_xml = __xml_next(child_xml)) {
	xmlNode *new_child = NULL;

	new_child = add_node_copy(new_xml, child_xml);

	if (crm_str_eq((const char *)new_child->name, "operations", TRUE)) {
	rsc_ops = new_child;
	}
	}

	if (template_ops && rsc_ops) {
	xmlNode *op = NULL;
	GHashTable *rsc_ops_hash =
	g_hash_table_new_full(crm_str_hash, g_str_equal, g_hash_destroy_str, NULL);

	for (op = __xml_first_child(rsc_ops); op != NULL; op = __xml_next(op)) {
	char *key = template_op_key(op);

	g_hash_table_insert(rsc_ops_hash, key, op);
	}

	for (op = __xml_first_child(template_ops); op != NULL; op = __xml_next(op)) {
	char *key = template_op_key(op);

	if (g_hash_table_lookup(rsc_ops_hash, key) == NULL) {
	add_node_copy(rsc_ops, op);
	}

	free(key);
	}

	if (rsc_ops_hash) {
	g_hash_table_destroy(rsc_ops_hash);
	}

	free_xml(template_ops);
	}

	/free_xml(expanded_xml); */
	*expanded_xml = new_xml;

	/* Disable multi-level templates for now */
	/*if(unpack_template(new_xml, expanded_xml, data_set) == FALSE) {
	free_xml(*expanded_xml);
	*expanded_xml = NULL;

	return FALSE;
	} */

	return TRUE;
	}

	static gboolean
	add_template_rsc(xmlNode * xml_obj, pe_working_set_t * data_set)
	{
	const char *template_ref = NULL;
	const char *id = NULL;
	xmlNode *rsc_set = NULL;
	xmlNode *rsc_ref = NULL;

	if (xml_obj == NULL) {
	pe_err("No resource object for processing resource list of template");
	return FALSE;
	}

	template_ref = crm_element_value(xml_obj, XML_CIB_TAG_RSC_TEMPLATE);
	if (template_ref == NULL) {
	return TRUE;
	}

	id = ID(xml_obj);
	if (id == NULL) {
	pe_err("'%s' object must have a id", crm_element_name(xml_obj));
	return FALSE;
	}

	if (crm_str_eq(template_ref, id, TRUE)) {
	pe_err("The resource object '%s' should not reference itself", id);
	return FALSE;
	}

	rsc_set = g_hash_table_lookup(data_set->template_rsc_sets, template_ref);
	if (rsc_set == NULL) {
	rsc_set = create_xml_node(NULL, XML_CONS_TAG_RSC_SET);
	crm_xml_add(rsc_set, XML_ATTR_ID, template_ref);

	g_hash_table_insert(data_set->template_rsc_sets, strdup(template_ref), rsc_set);
	}

	rsc_ref = create_xml_node(rsc_set, XML_TAG_RESOURCE_REF);
	crm_xml_add(rsc_ref, XML_ATTR_ID, id);

	return TRUE;
	}

	gboolean
	common_unpack(xmlNode * xml_obj, resource_t ** rsc,
	resource_t * parent, pe_working_set_t * data_set)
	{
	xmlNode *expanded_xml = NULL;
	xmlNode *ops = NULL;
	resource_t *top = NULL;
	const char *value = NULL;
	const char *id = crm_element_value(xml_obj, XML_ATTR_ID);
	const char *class = crm_element_value(xml_obj, XML_AGENT_ATTR_CLASS);

	crm_log_xml_trace(xml_obj, "Processing resource input...");

	if (id == NULL) {
	pe_err("Must specify id tag in <resource>");
	return FALSE;

	} else if (rsc == NULL) {
	pe_err("Nowhere to unpack resource into");
	return FALSE;

	}

	if (unpack_template(xml_obj, &expanded_xml, data_set) == FALSE) {
	return FALSE;
	}

	*rsc = calloc(1, sizeof(resource_t));

	if (expanded_xml) {
	crm_log_xml_trace(expanded_xml, "Expanded resource...");
	(*rsc)->xml = expanded_xml;
	(*rsc)->orig_xml = xml_obj;

	} else {
	(*rsc)->xml = xml_obj;
	(*rsc)->orig_xml = NULL;
	}

	(*rsc)->parent = parent;

	ops = find_xml_node((*rsc)->xml, "operations", FALSE);
	(*rsc)->ops_xml = expand_idref(ops, data_set->input);

	(*rsc)->variant = get_resource_type(crm_element_name(xml_obj));
	if ((*rsc)->variant == pe_unknown) {
	pe_err("Unknown resource type: %s", crm_element_name(xml_obj));
	free(*rsc);
	return FALSE;
	}

	(*rsc)->parameters =
	g_hash_table_new_full(crm_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str);

	(*rsc)->meta =
	g_hash_table_new_full(crm_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str);

	(*rsc)->allowed_nodes =
	g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, g_hash_destroy_str);

	(*rsc)->known_on = g_hash_table_new_full(crm_str_hash, g_str_equal, NULL, g_hash_destroy_str);

	value = crm_element_value(xml_obj, XML_RSC_ATTR_INCARNATION);
	if (value) {
	(*rsc)->id = crm_concat(id, value, ':');
	add_hash_param((*rsc)->meta, XML_RSC_ATTR_INCARNATION, value);

	} else {
	(*rsc)->id = strdup(id);
	}

	(rsc)->fns = &resource_class_functions[(rsc)->variant];
	pe_rsc_trace((*rsc), "Unpacking resource...");

	get_meta_attributes((rsc)->meta, rsc, NULL, data_set);

	(*rsc)->flags = 0;
	set_bit((*rsc)->flags, pe_rsc_runnable);
	set_bit((*rsc)->flags, pe_rsc_provisional);

	if (is_set(data_set->flags, pe_flag_is_managed_default)) {
	set_bit((*rsc)->flags, pe_rsc_managed);
	}

	(*rsc)->rsc_cons = NULL;
	(*rsc)->rsc_tickets = NULL;
	(*rsc)->actions = NULL;
	(*rsc)->role = RSC_ROLE_STOPPED;
	(*rsc)->next_role = RSC_ROLE_UNKNOWN;

	(*rsc)->recovery_type = recovery_stop_start;
	(*rsc)->stickiness = data_set->default_resource_stickiness;
	(*rsc)->migration_threshold = INFINITY;
	(*rsc)->failure_timeout = 0;

	value = g_hash_table_lookup((*rsc)->meta, XML_CIB_ATTR_PRIORITY);
	(*rsc)->priority = crm_parse_int(value, "0");
	(rsc)->effective_priority = (rsc)->priority;

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_NOTIFY);
	if (crm_is_true(value)) {
	set_bit((*rsc)->flags, pe_rsc_notify);
	}

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_MANAGED);
	if (value != NULL && safe_str_neq("default", value)) {
	gboolean bool_value = TRUE;

	crm_str_to_boolean(value, &bool_value);
	if (bool_value == FALSE) {
	clear_bit((*rsc)->flags, pe_rsc_managed);
	} else {
	set_bit((*rsc)->flags, pe_rsc_managed);
	}
	}

	if (is_set(data_set->flags, pe_flag_maintenance_mode)) {
	clear_bit((*rsc)->flags, pe_rsc_managed);
	}

	pe_rsc_trace((rsc), "Options for %s", (rsc)->id);
	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_UNIQUE);

	top = uber_parent(*rsc);
	if (crm_is_true(value) \|\| top->variant < pe_clone) {
	set_bit((*rsc)->flags, pe_rsc_unique);
	}

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_RESTART);
	if (safe_str_eq(value, "restart")) {
	(*rsc)->restart_type = pe_restart_restart;
	pe_rsc_trace((*rsc), "\tDependency restart handling: restart");

	} else {
	(*rsc)->restart_type = pe_restart_ignore;
	pe_rsc_trace((*rsc), "\tDependency restart handling: ignore");
	}

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_MULTIPLE);
	if (safe_str_eq(value, "stop_only")) {
	(*rsc)->recovery_type = recovery_stop_only;
	pe_rsc_trace((*rsc), "\tMultiple running resource recovery: stop only");

	} else if (safe_str_eq(value, "block")) {
	(*rsc)->recovery_type = recovery_block;
	pe_rsc_trace((*rsc), "\tMultiple running resource recovery: block");

	} else {
	(*rsc)->recovery_type = recovery_stop_start;
	pe_rsc_trace((*rsc), "\tMultiple running resource recovery: stop/start");
	}

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_STICKINESS);
	if (value != NULL && safe_str_neq("default", value)) {
	(*rsc)->stickiness = char2score(value);
	}

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_FAIL_STICKINESS);
	if (value != NULL && safe_str_neq("default", value)) {
	(*rsc)->migration_threshold = char2score(value);

	} else if (value == NULL) {
	/* Make a best-effort guess at a migration threshold for people with 0.6 configs
	* try with underscores and hyphens, from both the resource and global defaults section
	*/

	value = g_hash_table_lookup((*rsc)->meta, "resource-failure-stickiness");
	if (value == NULL) {
	value = g_hash_table_lookup((*rsc)->meta, "resource_failure_stickiness");
	}
	if (value == NULL) {
	value =
	g_hash_table_lookup(data_set->config_hash, "default-resource-failure-stickiness");
	}
	if (value == NULL) {
	value =
	g_hash_table_lookup(data_set->config_hash, "default_resource_failure_stickiness");
	}

	if (value) {
	int fail_sticky = char2score(value);

	if (fail_sticky == -INFINITY) {
	(*rsc)->migration_threshold = 1;
	pe_rsc_info((*rsc),
	"Set a migration threshold of %d for %s based on a failure-stickiness of %s",
	(rsc)->migration_threshold, (rsc)->id, value);

	} else if ((*rsc)->stickiness != 0 && fail_sticky != 0) {
	(rsc)->migration_threshold = (rsc)->stickiness / fail_sticky;
	if ((*rsc)->migration_threshold < 0) {
	/* Make sure it's positive */
	(rsc)->migration_threshold = 0 - (rsc)->migration_threshold;
	}
	(*rsc)->migration_threshold += 1;
	pe_rsc_info((*rsc),
	"Calculated a migration threshold for %s of %d based on a stickiness of %d/%s",
	(rsc)->id, (rsc)->migration_threshold, (*rsc)->stickiness, value);
	}
	}
	}

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_REQUIRES);
	if (safe_str_eq(value, "nothing")) {

	} else if (safe_str_eq(value, "quorum")) {
	set_bit((*rsc)->flags, pe_rsc_needs_quorum);

	} else if (safe_str_eq(value, "unfencing")) {
	set_bit((*rsc)->flags, pe_rsc_needs_fencing);
	set_bit((*rsc)->flags, pe_rsc_needs_unfencing);
	if (is_set(data_set->flags, pe_flag_stonith_enabled)) {
	crm_notice("%s requires (un)fencing but fencing is disabled",
	(*rsc)->id);
	}

	} else if (safe_str_eq(value, "fencing")) {
	set_bit((*rsc)->flags, pe_rsc_needs_fencing);
	if (is_set(data_set->flags, pe_flag_stonith_enabled)) {
	crm_notice("%s requires fencing but fencing is disabled",
	(*rsc)->id);
	}

	} else {
	if (value) {
	crm_config_err("Invalid value for %s->requires: %s%s",
	(*rsc)->id, value,
	is_set(data_set->flags,
	pe_flag_stonith_enabled) ? "" : " (stonith-enabled=false)");
	}

	if (is_set(data_set->flags, pe_flag_stonith_enabled)) {
	set_bit((*rsc)->flags, pe_rsc_needs_fencing);
	value = "fencing (default)";

	} else if (data_set->no_quorum_policy == no_quorum_ignore) {
	value = "nothing (default)";

	} else {
	set_bit((*rsc)->flags, pe_rsc_needs_quorum);
	value = "quorum (default)";
	}
	}

	pe_rsc_trace((*rsc), "\tRequired to start: %s", value);

	value = g_hash_table_lookup((*rsc)->meta, XML_RSC_ATTR_FAIL_TIMEOUT);
	if (value != NULL) {
	/* call crm_get_msec() and convert back to seconds */
	(*rsc)->failure_timeout = (crm_get_msec(value) / 1000);
	}

	get_target_role(rsc, &((rsc)->next_role));
	pe_rsc_trace((*rsc), "\tDesired next state: %s",
	(rsc)->next_role != RSC_ROLE_UNKNOWN ? role2text((rsc)->next_role) : "default");

	if ((rsc)->fns->unpack(rsc, data_set) == FALSE) {
	return FALSE;
	}

	if (is_set(data_set->flags, pe_flag_symmetric_cluster)) {
	resource_location(*rsc, NULL, 0, "symmetric_default", data_set);
	}

	pe_rsc_trace((*rsc), "\tAction notification: %s",
	is_set((*rsc)->flags, pe_rsc_notify) ? "required" : "not required");

	if (safe_str_eq(class, "stonith")) {
	set_bit(data_set->flags, pe_flag_have_stonith_resource);
	}

	(*rsc)->utilization =
	g_hash_table_new_full(crm_str_hash, g_str_equal, g_hash_destroy_str, g_hash_destroy_str);

	unpack_instance_attributes(data_set->input, (*rsc)->xml, XML_TAG_UTILIZATION, NULL,
	(*rsc)->utilization, NULL, FALSE, data_set->now);

	/* data_set->resources = g_list_append(data_set->resources, (rsc)); /

	if (expanded_xml) {
	if (add_template_rsc(xml_obj, data_set) == FALSE) {
	return FALSE;
	}
	}
	return TRUE;
	}

	void
	common_update_score(resource_t * rsc, const char *id, int score)
	{
	node_t *node = NULL;

	node = pe_hash_table_lookup(rsc->allowed_nodes, id);
	if (node != NULL) {
	pe_rsc_trace(rsc, "Updating score for %s on %s: %d + %d", rsc->id, id, node->weight, score);
	node->weight = merge_weights(node->weight, score);
	}

	if (rsc->children) {
	GListPtr gIter = rsc->children;

	for (; gIter != NULL; gIter = gIter->next) {
	resource_t child_rsc = (resource_t ) gIter->data;

	common_update_score(child_rsc, id, score);
	}
	}
	}

	resource_t *
	uber_parent(resource_t * rsc)
	{
	resource_t *parent = rsc;

	if (parent == NULL) {
	return NULL;
	}
	while (parent->parent != NULL) {
	parent = parent->parent;
	}
	return parent;
	}

	void
	common_free(resource_t * rsc)
	{
	if (rsc == NULL) {
	return;
	}

	pe_rsc_trace(rsc, "Freeing %s %d", rsc->id, rsc->variant);

	g_list_free(rsc->rsc_cons);
	g_list_free(rsc->rsc_cons_lhs);
	g_list_free(rsc->rsc_tickets);
	g_list_free(rsc->dangling_migrations);

	if (rsc->parameters != NULL) {
	g_hash_table_destroy(rsc->parameters);
	}
	if (rsc->meta != NULL) {
	g_hash_table_destroy(rsc->meta);
	}
	if (rsc->utilization != NULL) {
	g_hash_table_destroy(rsc->utilization);
	}
	- if (rsc->orig_xml) {
	- free_xml(rsc->xml);
	- }
	+
	if (rsc->parent == NULL && is_set(rsc->flags, pe_rsc_orphan)) {
	- if (rsc->orig_xml) {
	- free_xml(rsc->orig_xml);
	- } else {
	- free_xml(rsc->xml);
	- }
	+ free_xml(rsc->xml);
	+ rsc->xml = NULL;
	+ free_xml(rsc->orig_xml);
	+ rsc->orig_xml = NULL;
	+
	+ /* if rsc->orig_xml, then rsc->xml is an expanded xml from a template */
	+ } else if (rsc->orig_xml) {
	+ free_xml(rsc->xml);
	+ rsc->xml = NULL;
	}
	if (rsc->running_on) {
	g_list_free(rsc->running_on);
	rsc->running_on = NULL;
	}
	if (rsc->known_on) {
	g_hash_table_destroy(rsc->known_on);
	rsc->known_on = NULL;
	}
	if (rsc->actions) {
	g_list_free(rsc->actions);
	rsc->actions = NULL;
	}
	if (rsc->allowed_nodes) {
	g_hash_table_destroy(rsc->allowed_nodes);
	rsc->allowed_nodes = NULL;
	}
	g_list_free(rsc->rsc_location);
	pe_rsc_trace(rsc, "Resource freed");
	free(rsc->id);
	free(rsc->clone_name);
	free(rsc->allocated_to);
	free(rsc->variant_opaque);
	free(rsc);
	}
	diff --git a/pengine/regression.sh b/pengine/regression.sh
	index 6c8f65d4bc..2418af44e8 100755
	--- a/pengine/regression.sh
	+++ b/pengine/regression.sh
	@@ -1,659 +1,662 @@
	#!/bin/bash

	# Copyright (C) 2004 Andrew Beekhof <andrew@beekhof.net>
	#
	# This program is free software; you can redistribute it and/or
	# modify it under the terms of the GNU General Public
	# License as published by the Free Software Foundation; either
	# version 2 of the License, or (at your option) any later version.
	#
	# This software is distributed in the hope that it will be useful,
	# but WITHOUT ANY WARRANTY; without even the implied warranty of
	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	# General Public License for more details.
	#
	# You should have received a copy of the GNU General Public
	# License along with this library; if not, write to the Free Software
	# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	#

	core=`dirname $0`
	. $core/regression.core.sh

	create_mode="true"
	info Generating test outputs for these tests...
	# do_test file description

	info Done.
	echo ""

	info Performing the following tests from $io_dir
	create_mode="false"

	echo ""
	do_test simple1 "Offline "
	do_test simple2 "Start "
	do_test simple3 "Start 2 "
	do_test simple4 "Start Failed"
	do_test simple6 "Stop Start "
	do_test simple7 "Shutdown "
	#do_test simple8 "Stonith "
	#do_test simple9 "Lower version"
	#do_test simple10 "Higher version"
	do_test simple11 "Priority (ne)"
	do_test simple12 "Priority (eq)"
	do_test simple8 "Stickiness"

	echo ""
	do_test group1 "Group "
	do_test group2 "Group + Native "
	do_test group3 "Group + Group "
	do_test group4 "Group + Native (nothing)"
	do_test group5 "Group + Native (move) "
	do_test group6 "Group + Group (move) "
	do_test group7 "Group colocation"
	do_test group13 "Group colocation (cant run)"
	do_test group8 "Group anti-colocation"
	do_test group9 "Group recovery"
	do_test group10 "Group partial recovery"
	do_test group11 "Group target_role"
	do_test group14 "Group stop (graph terminated)"
	do_test group15 "-ve group colocation"
	do_test bug-1573 "Partial stop of a group with two children"
	do_test bug-1718 "Mandatory group ordering - Stop group_FUN"
	do_test bug-lf-2613 "Move group on failure"
	do_test bug-lf-2619 "Move group on clone failure"
	do_test group-fail "Ensure stop order is preserved for partially active groups"

	echo ""
	do_test rsc_dep1 "Must not "
	do_test rsc_dep3 "Must "
	do_test rsc_dep5 "Must not 3 "
	do_test rsc_dep7 "Must 3 "
	do_test rsc_dep10 "Must (but cant)"
	do_test rsc_dep2 "Must (running) "
	do_test rsc_dep8 "Must (running : alt) "
	do_test rsc_dep4 "Must (running + move)"
	do_test asymmetric "Asymmetric - require explicit location constraints"

	echo ""
	do_test orphan-0 "Orphan ignore"
	do_test orphan-1 "Orphan stop"
	do_test orphan-2 "Orphan stop, remove failcount"

	echo ""
	do_test params-0 "Params: No change"
	do_test params-1 "Params: Changed"
	do_test params-2 "Params: Resource definition"
	do_test params-4 "Params: Reload"
	do_test params-5 "Params: Restart based on probe digest"
	do_test novell-251689 "Resource definition change + target_role=stopped"
	do_test bug-lf-2106 "Restart all anonymous clone instances after config change"
	do_test params-6 "Params: Detect reload in previously migrated resource"

	echo ""
	do_test target-0 "Target Role : baseline"
	do_test target-1 "Target Role : master"
	do_test target-2 "Target Role : invalid"

	echo ""
	do_test domain "Failover domains"
	do_test base-score "Set a node's default score for all nodes"

	echo ""
	do_test date-1 "Dates" -t "2005-020"
	do_test date-2 "Date Spec - Pass" -t "2005-020T12:30"
	do_test date-3 "Date Spec - Fail" -t "2005-020T11:30"
	do_test probe-0 "Probe (anon clone)"
	do_test probe-1 "Pending Probe"
	do_test probe-2 "Correctly re-probe cloned groups"
	do_test probe-3 "Probe (pending node)"
	do_test probe-4 "Probe (pending node + stopped resource)" --rc 4
	do_test standby "Standby"
	do_test comments "Comments"

	echo ""
	do_test one-or-more-0 "Everything starts"
	do_test one-or-more-1 "Nothing starts because of A"
	do_test one-or-more-2 "D can start because of C"
	do_test one-or-more-3 "D cannot start because of B and C"
	do_test one-or-more-4 "D cannot start because of target-role"
	do_test one-or-more-5 "Start A and F even though C and D are stopped"
	do_test one-or-more-6 "Leave A running even though B is stopped"
	do_test one-or-more-7 "Leave A running even though C is stopped"

	echo ""
	do_test order1 "Order start 1 "
	do_test order2 "Order start 2 "
	do_test order3 "Order stop "
	do_test order4 "Order (multiple) "
	do_test order5 "Order (move) "
	do_test order6 "Order (move w/ restart) "
	do_test order7 "Order (manditory) "
	do_test order-optional "Order (score=0) "
	do_test order-required "Order (score=INFINITY) "
	do_test bug-lf-2171 "Prevent group start when clone is stopped"
	do_test order-clone "Clone ordering should be able to prevent startup of dependant clones"
	do_test order-sets "Ordering for resource sets"
	do_test order-serialize "Serialize resources without inhibiting migration"
	do_test order-serialize-set "Serialize a set of resources without inhibiting migration"
	do_test clone-order-primitive "Order clone start after a primitive"
	do_test order-optional-keyword "Order (optional keyword)"
	do_test order-mandatory "Order (mandatory keyword)"
	do_test bug-lf-2493 "Don't imply colocation requirements when applying ordering constraints with clones"
	do_test ordered-set-basic-startup "Constraint set with default order settings."
	do_test order-wrong-kind "Order (error)"

	echo ""
	do_test coloc-loop "Colocation - loop"
	do_test coloc-many-one "Colocation - many-to-one"
	do_test coloc-list "Colocation - many-to-one with list"
	do_test coloc-group "Colocation - groups"
	do_test coloc-slave-anti "Anti-colocation with slave shouldn't prevent master colocation"
	do_test coloc-attr "Colocation based on node attributes"
	do_test coloc-negative-group "Negative colocation with a group"
	do_test coloc-intra-set "Intra-set colocation"
	do_test bug-lf-2435 "Colocation sets with a negative score"
	do_test coloc-clone-stays-active "Ensure clones don't get stopped/demoted because a dependant must stop"
	do_test coloc_fp_logic "Verify floating point calculations in colocation are working"
	do_test colo_master_w_native "cl#5070 - Verify promotion order is affected when colocating master to native rsc."
	do_test colo_slave_w_native "cl#5070 - Verify promotion order is affected when colocating slave to native rsc."

	echo ""
	do_test rsc-sets-seq-true "Resource Sets - sequential=false"
	do_test rsc-sets-seq-false "Resource Sets - sequential=true"
	do_test rsc-sets-clone "Resource Sets - Clone"
	do_test rsc-sets-master "Resource Sets - Master"
	do_test rsc-sets-clone-1 "Resource Sets - Clone (lf#2404)"

	#echo ""
	#do_test agent1 "version: lt (empty)"
	#do_test agent2 "version: eq "
	#do_test agent3 "version: gt "

	echo ""
	do_test attrs1 "string: eq (and) "
	do_test attrs2 "string: lt / gt (and)"
	do_test attrs3 "string: ne (or) "
	do_test attrs4 "string: exists "
	do_test attrs5 "string: not_exists "
	do_test attrs6 "is_dc: true "
	do_test attrs7 "is_dc: false "
	do_test attrs8 "score_attribute "

	echo ""
	do_test mon-rsc-1 "Schedule Monitor - start"
	do_test mon-rsc-2 "Schedule Monitor - move "
	do_test mon-rsc-3 "Schedule Monitor - pending start "
	do_test mon-rsc-4 "Schedule Monitor - move/pending start"

	echo ""
	do_test rec-rsc-0 "Resource Recover - no start "
	do_test rec-rsc-1 "Resource Recover - start "
	do_test rec-rsc-2 "Resource Recover - monitor "
	do_test rec-rsc-3 "Resource Recover - stop - ignore"
	do_test rec-rsc-4 "Resource Recover - stop - block "
	do_test rec-rsc-5 "Resource Recover - stop - fence "
	do_test rec-rsc-6 "Resource Recover - multiple - restart"
	do_test rec-rsc-7 "Resource Recover - multiple - stop "
	do_test rec-rsc-8 "Resource Recover - multiple - block "
	do_test rec-rsc-9 "Resource Recover - group/group"

	echo ""
	do_test quorum-1 "No quorum - ignore"
	do_test quorum-2 "No quorum - freeze"
	do_test quorum-3 "No quorum - stop "
	do_test quorum-4 "No quorum - start anyway"
	do_test quorum-5 "No quorum - start anyway (group)"
	do_test quorum-6 "No quorum - start anyway (clone)"

	echo ""
	do_test rec-node-1 "Node Recover - Startup - no fence"
	do_test rec-node-2 "Node Recover - Startup - fence "
	do_test rec-node-3 "Node Recover - HA down - no fence"
	do_test rec-node-4 "Node Recover - HA down - fence "
	do_test rec-node-5 "Node Recover - CRM down - no fence"
	do_test rec-node-6 "Node Recover - CRM down - fence "
	do_test rec-node-7 "Node Recover - no quorum - ignore "
	do_test rec-node-8 "Node Recover - no quorum - freeze "
	do_test rec-node-9 "Node Recover - no quorum - stop "
	do_test rec-node-10 "Node Recover - no quorum - stop w/fence"
	do_test rec-node-11 "Node Recover - CRM down w/ group - fence "
	do_test rec-node-12 "Node Recover - nothing active - fence "
	do_test rec-node-13 "Node Recover - failed resource + shutdown - fence "
	do_test rec-node-15 "Node Recover - unknown lrm section"
	do_test rec-node-14 "Serialize all stonith's"

	echo ""
	do_test multi1 "Multiple Active (stop/start)"

	echo ""
	do_test migrate-begin "Normal migration"
	do_test migrate-success "Completed migration"
	do_test migrate-partial-1 "Completed migration, missing stop on source"
	do_test migrate-partial-2 "Successful migrate_to only"
	do_test migrate-partial-3 "Successful migrate_to only, target down"
	do_test migrate-partial-4 "Migrate from the correct host after migrate_to+migrate_from"

	do_test migrate-fail-2 "Failed migrate_from"
	do_test migrate-fail-3 "Failed migrate_from + stop on source"
	do_test migrate-fail-4 "Failed migrate_from + stop on target - ideally we wouldn't need to re-stop on target"
	do_test migrate-fail-5 "Failed migrate_from + stop on source and target"

	do_test migrate-fail-6 "Failed migrate_to"
	do_test migrate-fail-7 "Failed migrate_to + stop on source"
	do_test migrate-fail-8 "Failed migrate_to + stop on target - ideally we wouldn't need to re-stop on target"
	do_test migrate-fail-9 "Failed migrate_to + stop on source and target"

	do_test migrate-stop "Migration in a stopping stack"
	do_test migrate-start "Migration in a starting stack"
	do_test migrate-stop_start "Migration in a restarting stack"
	do_test migrate-stop-complex "Migration in a complex stopping stack"
	do_test migrate-start-complex "Migration in a complex starting stack"
	do_test migrate-stop-start-complex "Migration in a complex moving stack"
	do_test migrate-shutdown "Order the post-migration 'stop' before node shutdown"

	do_test migrate-1 "Migrate (migrate)"
	do_test migrate-2 "Migrate (stable)"
	do_test migrate-3 "Migrate (failed migrate_to)"
	do_test migrate-4 "Migrate (failed migrate_from)"
	do_test novell-252693 "Migration in a stopping stack"
	do_test novell-252693-2 "Migration in a starting stack"
	do_test novell-252693-3 "Non-Migration in a starting and stopping stack"
	do_test bug-1820 "Migration in a group"
	do_test bug-1820-1 "Non-migration in a group"
	do_test migrate-5 "Primitive migration with a clone"
	do_test migrate-fencing "Migration after Fencing"

	#echo ""
	#do_test complex1 "Complex "

	do_test bug-lf-2422 "Dependancy on partially active group - stop ocfs:*"

	echo ""
	do_test clone-anon-probe-1 "Probe the correct (anonymous) clone instance for each node"
	do_test clone-anon-probe-2 "Avoid needless re-probing of anonymous clones"
	do_test clone-anon-failcount "Merge failcounts for anonymous clones"
	do_test inc0 "Incarnation start"
	do_test inc1 "Incarnation start order"
	do_test inc2 "Incarnation silent restart, stop, move"
	do_test inc3 "Inter-incarnation ordering, silent restart, stop, move"
	do_test inc4 "Inter-incarnation ordering, silent restart, stop, move (ordered)"
	do_test inc5 "Inter-incarnation ordering, silent restart, stop, move (restart 1)"
	do_test inc6 "Inter-incarnation ordering, silent restart, stop, move (restart 2)"
	do_test inc7 "Clone colocation"
	do_test inc8 "Clone anti-colocation"
	do_test inc9 "Non-unique clone"
	do_test inc10 "Non-unique clone (stop)"
	do_test inc11 "Primitive colocation with clones"
	do_test inc12 "Clone shutdown"
	do_test cloned-group "Make sure only the correct number of cloned groups are started"
	do_test clone-no-shuffle "Dont prioritize allocation of instances that must be moved"
	do_test clone-max-zero "Orphan processing with clone-max=0"
	do_test clone-anon-dup "Bug LF#2087 - Correctly parse the state of anonymous clones that are active more than once per node"
	do_test bug-lf-2160 "Dont shuffle clones due to colocation"
	do_test bug-lf-2213 "clone-node-max enforcement for cloned groups"
	do_test bug-lf-2153 "Clone ordering constraints"
	do_test bug-lf-2361 "Ensure clones observe mandatory ordering constraints if the LHS is unrunnable"
	do_test bug-lf-2317 "Avoid needless restart of primitive depending on a clone"
	do_test clone-colocate-instance-1 "Colocation with a specific clone instance (negative example)"
	do_test clone-colocate-instance-2 "Colocation with a specific clone instance"
	do_test clone-order-instance "Ordering with specific clone instances"
	do_test bug-lf-2453 "Enforce mandatory clone ordering without colocation"
	do_test bug-lf-2508 "Correctly reconstruct the status of anonymous cloned groups"
	do_test bug-lf-2544 "Balanced clone placement"
	do_test bug-lf-2445 "Redistribute clones with node-max > 1 and stickiness = 0"
	do_test bug-lf-2574 "Avoid clone shuffle"
	do_test bug-lf-2581 "Avoid group restart due to unrelated clone (re)start"

	echo ""
	do_test master-0 "Stopped -> Slave"
	do_test master-1 "Stopped -> Promote"
	do_test master-2 "Stopped -> Promote : notify"
	do_test master-3 "Stopped -> Promote : master location"
	do_test master-4 "Started -> Promote : master location"
	do_test master-5 "Promoted -> Promoted"
	do_test master-6 "Promoted -> Promoted (2)"
	do_test master-7 "Promoted -> Fenced"
	do_test master-8 "Promoted -> Fenced -> Moved"
	do_test master-9 "Stopped + Promotable + No quorum"
	do_test master-10 "Stopped -> Promotable : notify with monitor"
	do_test master-11 "Stopped -> Promote : colocation"
	do_test novell-239082 "Demote/Promote ordering"
	do_test novell-239087 "Stable master placement"
	do_test master-12 "Promotion based solely on rsc_location constraints"
	do_test master-13 "Include preferences of colocated resources when placing master"
	do_test master-demote "Ordering when actions depends on demoting a slave resource"
	do_test master-ordering "Prevent resources from starting that need a master"
	do_test bug-1765 "Master-Master Colocation (dont stop the slaves)"
	do_test master-group "Promotion of cloned groups"
	do_test bug-lf-1852 "Don't shuffle master/slave instances unnecessarily"
	do_test master-failed-demote "Dont retry failed demote actions"
	do_test master-failed-demote-2 "Dont retry failed demote actions (notify=false)"
	do_test master-depend "Ensure resources that depend on the master don't get allocated until the master does"
	do_test master-reattach "Re-attach to a running master"
	do_test master-allow-start "Don't include master score if it would prevent allocation"
	do_test master-colocation "Allow master instances placemaker to be influenced by colocation constraints"
	do_test master-pseudo "Make sure promote/demote pseudo actions are created correctly"
	do_test master-role "Prevent target-role from promoting more than master-max instances"
	do_test bug-lf-2358 "Master-Master anti-colocation"
	do_test master-promotion-constraint "Mandatory master colocation constraints"
	do_test unmanaged-master "Ensure role is preserved for unmanaged resources"
	do_test master-unmanaged-monitor "Start the correct monitor operation for unmanaged masters"
	do_test master-demote-2 "Demote does not clear past failure"
	do_test master-move "Move master based on failure of colocated group"
	do_test master-probed-score "Observe the promotion score of probed resources"
	do_test colocation_constraint_stops_master "cl#5054 - Ensure master is demoted when stopped by colocation constraint"
	do_test colocation_constraint_stops_slave "cl#5054 - Ensure slave is not demoted when stopped by colocation constraint"
	do_test order_constraint_stops_master "cl#5054 - Ensure master is demoted when stopped by order constraint"
	do_test order_constraint_stops_slave "cl#5054 - Ensure slave is not demoted when stopped by order constraint"
	do_test master_monitor_restart "cl#5072 - Ensure master monitor operation will start after promotion."

	echo ""
	do_test history-1 "Correctly parse stateful-1 resource state"

	echo ""
	do_test managed-0 "Managed (reference)"
	do_test managed-1 "Not managed - down "
	do_test managed-2 "Not managed - up "
	do_test bug-5028 "Shutdown should block if anything depends on an unmanaged resource"
	do_test bug-5028-detach "Ensure detach still works"
	do_test bug-5028-bottom "Ensure shutdown still blocks if the blocked resource is at the bottom of the stack"

	echo ""
	do_test interleave-0 "Interleave (reference)"
	do_test interleave-1 "coloc - not interleaved"
	do_test interleave-2 "coloc - interleaved "
	do_test interleave-3 "coloc - interleaved (2)"
	do_test interleave-pseudo-stop "Interleaved clone during stonith"
	do_test interleave-stop "Interleaved clone during stop"
	do_test interleave-restart "Interleaved clone during dependancy restart"

	echo ""
	do_test notify-0 "Notify reference"
	do_test notify-1 "Notify simple"
	do_test notify-2 "Notify simple, confirm"
	do_test notify-3 "Notify move, confirm"
	do_test novell-239079 "Notification priority"
	#do_test notify-2 "Notify - 764"

	echo ""
	do_test 594 "OSDL #594 - Unrunnable actions scheduled in transition"
	do_test 662 "OSDL #662 - Two resources start on one node when incarnation_node_max = 1"
	do_test 696 "OSDL #696 - CRM starts stonith RA without monitor"
	do_test 726 "OSDL #726 - Attempting to schedule rsc_posic041_monitor_5000 _after_ a stop"
	do_test 735 "OSDL #735 - Correctly detect that rsc_hadev1 is stopped on hadev3"
	do_test 764 "OSDL #764 - Missing monitor op for DoFencing:child_DoFencing:1"
	do_test 797 "OSDL #797 - Assert triggered: task_id_i > max_call_id"
	do_test 829 "OSDL #829"
	do_test 994 "OSDL #994 - Stopping the last resource in a resource group causes the entire group to be restarted"
	do_test 994-2 "OSDL #994 - with a dependant resource"
	do_test 1360 "OSDL #1360 - Clone stickiness"
	do_test 1484 "OSDL #1484 - on_fail=stop"
	do_test 1494 "OSDL #1494 - Clone stability"
	do_test unrunnable-1 "Unrunnable"
	do_test stonith-0 "Stonith loop - 1"
	do_test stonith-1 "Stonith loop - 2"
	do_test stonith-2 "Stonith loop - 3"
	do_test stonith-3 "Stonith startup"
	do_test stonith-4 "Stonith node state" --rc 4
	do_test bug-1572-1 "Recovery of groups depending on master/slave"
	do_test bug-1572-2 "Recovery of groups depending on master/slave when the master is never re-promoted"
	do_test bug-1685 "Depends-on-master ordering"
	do_test bug-1822 "Dont promote partially active groups"
	do_test bug-pm-11 "New resource added to a m/s group"
	do_test bug-pm-12 "Recover only the failed portion of a cloned group"
	do_test bug-n-387749 "Don't shuffle clone instances"
	do_test bug-n-385265 "Don't ignore the failure stickiness of group children - resource_idvscommon should stay stopped"
	do_test bug-n-385265-2 "Ensure groups are migrated instead of remaining partially active on the current node"
	do_test bug-lf-1920 "Correctly handle probes that find active resources"
	do_test bnc-515172 "Location constraint with multiple expressions"
	do_test colocate-primitive-with-clone "Optional colocation with a clone"
	do_test use-after-free-merge "Use-after-free in native_merge_weights"
	do_test bug-lf-2551 "STONITH ordering for stop"
	do_test bug-lf-2606 "Stonith implies demote"
	do_test bug-lf-2474 "Ensure resource op timeout takes precedence over op_defaults"
	do_test bug-suse-707150 "Prevent vm-01 from starting due to colocation/ordering"
	do_test bug-5014-A-start-B-start "Verify when A starts B starts using symmetrical=false"
	do_test bug-5014-A-stop-B-started "Verify when A stops B does not stop if it has already started using symmetric=false"
	do_test bug-5014-A-stopped-B-stopped "Verify when A is stopped and B has not started, B does not start before A using symmetric=false"
	do_test bug-5014-CthenAthenB-C-stopped "Verify when C then A is symmetrical=true, A then B is symmetric=false, and C is stopped that nothing starts."
	do_test bug-5014-CLONE-A-start-B-start "Verify when A starts B starts using clone resources with symmetric=false"
	do_test bug-5014-CLONE-A-stop-B-started "Verify when A stops B does not stop if it has already started using clone resources with symmetric=false."
	do_test bug-5014-GROUP-A-start-B-start "Verify when A starts B starts when using group resources with symmetric=false."
	do_test bug-5014-GROUP-A-stopped-B-started "Verify when A stops B does not stop if it has already started using group resources with symmetric=false."
	do_test bug-5014-GROUP-A-stopped-B-stopped "Verify when A is stopped and B has not started, B does not start before A using group resources with symmetric=false."
	do_test bug-5014-ordered-set-symmetrical-false "Verify ordered sets work with symmetrical=false"
	do_test bug-5014-ordered-set-symmetrical-true "Verify ordered sets work with symmetrical=true"
	do_test bug-5007-masterslave_colocation "Verify use of colocation scores other than INFINITY and -INFINITY work on multi-state resources."
	do_test bug-5038 "Prevent restart of anonymous clones when clone-max decreases"
	do_test bug-5025-1 "Automatically clean up failcount after resource config change with reload"
	do_test bug-5025-2 "Make sure clear failcount action isn't set when config does not change."
	do_test bug-5025-3 "Automatically clean up failcount after resource config change with restart"
	do_test failcount "Ensure failcounts are correctly expired"
	do_test monitor-onfail-restart "bug-5058 - Monitor failure with on-fail set to restart"
	do_test monitor-onfail-stop "bug-5058 - Monitor failure wiht on-fail set to stop"
	do_test bug-5059 "No need to restart p_stateful1:*"
	do_test bug-5069-op-enabled "Test on-fail=ignore with failure when monitor is enabled."
	do_test bug-5069-op-disabled "Test on-fail-ignore with failure when monitor is disabled."
	do_test obsolete-lrm-resource "cl#5115 - Do not use obsolete lrm_resource sections"

	do_test ignore_stonith_rsc_order1 "cl#5056- Ignore order constraint between stonith and non-stonith rsc."
	do_test ignore_stonith_rsc_order2 "cl#5056- Ignore order constraint with group rsc containing mixed stonith and non-stonith."
	do_test ignore_stonith_rsc_order3 "cl#5056- Ignore order constraint, stonith clone and mixed group"
	do_test ignore_stonith_rsc_order4 "cl#5056- Ignore order constraint, stonith clone and clone with nested mixed group"
	do_test honor_stonith_rsc_order1 "cl#5056- Honor order constraint, stonith clone and pure stonith group(single rsc)."
	do_test honor_stonith_rsc_order2 "cl#5056- Honor order constraint, stonith clone and pure stonith group(multiple rsc)"
	do_test honor_stonith_rsc_order3 "cl#5056- Honor order constraint, stonith clones with nested pure stonith group."
	do_test honor_stonith_rsc_order4 "cl#5056- Honor order constraint, between two native stonith rscs."

	echo ""
	do_test systemhealth1 "System Health () #1"
	do_test systemhealth2 "System Health () #2"
	do_test systemhealth3 "System Health () #3"
	do_test systemhealthn1 "System Health (None) #1"
	do_test systemhealthn2 "System Health (None) #2"
	do_test systemhealthn3 "System Health (None) #3"
	do_test systemhealthm1 "System Health (Migrate On Red) #1"
	do_test systemhealthm2 "System Health (Migrate On Red) #2"
	do_test systemhealthm3 "System Health (Migrate On Red) #3"
	do_test systemhealtho1 "System Health (Only Green) #1"
	do_test systemhealtho2 "System Health (Only Green) #2"
	do_test systemhealtho3 "System Health (Only Green) #3"
	do_test systemhealthp1 "System Health (Progessive) #1"
	do_test systemhealthp2 "System Health (Progessive) #2"
	do_test systemhealthp3 "System Health (Progessive) #3"

	echo ""
	do_test utilization "Placement Strategy - utilization"
	do_test minimal "Placement Strategy - minimal"
	do_test balanced "Placement Strategy - balanced"

	echo ""
	do_test placement-stickiness "Optimized Placement Strategy - stickiness"
	do_test placement-priority "Optimized Placement Strategy - priority"
	do_test placement-location "Optimized Placement Strategy - location"
	do_test placement-capacity "Optimized Placement Strategy - capacity"

	echo ""
	do_test utilization-order1 "Utilization Order - Simple"
	do_test utilization-order2 "Utilization Order - Complex"
	do_test utilization-order3 "Utilization Order - Migrate"
	do_test utilization-order4 "Utilization Order - Live Mirgration (bnc#695440)"
	do_test utilization-shuffle "Don't displace prmExPostgreSQLDB2 on act2, Start prmExPostgreSQLDB1 on act3"
	do_test load-stopped-loop "Avoid transition loop due to load_stopped (cl#5044)"

	echo ""
	do_test reprobe-target_rc "Ensure correct target_rc for reprobe of inactive resources"

	echo ""
	do_test stopped-monitor-00 "Stopped Monitor - initial start"
	do_test stopped-monitor-01 "Stopped Monitor - failed started"
	do_test stopped-monitor-02 "Stopped Monitor - started multi-up"
	do_test stopped-monitor-03 "Stopped Monitor - stop started"
	do_test stopped-monitor-04 "Stopped Monitor - failed stop"
	do_test stopped-monitor-05 "Stopped Monitor - start unmanaged"
	do_test stopped-monitor-06 "Stopped Monitor - unmanaged multi-up"
	do_test stopped-monitor-07 "Stopped Monitor - start unmanaged multi-up"
	do_test stopped-monitor-08 "Stopped Monitor - migrate"
	do_test stopped-monitor-09 "Stopped Monitor - unmanage started"
	do_test stopped-monitor-10 "Stopped Monitor - unmanaged started multi-up"
	do_test stopped-monitor-11 "Stopped Monitor - stop unmanaged started"
	do_test stopped-monitor-12 "Stopped Monitor - unmanaged started multi-up (targer-role="Stopped")"
	do_test stopped-monitor-20 "Stopped Monitor - initial stop"
	do_test stopped-monitor-21 "Stopped Monitor - stopped single-up"
	do_test stopped-monitor-22 "Stopped Monitor - stopped multi-up"
	do_test stopped-monitor-23 "Stopped Monitor - start stopped"
	do_test stopped-monitor-24 "Stopped Monitor - unmanage stopped"
	do_test stopped-monitor-25 "Stopped Monitor - unmanaged stopped multi-up"
	do_test stopped-monitor-26 "Stopped Monitor - start unmanaged stopped"
	do_test stopped-monitor-27 "Stopped Monitor - unmanaged stopped multi-up (target-role="Started")"
	do_test stopped-monitor-30 "Stopped Monitor - new node started"
	do_test stopped-monitor-31 "Stopped Monitor - new node stopped"

	echo""
	do_test ticket-primitive-1 "Ticket - Primitive (loss-policy=stop, initial)"
	do_test ticket-primitive-2 "Ticket - Primitive (loss-policy=stop, granted)"
	do_test ticket-primitive-3 "Ticket - Primitive (loss-policy-stop, revoked)"
	do_test ticket-primitive-4 "Ticket - Primitive (loss-policy=demote, initial)"
	do_test ticket-primitive-5 "Ticket - Primitive (loss-policy=demote, granted)"
	do_test ticket-primitive-6 "Ticket - Primitive (loss-policy=demote, revoked)"
	do_test ticket-primitive-7 "Ticket - Primitive (loss-policy=fence, initial)"
	do_test ticket-primitive-8 "Ticket - Primitive (loss-policy=fence, granted)"
	do_test ticket-primitive-9 "Ticket - Primitive (loss-policy=fence, revoked)"
	do_test ticket-primitive-10 "Ticket - Primitive (loss-policy=freeze, initial)"
	do_test ticket-primitive-11 "Ticket - Primitive (loss-policy=freeze, granted)"
	do_test ticket-primitive-12 "Ticket - Primitive (loss-policy=freeze, revoked)"

	do_test ticket-primitive-13 "Ticket - Primitive (loss-policy=stop, standby, granted)"
	do_test ticket-primitive-14 "Ticket - Primitive (loss-policy=stop, granted, standby)"
	do_test ticket-primitive-15 "Ticket - Primitive (loss-policy=stop, standby, revoked)"
	do_test ticket-primitive-16 "Ticket - Primitive (loss-policy=demote, standby, granted)"
	do_test ticket-primitive-17 "Ticket - Primitive (loss-policy=demote, granted, standby)"
	do_test ticket-primitive-18 "Ticket - Primitive (loss-policy=demote, standby, revoked)"
	do_test ticket-primitive-19 "Ticket - Primitive (loss-policy=fence, standby, granted)"
	do_test ticket-primitive-20 "Ticket - Primitive (loss-policy=fence, granted, standby)"
	do_test ticket-primitive-21 "Ticket - Primitive (loss-policy=fence, standby, revoked)"
	do_test ticket-primitive-22 "Ticket - Primitive (loss-policy=freeze, standby, granted)"
	do_test ticket-primitive-23 "Ticket - Primitive (loss-policy=freeze, granted, standby)"
	do_test ticket-primitive-24 "Ticket - Primitive (loss-policy=freeze, standby, revoked)"

	echo""
	do_test ticket-group-1 "Ticket - Group (loss-policy=stop, initial)"
	do_test ticket-group-2 "Ticket - Group (loss-policy=stop, granted)"
	do_test ticket-group-3 "Ticket - Group (loss-policy-stop, revoked)"
	do_test ticket-group-4 "Ticket - Group (loss-policy=demote, initial)"
	do_test ticket-group-5 "Ticket - Group (loss-policy=demote, granted)"
	do_test ticket-group-6 "Ticket - Group (loss-policy=demote, revoked)"
	do_test ticket-group-7 "Ticket - Group (loss-policy=fence, initial)"
	do_test ticket-group-8 "Ticket - Group (loss-policy=fence, granted)"
	do_test ticket-group-9 "Ticket - Group (loss-policy=fence, revoked)"
	do_test ticket-group-10 "Ticket - Group (loss-policy=freeze, initial)"
	do_test ticket-group-11 "Ticket - Group (loss-policy=freeze, granted)"
	do_test ticket-group-12 "Ticket - Group (loss-policy=freeze, revoked)"

	do_test ticket-group-13 "Ticket - Group (loss-policy=stop, standby, granted)"
	do_test ticket-group-14 "Ticket - Group (loss-policy=stop, granted, standby)"
	do_test ticket-group-15 "Ticket - Group (loss-policy=stop, standby, revoked)"
	do_test ticket-group-16 "Ticket - Group (loss-policy=demote, standby, granted)"
	do_test ticket-group-17 "Ticket - Group (loss-policy=demote, granted, standby)"
	do_test ticket-group-18 "Ticket - Group (loss-policy=demote, standby, revoked)"
	do_test ticket-group-19 "Ticket - Group (loss-policy=fence, standby, granted)"
	do_test ticket-group-20 "Ticket - Group (loss-policy=fence, granted, standby)"
	do_test ticket-group-21 "Ticket - Group (loss-policy=fence, standby, revoked)"
	do_test ticket-group-22 "Ticket - Group (loss-policy=freeze, standby, granted)"
	do_test ticket-group-23 "Ticket - Group (loss-policy=freeze, granted, standby)"
	do_test ticket-group-24 "Ticket - Group (loss-policy=freeze, standby, revoked)"

	echo""
	do_test ticket-clone-1 "Ticket - Clone (loss-policy=stop, initial)"
	do_test ticket-clone-2 "Ticket - Clone (loss-policy=stop, granted)"
	do_test ticket-clone-3 "Ticket - Clone (loss-policy-stop, revoked)"
	do_test ticket-clone-4 "Ticket - Clone (loss-policy=demote, initial)"
	do_test ticket-clone-5 "Ticket - Clone (loss-policy=demote, granted)"
	do_test ticket-clone-6 "Ticket - Clone (loss-policy=demote, revoked)"
	do_test ticket-clone-7 "Ticket - Clone (loss-policy=fence, initial)"
	do_test ticket-clone-8 "Ticket - Clone (loss-policy=fence, granted)"
	do_test ticket-clone-9 "Ticket - Clone (loss-policy=fence, revoked)"
	do_test ticket-clone-10 "Ticket - Clone (loss-policy=freeze, initial)"
	do_test ticket-clone-11 "Ticket - Clone (loss-policy=freeze, granted)"
	do_test ticket-clone-12 "Ticket - Clone (loss-policy=freeze, revoked)"

	do_test ticket-clone-13 "Ticket - Clone (loss-policy=stop, standby, granted)"
	do_test ticket-clone-14 "Ticket - Clone (loss-policy=stop, granted, standby)"
	do_test ticket-clone-15 "Ticket - Clone (loss-policy=stop, standby, revoked)"
	do_test ticket-clone-16 "Ticket - Clone (loss-policy=demote, standby, granted)"
	do_test ticket-clone-17 "Ticket - Clone (loss-policy=demote, granted, standby)"
	do_test ticket-clone-18 "Ticket - Clone (loss-policy=demote, standby, revoked)"
	do_test ticket-clone-19 "Ticket - Clone (loss-policy=fence, standby, granted)"
	do_test ticket-clone-20 "Ticket - Clone (loss-policy=fence, granted, standby)"
	do_test ticket-clone-21 "Ticket - Clone (loss-policy=fence, standby, revoked)"
	do_test ticket-clone-22 "Ticket - Clone (loss-policy=freeze, standby, granted)"
	do_test ticket-clone-23 "Ticket - Clone (loss-policy=freeze, granted, standby)"
	do_test ticket-clone-24 "Ticket - Clone (loss-policy=freeze, standby, revoked)"

	echo""
	do_test ticket-master-1 "Ticket - Master (loss-policy=stop, initial)"
	do_test ticket-master-2 "Ticket - Master (loss-policy=stop, granted)"
	do_test ticket-master-3 "Ticket - Master (loss-policy-stop, revoked)"
	do_test ticket-master-4 "Ticket - Master (loss-policy=demote, initial)"
	do_test ticket-master-5 "Ticket - Master (loss-policy=demote, granted)"
	do_test ticket-master-6 "Ticket - Master (loss-policy=demote, revoked)"
	do_test ticket-master-7 "Ticket - Master (loss-policy=fence, initial)"
	do_test ticket-master-8 "Ticket - Master (loss-policy=fence, granted)"
	do_test ticket-master-9 "Ticket - Master (loss-policy=fence, revoked)"
	do_test ticket-master-10 "Ticket - Master (loss-policy=freeze, initial)"
	do_test ticket-master-11 "Ticket - Master (loss-policy=freeze, granted)"
	do_test ticket-master-12 "Ticket - Master (loss-policy=freeze, revoked)"

	do_test ticket-master-13 "Ticket - Master (loss-policy=stop, standby, granted)"
	do_test ticket-master-14 "Ticket - Master (loss-policy=stop, granted, standby)"
	do_test ticket-master-15 "Ticket - Master (loss-policy=stop, standby, revoked)"
	do_test ticket-master-16 "Ticket - Master (loss-policy=demote, standby, granted)"
	do_test ticket-master-17 "Ticket - Master (loss-policy=demote, granted, standby)"
	do_test ticket-master-18 "Ticket - Master (loss-policy=demote, standby, revoked)"
	do_test ticket-master-19 "Ticket - Master (loss-policy=fence, standby, granted)"
	do_test ticket-master-20 "Ticket - Master (loss-policy=fence, granted, standby)"
	do_test ticket-master-21 "Ticket - Master (loss-policy=fence, standby, revoked)"
	do_test ticket-master-22 "Ticket - Master (loss-policy=freeze, standby, granted)"
	do_test ticket-master-23 "Ticket - Master (loss-policy=freeze, granted, standby)"
	do_test ticket-master-24 "Ticket - Master (loss-policy=freeze, standby, revoked)"

	echo ""
	do_test ticket-rsc-sets-1 "Ticket - Resource sets (1 ticket, initial)"
	do_test ticket-rsc-sets-2 "Ticket - Resource sets (1 ticket, granted)"
	do_test ticket-rsc-sets-3 "Ticket - Resource sets (1 ticket, revoked)"
	do_test ticket-rsc-sets-4 "Ticket - Resource sets (2 tickets, initial)"
	do_test ticket-rsc-sets-5 "Ticket - Resource sets (2 tickets, granted)"
	do_test ticket-rsc-sets-6 "Ticket - Resource sets (2 tickets, granted)"
	do_test ticket-rsc-sets-7 "Ticket - Resource sets (2 tickets, revoked)"

	do_test ticket-rsc-sets-8 "Ticket - Resource sets (1 ticket, standby, granted)"
	do_test ticket-rsc-sets-9 "Ticket - Resource sets (1 ticket, granted, standby)"
	do_test ticket-rsc-sets-10 "Ticket - Resource sets (1 ticket, standby, revoked)"
	do_test ticket-rsc-sets-11 "Ticket - Resource sets (2 tickets, standby, granted)"
	do_test ticket-rsc-sets-12 "Ticket - Resource sets (2 tickets, standby, granted)"
	do_test ticket-rsc-sets-13 "Ticket - Resource sets (2 tickets, granted, standby)"
	do_test ticket-rsc-sets-14 "Ticket - Resource sets (2 tickets, standby, revoked)"

	echo ""
	do_test template-1 "Template - 1"
	do_test template-2 "Template - 2"
	do_test template-3 "Template - 3 (merge operations)"

	do_test template-coloc-1 "Template - Colocation 1"
	do_test template-coloc-2 "Template - Colocation 2"
	do_test template-coloc-3 "Template - Colocation 3"
	do_test template-order-1 "Template - Order 1"
	do_test template-order-2 "Template - Order 2"
	do_test template-order-3 "Template - Order 3"
	do_test template-ticket "Template - Ticket"

	do_test template-rsc-sets-1 "Template - Resource Sets 1"
	do_test template-rsc-sets-2 "Template - Resource Sets 2"
	do_test template-rsc-sets-3 "Template - Resource Sets 3"
	do_test template-rsc-sets-4 "Template - Resource Sets 4"

	+do_test template-clone-primitive "Cloned primitive from template"
	+do_test template-clone-group "Cloned group from template"
	+
	echo ""

	test_results
	diff --git a/pengine/test10/template-clone-group.dot b/pengine/test10/template-clone-group.dot
	new file mode 100644
	index 0000000000..1a23bbd434
	--- /dev/null
	+++ b/pengine/test10/template-clone-group.dot
	@@ -0,0 +1,46 @@
	+digraph "g" {
	+"clone1_running_0" [ style=bold color="green" fontcolor="orange"]
	+"clone1_start_0" -> "clone1_running_0" [ style = bold]
	+"clone1_start_0" -> "group1:0_start_0" [ style = bold]
	+"clone1_start_0" -> "group1:1_start_0" [ style = bold]
	+"clone1_start_0" [ style=bold color="green" fontcolor="orange"]
	+"group1:0_running_0" -> "clone1_running_0" [ style = bold]
	+"group1:0_running_0" [ style=bold color="green" fontcolor="orange"]
	+"group1:0_start_0" -> "group1:0_running_0" [ style = bold]
	+"group1:0_start_0" -> "rsc1:0_start_0 node1" [ style = bold]
	+"group1:0_start_0" -> "rsc2:0_start_0 node1" [ style = bold]
	+"group1:0_start_0" [ style=bold color="green" fontcolor="orange"]
	+"group1:1_running_0" -> "clone1_running_0" [ style = bold]
	+"group1:1_running_0" [ style=bold color="green" fontcolor="orange"]
	+"group1:1_start_0" -> "group1:1_running_0" [ style = bold]
	+"group1:1_start_0" -> "rsc1:1_start_0 node2" [ style = bold]
	+"group1:1_start_0" -> "rsc2:1_start_0 node2" [ style = bold]
	+"group1:1_start_0" [ style=bold color="green" fontcolor="orange"]
	+"probe_complete node1" -> "probe_complete" [ style = bold]
	+"probe_complete node1" [ style=bold color="green" fontcolor="black"]
	+"probe_complete node2" -> "probe_complete" [ style = bold]
	+"probe_complete node2" [ style=bold color="green" fontcolor="black"]
	+"probe_complete" -> "rsc1:0_start_0 node1" [ style = bold]
	+"probe_complete" -> "rsc1:1_start_0 node2" [ style = bold]
	+"probe_complete" -> "rsc2:0_start_0 node1" [ style = bold]
	+"probe_complete" -> "rsc2:1_start_0 node2" [ style = bold]
	+"probe_complete" [ style=bold color="green" fontcolor="orange"]
	+"rsc1:0_monitor_0 node1" -> "probe_complete node1" [ style = bold]
	+"rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
	+"rsc1:0_start_0 node1" -> "group1:0_running_0" [ style = bold]
	+"rsc1:0_start_0 node1" -> "rsc2:0_start_0 node1" [ style = bold]
	+"rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black"]
	+"rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
	+"rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
	+"rsc1:1_start_0 node2" -> "group1:1_running_0" [ style = bold]
	+"rsc1:1_start_0 node2" -> "rsc2:1_start_0 node2" [ style = bold]
	+"rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black"]
	+"rsc2:0_monitor_0 node1" -> "probe_complete node1" [ style = bold]
	+"rsc2:0_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
	+"rsc2:0_start_0 node1" -> "group1:0_running_0" [ style = bold]
	+"rsc2:0_start_0 node1" [ style=bold color="green" fontcolor="black"]
	+"rsc2:1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
	+"rsc2:1_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
	+"rsc2:1_start_0 node2" -> "group1:1_running_0" [ style = bold]
	+"rsc2:1_start_0 node2" [ style=bold color="green" fontcolor="black"]
	+}
	diff --git a/pengine/test10/template-clone-group.exp b/pengine/test10/template-clone-group.exp
	new file mode 100644
	index 0000000000..a0232807e4
	--- /dev/null
	+++ b/pengine/test10/template-clone-group.exp
	@@ -0,0 +1,240 @@
	+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
	+ <synapse id="0">
	+ <action_set>
	+ <pseudo_event id="12" operation="running" operation_key="group1:0_running_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="9" operation="start" operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="10" operation="start" operation_key="rsc2:0_start_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="11" operation="start" operation_key="group1:0_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="1">
	+ <action_set>
	+ <pseudo_event id="11" operation="start" operation_key="group1:0_start_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="21" operation="start" operation_key="clone1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="2">
	+ <action_set>
	+ <rsc_op id="9" operation="start" operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="node1">
	+ <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="11" operation="start" operation_key="group1:0_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="3">
	+ <action_set>
	+ <rsc_op id="4" operation="monitor" operation_key="rsc1:0_monitor_0" on_node="node1" on_node_uuid="node1">
	+ <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="4">
	+ <action_set>
	+ <rsc_op id="10" operation="start" operation_key="rsc2:0_start_0" on_node="node1" on_node_uuid="node1">
	+ <primitive id="rsc2" long-id="rsc2:0" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="9" operation="start" operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="11" operation="start" operation_key="group1:0_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="5">
	+ <action_set>
	+ <rsc_op id="5" operation="monitor" operation_key="rsc2:0_monitor_0" on_node="node1" on_node_uuid="node1">
	+ <primitive id="rsc2" long-id="rsc2:0" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="6">
	+ <action_set>
	+ <pseudo_event id="18" operation="running" operation_key="group1:1_running_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="15" operation="start" operation_key="rsc1:1_start_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="16" operation="start" operation_key="rsc2:1_start_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="17" operation="start" operation_key="group1:1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="7">
	+ <action_set>
	+ <pseudo_event id="17" operation="start" operation_key="group1:1_start_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="21" operation="start" operation_key="clone1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="8">
	+ <action_set>
	+ <rsc_op id="15" operation="start" operation_key="rsc1:1_start_0" on_node="node2" on_node_uuid="node2">
	+ <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="17" operation="start" operation_key="group1:1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="9">
	+ <action_set>
	+ <rsc_op id="7" operation="monitor" operation_key="rsc1:1_monitor_0" on_node="node2" on_node_uuid="node2">
	+ <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="10">
	+ <action_set>
	+ <rsc_op id="16" operation="start" operation_key="rsc2:1_start_0" on_node="node2" on_node_uuid="node2">
	+ <primitive id="rsc2" long-id="rsc2:1" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="15" operation="start" operation_key="rsc1:1_start_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="17" operation="start" operation_key="group1:1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="11">
	+ <action_set>
	+ <rsc_op id="8" operation="monitor" operation_key="rsc2:1_monitor_0" on_node="node2" on_node_uuid="node2">
	+ <primitive id="rsc2" long-id="rsc2:1" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="12" priority="1000000">
	+ <action_set>
	+ <pseudo_event id="22" operation="running" operation_key="clone1_running_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="12" operation="running" operation_key="group1:0_running_0"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="18" operation="running" operation_key="group1:1_running_0"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="21" operation="start" operation_key="clone1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="13">
	+ <action_set>
	+ <pseudo_event id="21" operation="start" operation_key="clone1_start_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="14" priority="1000000">
	+ <action_set>
	+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
	+ <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="7" operation="monitor" operation_key="rsc1:1_monitor_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="8" operation="monitor" operation_key="rsc2:1_monitor_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="15" priority="1000000">
	+ <action_set>
	+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
	+ <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="4" operation="monitor" operation_key="rsc1:0_monitor_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="5" operation="monitor" operation_key="rsc2:0_monitor_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="16">
	+ <action_set>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
	+ <attributes crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="6" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+</transition_graph>
	+
	diff --git a/pengine/test10/template-clone-group.scores b/pengine/test10/template-clone-group.scores
	new file mode 100644
	index 0000000000..befdf11a4a
	--- /dev/null
	+++ b/pengine/test10/template-clone-group.scores
	@@ -0,0 +1,35 @@
	+Allocation scores:
	+clone_color: clone1 allocation score on node1: 0
	+clone_color: clone1 allocation score on node2: 0
	+clone_color: group1:0 allocation score on node1: 0
	+clone_color: group1:0 allocation score on node2: 0
	+clone_color: group1:1 allocation score on node1: 0
	+clone_color: group1:1 allocation score on node2: 0
	+clone_color: rsc1:0 allocation score on node1: 0
	+clone_color: rsc1:0 allocation score on node2: 0
	+clone_color: rsc1:1 allocation score on node1: 0
	+clone_color: rsc1:1 allocation score on node2: 0
	+clone_color: rsc2:0 allocation score on node1: 0
	+clone_color: rsc2:0 allocation score on node2: 0
	+clone_color: rsc2:1 allocation score on node1: 0
	+clone_color: rsc2:1 allocation score on node2: 0
	+group_color: group1:0 allocation score on node1: 0
	+group_color: group1:0 allocation score on node2: 0
	+group_color: group1:1 allocation score on node1: -INFINITY
	+group_color: group1:1 allocation score on node2: 0
	+group_color: rsc1:0 allocation score on node1: 0
	+group_color: rsc1:0 allocation score on node2: 0
	+group_color: rsc1:1 allocation score on node1: -INFINITY
	+group_color: rsc1:1 allocation score on node2: 0
	+group_color: rsc2:0 allocation score on node1: 0
	+group_color: rsc2:0 allocation score on node2: 0
	+group_color: rsc2:1 allocation score on node1: -INFINITY
	+group_color: rsc2:1 allocation score on node2: 0
	+native_color: rsc1:0 allocation score on node1: 0
	+native_color: rsc1:0 allocation score on node2: 0
	+native_color: rsc1:1 allocation score on node1: -INFINITY
	+native_color: rsc1:1 allocation score on node2: 0
	+native_color: rsc2:0 allocation score on node1: 0
	+native_color: rsc2:0 allocation score on node2: -INFINITY
	+native_color: rsc2:1 allocation score on node1: -INFINITY
	+native_color: rsc2:1 allocation score on node2: 0
	diff --git a/pengine/test10/template-clone-group.summary b/pengine/test10/template-clone-group.summary
	new file mode 100644
	index 0000000000..f1386fb507
	--- /dev/null
	+++ b/pengine/test10/template-clone-group.summary
	@@ -0,0 +1,36 @@
	+
	+Current cluster status:
	+Online: [ node1 node2 ]
	+
	+ Clone Set: clone1 [group1]
	+ Stopped: [ group1:0 group1:1 ]
	+
	+Transition Summary:
	+ * Start rsc1:0 (node1)
	+ * Start rsc2:0 (node1)
	+ * Start rsc1:1 (node2)
	+ * Start rsc2:1 (node2)
	+
	+Executing cluster transition:
	+ * Resource action: rsc1:0 monitor on node1
	+ * Resource action: rsc2:0 monitor on node1
	+ * Resource action: rsc1:1 monitor on node2
	+ * Resource action: rsc2:1 monitor on node2
	+ * Pseudo action: clone1_start_0
	+ * Pseudo action: probe_complete
	+ * Pseudo action: group1:0_start_0
	+ * Resource action: rsc1:0 start on node1
	+ * Resource action: rsc2:0 start on node1
	+ * Pseudo action: group1:1_start_0
	+ * Resource action: rsc1:1 start on node2
	+ * Resource action: rsc2:1 start on node2
	+ * Pseudo action: group1:0_running_0
	+ * Pseudo action: group1:1_running_0
	+ * Pseudo action: clone1_running_0
	+
	+Revised cluster status:
	+Online: [ node1 node2 ]
	+
	+ Clone Set: clone1 [group1]
	+ Started: [ node1 node2 ]
	+
	diff --git a/pengine/test10/template-clone-group.xml b/pengine/test10/template-clone-group.xml
	new file mode 100644
	index 0000000000..39779d45d9
	--- /dev/null
	+++ b/pengine/test10/template-clone-group.xml
	@@ -0,0 +1,28 @@
	+<cib epoch="1" num_updates="20" admin_epoch="0" validate-with="pacemaker-1.1" cib-last-written="Fri Jul 13 13:51:17 2012" have-quorum="1">
	+ <configuration>
	+ <crm_config>
	+ <cluster_property_set id="cib-bootstrap-options">
	+ <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
	+ <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
	+ </cluster_property_set>
	+ </crm_config>
	+ <nodes>
	+ <node id="node1" type="normal" uname="node1"/>
	+ <node id="node2" type="normal" uname="node2"/>
	+ </nodes>
	+ <resources>
	+ <template class="ocf" id="template1" provider="pacemaker" type="Dummy"/>
	+ <clone id="clone1">
	+ <group id="group1">
	+ <primitive id="rsc1" template="template1"/>
	+ <primitive id="rsc2" template="template1"/>
	+ </group>
	+ </clone>
	+ </resources>
	+ <constraints/>
	+ </configuration>
	+ <status>
	+ <node_state id="node1" uname="node1" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate"/>
	+ <node_state id="node2" uname="node2" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate"/>
	+ </status>
	+</cib>
	diff --git a/pengine/test10/template-clone-primitive.dot b/pengine/test10/template-clone-primitive.dot
	new file mode 100644
	index 0000000000..34c241cbe8
	--- /dev/null
	+++ b/pengine/test10/template-clone-primitive.dot
	@@ -0,0 +1,22 @@
	+digraph "g" {
	+"clone1_running_0" [ style=bold color="green" fontcolor="orange"]
	+"clone1_start_0" -> "clone1_running_0" [ style = bold]
	+"clone1_start_0" -> "rsc1:0_start_0 node1" [ style = bold]
	+"clone1_start_0" -> "rsc1:1_start_0 node2" [ style = bold]
	+"clone1_start_0" [ style=bold color="green" fontcolor="orange"]
	+"probe_complete node1" -> "probe_complete" [ style = bold]
	+"probe_complete node1" [ style=bold color="green" fontcolor="black"]
	+"probe_complete node2" -> "probe_complete" [ style = bold]
	+"probe_complete node2" [ style=bold color="green" fontcolor="black"]
	+"probe_complete" -> "rsc1:0_start_0 node1" [ style = bold]
	+"probe_complete" -> "rsc1:1_start_0 node2" [ style = bold]
	+"probe_complete" [ style=bold color="green" fontcolor="orange"]
	+"rsc1:0_monitor_0 node1" -> "probe_complete node1" [ style = bold]
	+"rsc1:0_monitor_0 node1" [ style=bold color="green" fontcolor="black"]
	+"rsc1:0_start_0 node1" -> "clone1_running_0" [ style = bold]
	+"rsc1:0_start_0 node1" [ style=bold color="green" fontcolor="black"]
	+"rsc1:1_monitor_0 node2" -> "probe_complete node2" [ style = bold]
	+"rsc1:1_monitor_0 node2" [ style=bold color="green" fontcolor="black"]
	+"rsc1:1_start_0 node2" -> "clone1_running_0" [ style = bold]
	+"rsc1:1_start_0 node2" [ style=bold color="green" fontcolor="black"]
	+}
	diff --git a/pengine/test10/template-clone-primitive.exp b/pengine/test10/template-clone-primitive.exp
	new file mode 100644
	index 0000000000..816ccfd447
	--- /dev/null
	+++ b/pengine/test10/template-clone-primitive.exp
	@@ -0,0 +1,118 @@
	+<transition_graph cluster-delay="60s" stonith-timeout="60s" failed-stop-offset="INFINITY" failed-start-offset="INFINITY" batch-limit="30" transition_id="0">
	+ <synapse id="0">
	+ <action_set>
	+ <rsc_op id="7" operation="start" operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="node1">
	+ <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="9" operation="start" operation_key="clone1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="1">
	+ <action_set>
	+ <rsc_op id="4" operation="monitor" operation_key="rsc1:0_monitor_0" on_node="node1" on_node_uuid="node1">
	+ <primitive id="rsc1" long-id="rsc1:0" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="0" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="2">
	+ <action_set>
	+ <rsc_op id="8" operation="start" operation_key="rsc1:1_start_0" on_node="node2" on_node_uuid="node2">
	+ <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="9" operation="start" operation_key="clone1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="3">
	+ <action_set>
	+ <rsc_op id="6" operation="monitor" operation_key="rsc1:1_monitor_0" on_node="node2" on_node_uuid="node2">
	+ <primitive id="rsc1" long-id="rsc1:1" class="ocf" provider="pacemaker" type="Dummy"/>
	+ <attributes CRM_meta_clone="1" CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_op_target_rc="7" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="4" priority="1000000">
	+ <action_set>
	+ <pseudo_event id="10" operation="running" operation_key="clone1_running_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="7" operation="start" operation_key="rsc1:0_start_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="8" operation="start" operation_key="rsc1:1_start_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ <trigger>
	+ <pseudo_event id="9" operation="start" operation_key="clone1_start_0"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="5">
	+ <action_set>
	+ <pseudo_event id="9" operation="start" operation_key="clone1_start_0">
	+ <attributes CRM_meta_clone_max="2" CRM_meta_clone_node_max="1" CRM_meta_globally_unique="false" CRM_meta_notify="false" CRM_meta_timeout="20000" crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs/>
	+ </synapse>
	+ <synapse id="6" priority="1000000">
	+ <action_set>
	+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2">
	+ <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="6" operation="monitor" operation_key="rsc1:1_monitor_0" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="7" priority="1000000">
	+ <action_set>
	+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1">
	+ <attributes CRM_meta_op_no_wait="true" crm_feature_set="3.0.6"/>
	+ </rsc_op>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="4" operation="monitor" operation_key="rsc1:0_monitor_0" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+ <synapse id="8">
	+ <action_set>
	+ <pseudo_event id="2" operation="probe_complete" operation_key="probe_complete">
	+ <attributes crm_feature_set="3.0.6"/>
	+ </pseudo_event>
	+ </action_set>
	+ <inputs>
	+ <trigger>
	+ <rsc_op id="3" operation="probe_complete" operation_key="probe_complete" on_node="node1" on_node_uuid="node1"/>
	+ </trigger>
	+ <trigger>
	+ <rsc_op id="5" operation="probe_complete" operation_key="probe_complete" on_node="node2" on_node_uuid="node2"/>
	+ </trigger>
	+ </inputs>
	+ </synapse>
	+</transition_graph>
	+
	diff --git a/pengine/test10/template-clone-primitive.scores b/pengine/test10/template-clone-primitive.scores
	new file mode 100644
	index 0000000000..65c671a967
	--- /dev/null
	+++ b/pengine/test10/template-clone-primitive.scores
	@@ -0,0 +1,11 @@
	+Allocation scores:
	+clone_color: clone1 allocation score on node1: 0
	+clone_color: clone1 allocation score on node2: 0
	+clone_color: rsc1:0 allocation score on node1: 0
	+clone_color: rsc1:0 allocation score on node2: 0
	+clone_color: rsc1:1 allocation score on node1: 0
	+clone_color: rsc1:1 allocation score on node2: 0
	+native_color: rsc1:0 allocation score on node1: 0
	+native_color: rsc1:0 allocation score on node2: 0
	+native_color: rsc1:1 allocation score on node1: -INFINITY
	+native_color: rsc1:1 allocation score on node2: 0
	diff --git a/pengine/test10/template-clone-primitive.summary b/pengine/test10/template-clone-primitive.summary
	new file mode 100644
	index 0000000000..20fb1e0699
	--- /dev/null
	+++ b/pengine/test10/template-clone-primitive.summary
	@@ -0,0 +1,26 @@
	+
	+Current cluster status:
	+Online: [ node1 node2 ]
	+
	+ Clone Set: clone1 [rsc1]
	+ Stopped: [ rsc1:0 rsc1:1 ]
	+
	+Transition Summary:
	+ * Start rsc1:0 (node1)
	+ * Start rsc1:1 (node2)
	+
	+Executing cluster transition:
	+ * Resource action: rsc1:0 monitor on node1
	+ * Resource action: rsc1:1 monitor on node2
	+ * Pseudo action: clone1_start_0
	+ * Pseudo action: probe_complete
	+ * Resource action: rsc1:0 start on node1
	+ * Resource action: rsc1:1 start on node2
	+ * Pseudo action: clone1_running_0
	+
	+Revised cluster status:
	+Online: [ node1 node2 ]
	+
	+ Clone Set: clone1 [rsc1]
	+ Started: [ node1 node2 ]
	+
	diff --git a/pengine/test10/template-clone-primitive.xml b/pengine/test10/template-clone-primitive.xml
	new file mode 100644
	index 0000000000..bda28b1920
	--- /dev/null
	+++ b/pengine/test10/template-clone-primitive.xml
	@@ -0,0 +1,25 @@
	+<cib epoch="1" num_updates="20" admin_epoch="0" validate-with="pacemaker-1.1" cib-last-written="Fri Jul 13 13:51:17 2012" have-quorum="1">
	+ <configuration>
	+ <crm_config>
	+ <cluster_property_set id="cib-bootstrap-options">
	+ <nvpair id="cib-bootstrap-options-stonith-enabled" name="stonith-enabled" value="false"/>
	+ <nvpair id="cib-bootstrap-options-no-quorum-policy" name="no-quorum-policy" value="ignore"/>
	+ </cluster_property_set>
	+ </crm_config>
	+ <nodes>
	+ <node id="node1" type="normal" uname="node1"/>
	+ <node id="node2" type="normal" uname="node2"/>
	+ </nodes>
	+ <resources>
	+ <template class="ocf" id="template1" provider="pacemaker" type="Dummy"/>
	+ <clone id="clone1">
	+ <primitive id="rsc1" template="template1"/>
	+ </clone>
	+ </resources>
	+ <constraints/>
	+ </configuration>
	+ <status>
	+ <node_state id="node1" uname="node1" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate"/>
	+ <node_state id="node2" uname="node2" ha="active" in_ccm="true" crmd="online" join="member" expected="member" crm-debug-origin="crm_simulate"/>
	+ </status>
	+</cib>

File Metadata

Mime Type: text/x-diff
Expires: Sat, Oct 25, 2:13 AM (1 d, 16 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 2619984
Default Alt Text: (105 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions