Send Linux-ha-cvs mailing list submissions to
        [email protected]

To subscribe or unsubscribe via the World Wide Web, visit
        http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
        [EMAIL PROTECTED]

You can reach the person managing the list at
        [EMAIL PROTECTED]

When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."


Today's Topics:

   1. Linux-HA CVS: cts by sunjd from  ([email protected])
   2. Linux-HA CVS: linux-ha by sunjd from 
      ([email protected])
   3. Linux-HA CVS: linux-ha by andrew from 
      ([email protected])
   4. Linux-HA CVS: mgmt by andrew from 
      ([email protected])
   5. Linux-HA CVS: crm by andrew from 
      ([email protected])


----------------------------------------------------------------------

Message: 1
Date: Sun, 26 Mar 2006 20:05:04 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: cts by sunjd from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : sunjd
Host    : 
Project : linux-ha
Module  : cts

Dir     : linux-ha/cts


Modified Files:
        CTSlab.py.in 


Log Message:
Replace the hardcode path with configurable ones
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/cts/CTSlab.py.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -3 -r1.56 -r1.57
--- CTSlab.py.in        26 Mar 2006 03:52:10 -0000      1.56
+++ CTSlab.py.in        27 Mar 2006 03:05:03 -0000      1.57
@@ -69,15 +69,15 @@
         self.sttype = sttype
         self.nodes = nodes
 
-        self.query_cmd_pat   = '/usr/lib/heartbeat/stonithdtest/apitest 0 %s 
4000 0'
-        self.reset_cmd_pat   = '/usr/lib/heartbeat/stonithdtest/apitest 1 %s 
4000 0'
-        self.poweron_cmd_pat = '/usr/lib/heartbeat/stonithdtest/apitest 2 %s 
4000 0'
-        self.poweroff_cmd_pat= '/usr/lib/heartbeat/stonithdtest/apitest 3 %s 
4000 0'
-
-        self.lrmd_add_pat    = '/usr/lib/heartbeat/lrmadmin -A %s stonith ' + 
sttype + ' NULL hostlist=%s'
-        self.lrmd_start_pat  = '/usr/lib/heartbeat/lrmadmin -E %s start 0 0 
EVERYTIME'
-        self.lrmd_stop_pat   = '/usr/lib/heartbeat/lrmadmin -E %s stop 0 0 
EVERYTIME'
-        self.lrmd_del_pat    = '/usr/lib/heartbeat/lrmadmin -D %s'
+        self.query_cmd_pat   = '@libdir@/heartbeat/stonithdtest/apitest 0 %s 
4000 0'
+        self.reset_cmd_pat   = '@libdir@/heartbeat/stonithdtest/apitest 1 %s 
4000 0'
+        self.poweron_cmd_pat = '@libdir@/heartbeat/stonithdtest/apitest 2 %s 
4000 0'
+        self.poweroff_cmd_pat= '@libdir@/heartbeat/stonithdtest/apitest 3 %s 
4000 0'
+
+        self.lrmd_add_pat    = '@libdir@/heartbeat/lrmadmin -A %s stonith ' + 
sttype + ' NULL hostlist=%s'
+        self.lrmd_start_pat  = '@libdir@/heartbeat/lrmadmin -E %s start 0 0 
EVERYTIME'
+        self.lrmd_stop_pat   = '@libdir@/heartbeat/lrmadmin -E %s stop 0 0 
EVERYTIME'
+        self.lrmd_del_pat    = '@libdir@/heartbeat/lrmadmin -D %s'
 
         self.rsc_id          = 'my_stonithd_id'
 




------------------------------

Message: 2
Date: Sun, 26 Mar 2006 20:12:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by sunjd from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : sunjd
Host    : 
Module  : linux-ha

Dir     : linux-ha


Modified Files:
        ConfigureMe 


Log Message:
Fix the library path issue when building heartbeat as 64bits applications
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ConfigureMe,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- ConfigureMe 18 Mar 2006 17:12:10 -0000      1.49
+++ ConfigureMe 27 Mar 2006 03:12:25 -0000      1.50
@@ -103,6 +103,9 @@
                  *)    FLAGS="$FLAGS --libexecdir=/usr/lib64 
--libdir=/usr/lib64";;
                esac
                ;;
+# FIXME. I don't think it's a general fixing.
+    s390*)
+                FLAGS="$FLAGS --libexecdir=/usr/lib64 --libdir=/usr/lib64";;
    *)          ;;
   esac
 }




------------------------------

Message: 3
Date: Sun, 26 Mar 2006 22:42:33 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by andrew from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : andrew
Host    : 
Module  : linux-ha

Dir     : linux-ha


Modified Files:
        configure.in 


Log Message:
Get the management gui compiling and running under OSX





------------------------------

Message: 4
Date: Sun, 26 Mar 2006 22:42:33 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by andrew from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : andrew
Host    : 
Project : linux-ha
Module  : mgmt

Dir     : linux-ha/mgmt/daemon


Modified Files:
        mgmtd.c mgmt_lib.c 


Log Message:
Get the management gui compiling and running under OSX

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmtd.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- mgmtd.c     25 Jan 2006 09:27:51 -0000      1.15
+++ mgmtd.c     27 Mar 2006 05:42:32 -0000      1.16
@@ -28,10 +28,15 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <security/pam_appl.h>
+#if HAVE_SECURITY_PAM_APPL_H
+#  include <security/pam_appl.h>
+#else
+#  if HAVE_PAM_PAM_APPL_H
+#    include <pam/pam_appl.h>
+#  endif
+#endif
 #include <glib.h>
 
-
 #include <heartbeat.h>
 #include <clplumbing/GSource.h>
 #include <clplumbing/cl_log.h>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_lib.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- mgmt_lib.c  14 Dec 2005 09:39:24 -0000      1.4
+++ mgmt_lib.c  27 Mar 2006 05:42:32 -0000      1.5
@@ -25,7 +25,13 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <security/pam_appl.h>
+#if HAVE_SECURITY_PAM_APPL_H
+#  include <security/pam_appl.h>
+#else
+#  if HAVE_PAM_PAM_APPL_H
+#    include <pam/pam_appl.h>
+#  endif
+#endif
 #include <glib.h>
 
 




------------------------------

Message: 5
Date: Sun, 26 Mar 2006 22:44:25 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from 
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>

linux-ha CVS committal

Author  : andrew
Host    : 
Project : linux-ha
Module  : crm

Dir     : linux-ha/crm/pengine/testcases


Modified Files:
        master-1.xml master-2.exp master-2.xml master-3.xml 
        notify-1.exp notify-2.exp notify-3.exp 


Log Message:
Regardless of short_resource_names, which is only needed for the TE graph, 
  always present the short name to clients (including the GUI).  

===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-1.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- master-1.xml        7 Oct 2005 15:57:35 -0000       1.2
+++ master-1.xml        27 Mar 2006 05:44:24 -0000      1.3
@@ -9,22 +9,22 @@
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes id="master-uuid1">
           <attributes>
-            <nvpair id="master-rsc1:child_rsc1:0-uuid1" 
name="master-rsc1:child_rsc1:0" value="10"/>
-            <nvpair id="master-rsc1:child_rsc1:1-uuid1" 
name="master-rsc1:child_rsc1:1" value="100"/>
-            <nvpair id="master-rsc1:child_rsc1:2-uuid1" 
name="master-rsc1:child_rsc1:2" value="20"/>
-            <nvpair id="master-rsc1:child_rsc1:3-uuid1" 
name="master-rsc1:child_rsc1:3" value="200"/>
-            <nvpair id="master-rsc1:child_rsc1:4-uuid1" 
name="master-rsc1:child_rsc1:4" value="500"/>
+            <nvpair id="master-child_rsc1:0-uuid1" name="master-child_rsc1:0" 
value="10"/>
+            <nvpair id="master-child_rsc1:1-uuid1" name="master-child_rsc1:1" 
value="100"/>
+            <nvpair id="master-child_rsc1:2-uuid1" name="master-child_rsc1:2" 
value="20"/>
+            <nvpair id="master-child_rsc1:3-uuid1" name="master-child_rsc1:3" 
value="200"/>
+            <nvpair id="master-child_rsc1:4-uuid1" name="master-child_rsc1:4" 
value="500"/>
           </attributes>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes id="master-uuid2">
           <attributes>
-            <nvpair id="master-rsc1:child_rsc1:0-uuid2" 
name="master-rsc1:child_rsc1:0" value="300"/>
-            <nvpair id="master-rsc1:child_rsc1:1-uuid2" 
name="master-rsc1:child_rsc1:1" value="30"/>
-            <nvpair id="master-rsc1:child_rsc1:2-uuid2" 
name="master-rsc1:child_rsc1:2" value="400"/>
-            <nvpair id="master-rsc1:child_rsc1:3-uuid2" 
name="master-rsc1:child_rsc1:3" value="40"/>
-            <nvpair id="master-rsc1:child_rsc1:4-uuid2" 
name="master-rsc1:child_rsc1:4" value="600"/>
+            <nvpair id="master-child_rsc1:0-uuid2" name="master-child_rsc1:0" 
value="300"/>
+            <nvpair id="master-child_rsc1:1-uuid2" name="master-child_rsc1:1" 
value="30"/>
+            <nvpair id="master-child_rsc1:2-uuid2" name="master-child_rsc1:2" 
value="400"/>
+            <nvpair id="master-child_rsc1:3-uuid2" name="master-child_rsc1:3" 
value="40"/>
+            <nvpair id="master-child_rsc1:4-uuid2" name="master-child_rsc1:4" 
value="600"/>
           </attributes>
         </instance_attributes>
       </node>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-2.exp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- master-2.exp        8 Mar 2006 15:51:36 -0000       1.5
+++ master-2.exp        27 Mar 2006 05:44:24 -0000      1.6
@@ -3,7 +3,7 @@
      <action_set>
        <rsc_op id="1" rsc_id="rsc1:child_rsc1:2" operation="start" 
operation_key="rsc1:child_rsc1:2_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
-         <attributes notify_promote_resource="rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="2" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 " 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
        <rsc_op id="2" rsc_id="rsc1:child_rsc1:2" operation="promote" 
operation_key="rsc1:child_rsc1:2_promote_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
-         <attributes notify_promote_resource="rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="2" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 " 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -29,7 +29,7 @@
      <action_set>
        <rsc_op id="31" rsc_id="rsc1:child_rsc1:2" operation="notify" 
operation_key="rsc1:child_rsc1:2_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="2" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -42,7 +42,7 @@
      <action_set>
        <rsc_op id="32" rsc_id="rsc1:child_rsc1:2" operation="notify" 
operation_key="rsc1:child_rsc1:2_pre_notify_promote_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="pre" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="2" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -55,7 +55,7 @@
      <action_set>
        <rsc_op id="33" rsc_id="rsc1:child_rsc1:2" operation="notify" 
operation_key="rsc1:child_rsc1:2_post_notify_promote_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:2" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="2" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="2" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -68,7 +68,7 @@
      <action_set>
        <rsc_op id="3" rsc_id="rsc1:child_rsc1:3" operation="start" 
operation_key="rsc1:child_rsc1:3_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
-         <attributes notify_promote_resource="rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="3" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 " 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -81,7 +81,7 @@
      <action_set>
        <rsc_op id="4" rsc_id="rsc1:child_rsc1:3" operation="promote" 
operation_key="rsc1:child_rsc1:3_promote_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
-         <attributes notify_promote_resource="rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="3" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 " 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -94,7 +94,7 @@
      <action_set>
        <rsc_op id="34" rsc_id="rsc1:child_rsc1:3" operation="notify" 
operation_key="rsc1:child_rsc1:3_post_notify_start_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="3" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -107,7 +107,7 @@
      <action_set>
        <rsc_op id="35" rsc_id="rsc1:child_rsc1:3" operation="notify" 
operation_key="rsc1:child_rsc1:3_pre_notify_promote_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="pre" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="3" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -120,7 +120,7 @@
      <action_set>
        <rsc_op id="36" rsc_id="rsc1:child_rsc1:3" operation="notify" 
operation_key="rsc1:child_rsc1:3_post_notify_promote_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:3" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="3" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="3" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -133,7 +133,7 @@
      <action_set>
        <rsc_op id="5" rsc_id="rsc1:child_rsc1:0" operation="start" 
operation_key="rsc1:child_rsc1:0_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_promote_resource="rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="0" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 " 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -146,7 +146,7 @@
      <action_set>
        <rsc_op id="37" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="0" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -159,7 +159,7 @@
      <action_set>
        <rsc_op id="38" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_pre_notify_promote_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="pre" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="0" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -172,7 +172,7 @@
      <action_set>
        <rsc_op id="39" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_post_notify_promote_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="0" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="0" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -185,7 +185,7 @@
      <action_set>
        <rsc_op id="6" rsc_id="rsc1:child_rsc1:1" operation="start" 
operation_key="rsc1:child_rsc1:1_start_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_promote_resource="rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="1" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_promote_resource="child_rsc1:2 child_rsc1:3 " 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -198,7 +198,7 @@
      <action_set>
        <rsc_op id="40" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="1" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -211,7 +211,7 @@
      <action_set>
        <rsc_op id="41" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_pre_notify_promote_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="pre" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="1" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="pre" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -224,7 +224,7 @@
      <action_set>
        <rsc_op id="42" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_post_notify_promote_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_confirm="yes" 
notify_promote_resource="rsc1:child_rsc1:2 rsc1:child_rsc1:3 " 
notify_type="post" notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="rsc1:child_rsc1:0 rsc1:child_rsc1:1 rsc1:child_rsc1:2 
rsc1:child_rsc1:3 " clone="1" clone_max="5" notify="true" master_max="2" 
master_node_max="1" clone_node_max="2"/>
+         <attributes notify_confirm="yes" 
notify_promote_resource="child_rsc1:2 child_rsc1:3 " notify_type="post" 
notify_promote_uname="node1 node2 " crm_feature_set="1.0.4" 
notify_operation="promote" notify_start_uname="node1 node2 node1 node2 " 
notify_start_resource="child_rsc1:0 child_rsc1:1 child_rsc1:2 child_rsc1:3 " 
clone="1" clone_max="5" notify="true" master_max="2" master_node_max="1" 
clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-2.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- master-2.xml        7 Oct 2005 15:57:35 -0000       1.2
+++ master-2.xml        27 Mar 2006 05:44:24 -0000      1.3
@@ -9,16 +9,16 @@
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes>
           <attributes>
-            <nvpair name="master-rsc1:child_rsc1:0" value="10"/>
-            <nvpair name="master-rsc1:child_rsc1:2" value="20"/>
+            <nvpair name="master-child_rsc1:0" value="10"/>
+            <nvpair name="master-child_rsc1:2" value="20"/>
           </attributes>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes>
           <attributes>
-            <nvpair name="master-rsc1:child_rsc1:1" value="10"/>
-            <nvpair name="master-rsc1:child_rsc1:3" value="20"/>
+            <nvpair name="master-child_rsc1:1" value="10"/>
+            <nvpair name="master-child_rsc1:3" value="20"/>
           </attributes>
         </instance_attributes>
       </node>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/master-3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- master-3.xml        7 Oct 2005 15:57:35 -0000       1.1
+++ master-3.xml        27 Mar 2006 05:44:25 -0000      1.2
@@ -9,22 +9,22 @@
       <node id="uuid1" uname="node1" type="member">
         <instance_attributes id="master-uuid1">
           <attributes>
-            <nvpair id="master-rsc1:child_rsc1:0-uuid1" 
name="master-rsc1:child_rsc1:0" value="10"/>
-            <nvpair id="master-rsc1:child_rsc1:1-uuid1" 
name="master-rsc1:child_rsc1:1" value="100"/>
-            <nvpair id="master-rsc1:child_rsc1:2-uuid1" 
name="master-rsc1:child_rsc1:2" value="20"/>
-            <nvpair id="master-rsc1:child_rsc1:3-uuid1" 
name="master-rsc1:child_rsc1:3" value="200"/>
-            <nvpair id="master-rsc1:child_rsc1:4-uuid1" 
name="master-rsc1:child_rsc1:4" value="500"/>
+            <nvpair id="master-child_rsc1:0-uuid1" name="master-child_rsc1:0" 
value="10"/>
+            <nvpair id="master-child_rsc1:1-uuid1" name="master-child_rsc1:1" 
value="100"/>
+            <nvpair id="master-child_rsc1:2-uuid1" name="master-child_rsc1:2" 
value="20"/>
+            <nvpair id="master-child_rsc1:3-uuid1" name="master-child_rsc1:3" 
value="200"/>
+            <nvpair id="master-child_rsc1:4-uuid1" name="master-child_rsc1:4" 
value="500"/>
           </attributes>
         </instance_attributes>
       </node>
       <node id="uuid2" uname="node2" type="member">
         <instance_attributes id="master-uuid2">
           <attributes>
-            <nvpair id="master-rsc1:child_rsc1:0-uuid2" 
name="master-rsc1:child_rsc1:0" value="300"/>
-            <nvpair id="master-rsc1:child_rsc1:1-uuid2" 
name="master-rsc1:child_rsc1:1" value="30"/>
-            <nvpair id="master-rsc1:child_rsc1:2-uuid2" 
name="master-rsc1:child_rsc1:2" value="400"/>
-            <nvpair id="master-rsc1:child_rsc1:3-uuid2" 
name="master-rsc1:child_rsc1:3" value="40"/>
-            <nvpair id="master-rsc1:child_rsc1:4-uuid2" 
name="master-rsc1:child_rsc1:4" value="600"/>
+            <nvpair id="master-child_rsc1:0-uuid2" name="master-child_rsc1:0" 
value="300"/>
+            <nvpair id="master-child_rsc1:1-uuid2" name="master-child_rsc1:1" 
value="30"/>
+            <nvpair id="master-child_rsc1:2-uuid2" name="master-child_rsc1:2" 
value="400"/>
+            <nvpair id="master-child_rsc1:3-uuid2" name="master-child_rsc1:3" 
value="40"/>
+            <nvpair id="master-child_rsc1:4-uuid2" name="master-child_rsc1:4" 
value="600"/>
           </attributes>
         </instance_attributes>
       </node>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-1.exp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- notify-1.exp        8 Mar 2006 15:51:36 -0000       1.15
+++ notify-1.exp        27 Mar 2006 05:44:25 -0000      1.16
@@ -3,7 +3,7 @@
      <action_set>
        <rsc_op id="33" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
        <rsc_op id="34" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -38,7 +38,7 @@
      <action_set>
        <rsc_op id="7" rsc_id="rsc1:child_rsc1:1" operation="start" 
operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
crm_feature_set="1.0.4" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
crm_feature_set="1.0.4" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="1" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -51,7 +51,7 @@
      <action_set>
        <rsc_op id="37" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="1" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -147,7 +147,7 @@
      <action_set>
        <rsc_op id="20" rsc_id="rsc2:child_rsc2:0" operation="stop" 
operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
-         <attributes notify_stop_uname="node1 " 
notify_stop_resource="rsc2:child_rsc2:0 " crm_feature_set="1.0.4" clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_stop_uname="node1 " 
notify_stop_resource="child_rsc2:0 " crm_feature_set="1.0.4" clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -160,7 +160,7 @@
      <action_set>
        <rsc_op id="38" rsc_id="rsc2:child_rsc2:0" operation="notify" 
operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
-         <attributes notify_stop_uname="node1 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="rsc2:child_rsc2:0 " 
crm_feature_set="1.0.4" notify_operation="stop" clone="0" clone_max="2" 
notify="1" clone_node_max="2"/>
+         <attributes notify_stop_uname="node1 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="child_rsc2:0 " crm_feature_set="1.0.4" 
notify_operation="stop" clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-2.exp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- notify-2.exp        8 Mar 2006 15:51:36 -0000       1.13
+++ notify-2.exp        27 Mar 2006 05:44:25 -0000      1.14
@@ -3,7 +3,7 @@
      <action_set>
        <rsc_op id="33" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
notify_confirm="yes" notify_type="pre" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -16,7 +16,7 @@
      <action_set>
        <rsc_op id="34" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -38,7 +38,7 @@
      <action_set>
        <rsc_op id="7" rsc_id="rsc1:child_rsc1:1" operation="start" 
operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
crm_feature_set="1.0.4" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
crm_feature_set="1.0.4" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="1" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -51,7 +51,7 @@
      <action_set>
        <rsc_op id="37" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 " 
notify_confirm="yes" notify_type="post" crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 " clone="1" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -147,7 +147,7 @@
      <action_set>
        <rsc_op id="20" rsc_id="rsc2:child_rsc2:0" operation="stop" 
operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
-         <attributes notify_stop_uname="node1 " 
notify_stop_resource="rsc2:child_rsc2:0 " crm_feature_set="1.0.4" clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_stop_uname="node1 " 
notify_stop_resource="child_rsc2:0 " crm_feature_set="1.0.4" clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -160,7 +160,7 @@
      <action_set>
        <rsc_op id="38" rsc_id="rsc2:child_rsc2:0" operation="notify" 
operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
-         <attributes notify_stop_uname="node1 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="rsc2:child_rsc2:0 " 
crm_feature_set="1.0.4" notify_operation="stop" clone="0" clone_max="2" 
notify="1" clone_node_max="2"/>
+         <attributes notify_stop_uname="node1 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="child_rsc2:0 " crm_feature_set="1.0.4" 
notify_operation="stop" clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/testcases/notify-3.exp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- notify-3.exp        8 Mar 2006 15:51:36 -0000       1.13
+++ notify-3.exp        27 Mar 2006 05:44:25 -0000      1.14
@@ -12,7 +12,7 @@
      <action_set>
        <rsc_op id="38" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_pre_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="rsc1:child_rsc1:1 " 
crm_feature_set="1.0.4" notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_confirm="yes" notify_type="pre" 
notify_stop_resource="child_rsc1:1 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -25,7 +25,7 @@
      <action_set>
        <rsc_op id="39" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " notify_confirm="yes" 
notify_type="post" notify_stop_resource="rsc1:child_rsc1:1 " 
crm_feature_set="1.0.4" notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_confirm="yes" notify_type="post" 
notify_stop_resource="child_rsc1:1 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -38,7 +38,7 @@
      <action_set>
        <rsc_op id="40" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_pre_notify_stop_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="rsc1:child_rsc1:1 " 
crm_feature_set="1.0.4" notify_operation="stop" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_confirm="yes" notify_type="pre" 
notify_stop_resource="child_rsc1:1 " crm_feature_set="1.0.4" 
notify_operation="stop" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -51,7 +51,7 @@
      <action_set>
        <rsc_op id="41" rsc_id="rsc1:child_rsc1:0" operation="notify" 
operation_key="rsc1:child_rsc1:0_post_notify_stop_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:0" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " notify_confirm="yes" 
notify_type="post" notify_stop_resource="rsc1:child_rsc1:1 " 
crm_feature_set="1.0.4" notify_operation="stop" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_confirm="yes" notify_type="post" 
notify_stop_resource="child_rsc1:1 " crm_feature_set="1.0.4" 
notify_operation="stop" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -73,7 +73,7 @@
      <action_set>
        <rsc_op id="11" rsc_id="rsc1:child_rsc1:1" operation="stop" 
operation_key="rsc1:child_rsc1:1_stop_0" on_node="node2" on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " 
notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.4" 
notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " 
notify_active_uname="node1 node1 " clone="1" clone_max="2" notify="1" 
clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_stop_resource="child_rsc1:1 " 
crm_feature_set="1.0.4" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -86,7 +86,7 @@
      <action_set>
        <rsc_op id="12" rsc_id="rsc1:child_rsc1:1" operation="start" 
operation_key="rsc1:child_rsc1:1_start_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " 
notify_stop_resource="rsc1:child_rsc1:1 " crm_feature_set="1.0.4" 
notify_start_uname="node1 " notify_start_resource="rsc1:child_rsc1:1 " 
notify_active_uname="node1 node1 " clone="1" clone_max="2" notify="1" 
clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_stop_resource="child_rsc1:1 " 
crm_feature_set="1.0.4" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -102,7 +102,7 @@
      <action_set>
        <rsc_op id="42" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_post_notify_start_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " notify_confirm="yes" 
notify_type="post" notify_stop_resource="rsc1:child_rsc1:1 " 
crm_feature_set="1.0.4" notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_confirm="yes" notify_type="post" 
notify_stop_resource="child_rsc1:1 " crm_feature_set="1.0.4" 
notify_operation="start" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -115,7 +115,7 @@
      <action_set>
        <rsc_op id="43" rsc_id="rsc1:child_rsc1:1" operation="notify" 
operation_key="rsc1:child_rsc1:1_pre_notify_stop_0" on_node="node2" 
on_node_uuid="uuid2">
          <primitive id="rsc1:child_rsc1:1" class="heartbeat" type="apache"/>
-         <attributes notify_active_resource="rsc1:child_rsc1:0 
rsc1:child_rsc1:1 " notify_stop_uname="node2 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="rsc1:child_rsc1:1 " 
crm_feature_set="1.0.4" notify_operation="stop" notify_start_uname="node1 " 
notify_start_resource="rsc1:child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_active_resource="child_rsc1:0 child_rsc1:1 " 
notify_stop_uname="node2 " notify_confirm="yes" notify_type="pre" 
notify_stop_resource="child_rsc1:1 " crm_feature_set="1.0.4" 
notify_operation="stop" notify_start_uname="node1 " 
notify_start_resource="child_rsc1:1 " notify_active_uname="node1 node1 " 
clone="1" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -306,7 +306,7 @@
      <action_set>
        <rsc_op id="25" rsc_id="rsc2:child_rsc2:0" operation="stop" 
operation_key="rsc2:child_rsc2:0_stop_0" on_node="node1" on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
-         <attributes notify_stop_uname="node1 " 
notify_stop_resource="rsc2:child_rsc2:0 " crm_feature_set="1.0.4" clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
+         <attributes notify_stop_uname="node1 " 
notify_stop_resource="child_rsc2:0 " crm_feature_set="1.0.4" clone="0" 
clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>
@@ -319,7 +319,7 @@
      <action_set>
        <rsc_op id="44" rsc_id="rsc2:child_rsc2:0" operation="notify" 
operation_key="rsc2:child_rsc2:0_pre_notify_stop_0" on_node="node1" 
on_node_uuid="uuid1">
          <primitive id="rsc2:child_rsc2:0" class="heartbeat" type="apache"/>
-         <attributes notify_stop_uname="node1 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="rsc2:child_rsc2:0 " 
crm_feature_set="1.0.4" notify_operation="stop" clone="0" clone_max="2" 
notify="1" clone_node_max="2"/>
+         <attributes notify_stop_uname="node1 " notify_confirm="yes" 
notify_type="pre" notify_stop_resource="child_rsc2:0 " crm_feature_set="1.0.4" 
notify_operation="stop" clone="0" clone_max="2" notify="1" clone_node_max="2"/>
        </rsc_op>
      </action_set>
      <inputs>




------------------------------

_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs


End of Linux-ha-cvs Digest, Vol 28, Issue 63
********************************************

Reply via email to