[Cluster-devel] cluster/rgmanager/src/daemons/tests delta-test ...
lhh at sourceware.org
lhh at sourceware.org
Fri Jan 26 21:40:54 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Changes by: lhh at sourceware.org 2007-01-26 21:38:57
Modified files:
rgmanager/src/daemons/tests: delta-test001-test002.expected
delta-test002-test003.expected
delta-test003-test004.expected
delta-test004-test005.expected
delta-test005-test006.expected
delta-test006-test007.expected
delta-test007-test008.expected
delta-test008-test009.expected
delta-test009-test010.expected
delta-test010-test011.expected
delta-test011-test012.expected
delta-test012-test013.expected
delta-test013-test014.expected
delta-test014-test015.expected
delta-test015-test016.expected
runtests.sh test001.expected
test002.expected test003.expected
test004.expected test005.expected
test006.expected test007.expected
test008.expected test009.expected
test010.expected test011.expected
test012.expected test013.expected
test014.expected test015.expected
test016.expected
Log message:
Clean up test cases
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test001-test002.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test002-test003.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test003-test004.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test004-test005.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test005-test006.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test006-test007.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test007-test008.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test008-test009.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test009-test010.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test010-test011.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test011-test012.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test012-test013.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test013-test014.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test014-test015.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/delta-test015-test016.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/runtests.sh.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test001.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test002.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test003.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test004.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test005.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test006.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test007.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test008.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test009.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test010.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test011.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test012.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test013.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test014.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test015.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/daemons/tests/test016.expected.diff?cvsroot=cluster&r1=1.2&r2=1.3
--- cluster/rgmanager/src/daemons/tests/delta-test001-test002.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test001-test002.expected 2007/01/26 21:38:55 1.3
@@ -1,12 +1,12 @@
=== Old Resource List ===
-Resource type: service [ROOT] [INLINE]
+Resource type: service [INLINE]
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
=== New Resource List ===
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
--- cluster/rgmanager/src/daemons/tests/delta-test002-test003.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test002-test003.expected 2007/01/26 21:38:56 1.3
@@ -1,5 +1,5 @@
=== Old Resource List ===
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -11,8 +11,9 @@
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/httpd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -28,5 +29,6 @@
script [ NEEDSTART ] {
name = "initscript";
file = "/etc/init.d/httpd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test003-test004.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test003-test004.expected 2007/01/26 21:38:56 1.3
@@ -4,8 +4,9 @@
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/httpd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -17,8 +18,9 @@
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -30,6 +32,7 @@
script [ NEEDSTOP ] {
name = "initscript";
file = "/etc/init.d/httpd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -38,5 +41,6 @@
script [ NEEDSTART ] {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test004-test005.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test004-test005.expected 2007/01/26 21:38:56 1.3
@@ -4,28 +4,31 @@
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
=== New Resource List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip [NEEDSTART]
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.2 [ primary unique ]
monitor_link = 1
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -37,6 +40,7 @@
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -45,9 +49,10 @@
ip [ NEEDSTART ] {
address = "192.168.1.2";
monitor_link = "1";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test005-test006.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test005-test006.expected 2007/01/26 21:38:56 1.3
@@ -1,38 +1,42 @@
=== Old Resource List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip [NEEDSTOP]
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.2 [ primary unique ]
monitor_link = 1
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
-Instances: 1/1
-Agent: service.sh
-Attributes:
- name = test1 [ primary unique required ]
-
-=== New Resource List ===
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test1 [ primary unique required ]
+=== New Resource List ===
Resource type: ip [NEEDSTART]
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.2 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -44,10 +48,11 @@
ip [ NEEDSTOP ] {
address = "192.168.1.2";
monitor_link = "1";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -56,9 +61,10 @@
ip [ NEEDSTART ] {
address = "192.168.1.2";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test006-test007.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test006-test007.expected 2007/01/26 21:38:56 1.3
@@ -1,38 +1,42 @@
=== Old Resource List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip [NEEDSTOP]
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.2 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
-Instances: 1/1
-Agent: service.sh
-Attributes:
- name = test1 [ primary unique required ]
-
-=== New Resource List ===
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test1 [ primary unique required ]
+=== New Resource List ===
Resource type: ip [NEEDSTART]
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -44,10 +48,11 @@
ip [ NEEDSTOP ] {
address = "192.168.1.2";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -56,9 +61,10 @@
ip [ NEEDSTART ] {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test007-test008.expected 2005/03/21 22:00:31 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test007-test008.expected 2007/01/26 21:38:56 1.3
@@ -1,18 +1,20 @@
=== Old Resource List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -27,12 +29,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -40,8 +37,16 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -53,10 +58,11 @@
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -65,9 +71,10 @@
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test008-test009.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test008-test009.expected 2007/01/26 21:38:56 1.3
@@ -7,12 +7,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -20,8 +15,16 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -36,12 +39,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -49,8 +47,16 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -62,10 +68,11 @@
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -76,13 +83,14 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- }
+ }
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test009-test010.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test009-test010.expected 2007/01/26 21:38:56 1.3
@@ -7,12 +7,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -20,8 +15,16 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -36,12 +39,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -49,6 +47,7 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
Resource type: nfsexport [NEEDSTART]
Agent: nfsexport.sh
@@ -56,8 +55,16 @@
name = Dummy Export [ primary ]
device [ inherit("device") ]
path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -71,14 +78,15 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- }
+ }
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -89,13 +97,14 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- }
+ }
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test010-test011.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test010-test011.expected 2007/01/26 21:38:56 1.3
@@ -7,12 +7,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -20,6 +15,7 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
Resource type: nfsexport
Agent: nfsexport.sh
@@ -27,20 +23,47 @@
name = Dummy Export [ primary ]
device [ inherit("device") ]
path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
=== New Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient [NEEDSTART]
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient [NEEDSTART]
@@ -49,6 +72,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient [NEEDSTART]
@@ -57,6 +81,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient [NEEDSTART]
@@ -65,6 +90,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient [NEEDSTART]
@@ -73,38 +99,25 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -118,14 +131,15 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- }
+ }
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -136,30 +150,31 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport [ NEEDSTART ] {
+ nfsexport [ NEEDSTART ] {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test011-test012.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test011-test012.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,29 @@
=== Old Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +32,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +41,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +50,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient [NEEDSTOP]
@@ -37,50 +59,56 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
+Resource type: service
Instances: 1/1
-Agent: ip.sh
+Agent: service.sh
Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
+ name = test1 [ primary unique required ]
-Resource type: nfsexport
-Agent: nfsexport.sh
+=== New Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: ip
Instances: 1/1
-Agent: service.sh
+Agent: ip.sh
Attributes:
- name = test1 [ primary unique required ]
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-=== New Resource List ===
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -89,6 +117,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -97,6 +126,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -105,6 +135,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient [NEEDSTART]
@@ -113,38 +144,25 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -158,31 +176,32 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -193,36 +212,37 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient [ NEEDSTART ] {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test012-test013.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test012-test013.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,29 @@
=== Old Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +32,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +41,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +50,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient [NEEDSTOP]
@@ -37,50 +59,56 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
+Resource type: service
Instances: 1/1
-Agent: ip.sh
+Agent: service.sh
Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
+ name = test1 [ primary unique required ]
-Resource type: nfsexport
-Agent: nfsexport.sh
+=== New Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: ip
Instances: 1/1
-Agent: service.sh
+Agent: ip.sh
Attributes:
- name = test1 [ primary unique required ]
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-=== New Resource List ===
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -89,6 +117,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -97,6 +126,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -105,6 +135,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient [NEEDSTART]
@@ -113,38 +144,25 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -158,37 +176,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient [ NEEDSTOP ] {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -199,36 +218,37 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient [ NEEDSTART ] {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test013-test014.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test013-test014.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,29 @@
=== Old Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +32,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +41,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +50,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,8 +59,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
+Resource type: nfsexport
+Agent: nfsexport.sh
+Attributes:
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test1 [ primary unique required ]
+
+=== New Resource List ===
Resource type: fs
Instances: 1/1
Agent: fs.sh
@@ -47,12 +92,17 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
-Resource type: script
-Agent: script.sh
+Resource type: fs [NEEDSTART]
+Instances: 1/1
+Agent: fs.sh
Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ name = mount2 [ primary ]
+ mountpoint = /mnt/cluster2 [ unique required ]
+ device = /dev/sdb9 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -60,27 +110,23 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: ip [NEEDSTART]
Instances: 1/1
-Agent: service.sh
+Agent: ip.sh
Attributes:
- name = test1 [ primary unique required ]
+ address = 192.168.1.4 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-=== New Resource List ===
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -89,6 +135,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -97,6 +144,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -105,6 +153,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -113,60 +162,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
-Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
-
-Resource type: fs [NEEDSTART]
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount2 [ primary ]
- mountpoint = /mnt/cluster2 [ unique required ]
- device = /dev/sdb9 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: ip [NEEDSTART]
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.4 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
-Resource type: service [ROOT] [NEEDSTART]
+Resource type: service [NEEDSTART]
Instances: 1/1
Agent: service.sh
Attributes:
@@ -180,37 +200,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
=== New Resource Tree ===
@@ -221,37 +242,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service [ NEEDSTART ] {
@@ -261,36 +283,37 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test014-test015.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test014-test015.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,47 @@
=== Old Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount2 [ primary ]
+ mountpoint = /mnt/cluster2 [ unique required ]
+ device = /dev/sdb9 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.4 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient [NEEDSTOP]
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +50,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +59,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +68,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,8 +77,37 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
+Resource type: nfsexport
+Agent: nfsexport.sh
+Attributes:
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test1 [ primary unique required ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test2 [ primary unique required ]
+
+=== New Resource List ===
Resource type: fs
Instances: 1/1
Agent: fs.sh
@@ -47,6 +116,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
Resource type: fs
Instances: 1/1
@@ -56,12 +126,7 @@
mountpoint = /mnt/cluster2 [ unique required ]
device = /dev/sdb9 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -69,6 +134,7 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -76,33 +142,15 @@
Attributes:
address = 192.168.1.4 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
-Instances: 1/1
-Agent: service.sh
-Attributes:
- name = test1 [ primary unique required ]
-
-Resource type: service [ROOT]
-Instances: 1/1
-Agent: service.sh
-Attributes:
- name = test2 [ primary unique required ]
-
-=== New Resource List ===
Resource type: nfsclient [NEEDSTART]
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,sync
Resource type: nfsclient
@@ -111,6 +159,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -119,6 +168,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -127,6 +177,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -135,60 +186,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
-Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
-
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount2 [ primary ]
- mountpoint = /mnt/cluster2 [ unique required ]
- device = /dev/sdb9 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.4 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -202,37 +224,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient [ NEEDSTOP ] {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -242,37 +265,38 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient [ NEEDSTOP ] {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
=== New Resource Tree ===
@@ -283,37 +307,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient [ NEEDSTART ] {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -323,36 +348,37 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient [ NEEDSTART ] {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
--- cluster/rgmanager/src/daemons/tests/delta-test015-test016.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/delta-test015-test016.expected 2007/01/26 21:38:56 1.3
@@ -1,11 +1,48 @@
Warning: Max references exceeded for resource address (type ip)
=== Old Resource List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount2 [ primary ]
+ mountpoint = /mnt/cluster2 [ unique required ]
+ device = /dev/sdb9 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.4 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,sync
Resource type: nfsclient
@@ -14,6 +51,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -22,6 +60,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -30,6 +69,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -38,8 +78,37 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
+Resource type: nfsexport
+Agent: nfsexport.sh
+Attributes:
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test1 [ primary unique required ]
+
+Resource type: service
+Instances: 1/1
+Agent: service.sh
+Attributes:
+ name = test2 [ primary unique required ]
+
+=== New Resource List ===
Resource type: fs
Instances: 1/1
Agent: fs.sh
@@ -48,6 +117,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
Resource type: fs
Instances: 1/1
@@ -57,12 +127,7 @@
mountpoint = /mnt/cluster2 [ unique required ]
device = /dev/sdb9 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -70,6 +135,7 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -77,33 +143,15 @@
Attributes:
address = 192.168.1.4 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
-Instances: 1/1
-Agent: service.sh
-Attributes:
- name = test1 [ primary unique required ]
-
-Resource type: service [ROOT]
-Instances: 1/1
-Agent: service.sh
-Attributes:
- name = test2 [ primary unique required ]
-
-=== New Resource List ===
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,sync
Resource type: nfsclient
@@ -112,6 +160,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -120,6 +169,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -128,6 +178,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -136,60 +187,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
-Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
-
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount2 [ primary ]
- mountpoint = /mnt/cluster2 [ unique required ]
- device = /dev/sdb9 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.4 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -203,37 +225,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -243,37 +266,38 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
=== New Resource Tree ===
@@ -284,37 +308,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -324,36 +349,37 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
--- cluster/rgmanager/src/daemons/tests/runtests.sh 2005/01/25 16:45:32 1.1
+++ cluster/rgmanager/src/daemons/tests/runtests.sh 2007/01/26 21:38:56 1.2
@@ -23,11 +23,17 @@
for t in $TESTS; do
echo -n " Checking $t.conf..."
../rg_test ../../resources test $t.conf > $t.out 2> $t.out.stderr
- diff -w $t.expected $t.out
+ diff -uw $t.expected $t.out
if [ $? -ne 0 ]; then
echo "FAILED"
echo "*** Basic Test $t failed"
- exit 1
+ echo -n "Accept new output [y/N] ? "
+ read ovr
+ if [ "$ovr" = "y" ]; then
+ cp $t.out $t.expected
+ else
+ exit 1
+ fi
fi
if grep -q "allocation trace" $t.out.stderr; then
echo "FAILED - memory leak"
@@ -54,11 +60,17 @@
echo -n " Checking delta between $prev and $t..."
../rg_test ../../resources delta \
$prev.conf $t.conf > delta-$prev-$t.out 2> delta-$prev-$t.out.stderr
- diff -w delta-$prev-$t.expected delta-$prev-$t.out
+ diff -uw delta-$prev-$t.expected delta-$prev-$t.out
if [ $? -ne 0 ]; then
echo "FAILED"
echo "*** Differential test between $prev and $t failed"
- exit 1
+ echo -n "Accept new output [y/N] ? "
+ read ovr
+ if [ "$ovr" = "y" ]; then
+ cp delta-$prev-$t.out delta-$prev-$t.expected
+ else
+ exit 1
+ fi
fi
if grep -q "allocation trace" delta-$prev-$t.out.stderr; then
echo "FAILED - memory leak"
--- cluster/rgmanager/src/daemons/tests/test001.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test001.expected 2007/01/26 21:38:56 1.3
@@ -1,5 +1,5 @@
=== Resources List ===
-Resource type: service [ROOT] [INLINE]
+Resource type: service [INLINE]
Instances: 1/1
Agent: service.sh
Attributes:
--- cluster/rgmanager/src/daemons/tests/test002.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test002.expected 2007/01/26 21:38:56 1.3
@@ -1,5 +1,5 @@
=== Resources List ===
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
--- cluster/rgmanager/src/daemons/tests/test003.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test003.expected 2007/01/26 21:38:56 1.3
@@ -4,8 +4,9 @@
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/httpd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -17,5 +18,6 @@
script {
name = "initscript";
file = "/etc/init.d/httpd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test004.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test004.expected 2007/01/26 21:38:56 1.3
@@ -4,8 +4,9 @@
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -17,5 +18,6 @@
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test005.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test005.expected 2007/01/26 21:38:56 1.3
@@ -1,18 +1,20 @@
=== Resources List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.2 [ primary unique ]
monitor_link = 1
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -24,9 +26,10 @@
ip {
address = "192.168.1.2";
monitor_link = "1";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test006.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test006.expected 2007/01/26 21:38:56 1.3
@@ -1,18 +1,20 @@
=== Resources List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.2 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -24,9 +26,10 @@
ip {
address = "192.168.1.2";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test007.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test007.expected 2007/01/26 21:38:56 1.3
@@ -1,18 +1,20 @@
=== Resources List ===
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
-
Resource type: ip
Instances: 1/1
Agent: ip.sh
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -24,9 +26,10 @@
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test008.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test008.expected 2007/01/26 21:38:56 1.3
@@ -7,12 +7,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -20,8 +15,16 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
-Resource type: service [ROOT]
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
+
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -33,9 +36,10 @@
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test009.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test009.expected 2007/01/26 21:38:56 1.3
@@ -7,12 +7,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -20,8 +15,16 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -35,13 +38,14 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- }
+ }
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test010.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test010.expected 2007/01/26 21:38:56 1.3
@@ -7,12 +7,7 @@
mountpoint = /mnt/cluster [ unique required ]
device = /dev/sdb8 [ unique required ]
fstype = ext3
-
-Resource type: script
-Agent: script.sh
-Attributes:
- name = initscript [ primary unique ]
- file = /etc/init.d/sshd [ unique required ]
+ nfslock [ inherit("service%nfslock") ]
Resource type: ip
Instances: 1/1
@@ -20,6 +15,7 @@
Attributes:
address = 192.168.1.3 [ primary unique ]
monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
Resource type: nfsexport
Agent: nfsexport.sh
@@ -27,8 +23,16 @@
name = Dummy Export [ primary ]
device [ inherit("device") ]
path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
+
+Resource type: script
+Agent: script.sh
+Attributes:
+ name = initscript [ primary unique ]
+ file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -42,13 +46,14 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- }
+ }
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test011.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test011.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,29 @@
=== Resources List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +32,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +41,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +50,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,38 +59,25 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -82,30 +91,31 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test012.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test012.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,29 @@
=== Resources List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +32,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +41,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +50,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,38 +59,25 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -82,36 +91,37 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test013.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test013.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,29 @@
=== Resources List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +32,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +41,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +50,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,38 +59,25 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -82,36 +91,37 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
--- cluster/rgmanager/src/daemons/tests/test014.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test014.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,47 @@
=== Resources List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount2 [ primary ]
+ mountpoint = /mnt/cluster2 [ unique required ]
+ device = /dev/sdb9 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.4 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = ro
Resource type: nfsclient
@@ -13,6 +50,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +59,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +68,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,60 +77,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
-Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
-
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount2 [ primary ]
- mountpoint = /mnt/cluster2 [ unique required ]
- device = /dev/sdb9 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.4 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -104,37 +115,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -144,36 +156,37 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "ro";
+ options = "ro";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
--- cluster/rgmanager/src/daemons/tests/test015.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test015.expected 2007/01/26 21:38:56 1.3
@@ -1,10 +1,47 @@
=== Resources List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount2 [ primary ]
+ mountpoint = /mnt/cluster2 [ unique required ]
+ device = /dev/sdb9 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.4 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,sync
Resource type: nfsclient
@@ -13,6 +50,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -21,6 +59,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -29,6 +68,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -37,60 +77,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
-Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
-
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount2 [ primary ]
- mountpoint = /mnt/cluster2 [ unique required ]
- device = /dev/sdb9 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.4 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -104,37 +115,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -144,36 +156,37 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
--- cluster/rgmanager/src/daemons/tests/test016.expected 2005/03/21 22:00:32 1.2
+++ cluster/rgmanager/src/daemons/tests/test016.expected 2007/01/26 21:38:56 1.3
@@ -1,11 +1,48 @@
Warning: Max references exceeded for resource address (type ip)
=== Resources List ===
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount1 [ primary ]
+ mountpoint = /mnt/cluster [ unique required ]
+ device = /dev/sdb8 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: fs
+Instances: 1/1
+Agent: fs.sh
+Attributes:
+ name = mount2 [ primary ]
+ mountpoint = /mnt/cluster2 [ unique required ]
+ device = /dev/sdb9 [ unique required ]
+ fstype = ext3
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.3 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
+Resource type: ip
+Instances: 1/1
+Agent: ip.sh
+Attributes:
+ address = 192.168.1.4 [ primary unique ]
+ monitor_link = yes
+ nfslock [ inherit("service%nfslock") ]
+
Resource type: nfsclient
Agent: nfsclient.sh
Attributes:
name = User group [ primary unique ]
target = @users [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,sync
Resource type: nfsclient
@@ -14,6 +51,7 @@
name = Admin group [ primary unique ]
target = @admin [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
Resource type: nfsclient
@@ -22,6 +60,7 @@
name = yellow [ primary unique ]
target = yellow [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -30,6 +69,7 @@
name = magenta [ primary unique ]
target = magenta [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw,no_root_squash
Resource type: nfsclient
@@ -38,60 +78,31 @@
name = red [ primary unique ]
target = red [ required ]
path [ inherit("path") ]
+ fsid [ inherit("fsid") ]
options = rw
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
-Attributes:
- name = mount1 [ primary ]
- mountpoint = /mnt/cluster [ unique required ]
- device = /dev/sdb8 [ unique required ]
- fstype = ext3
-
-Resource type: fs
-Instances: 1/1
-Agent: fs.sh
+Resource type: nfsexport
+Agent: nfsexport.sh
Attributes:
- name = mount2 [ primary ]
- mountpoint = /mnt/cluster2 [ unique required ]
- device = /dev/sdb9 [ unique required ]
- fstype = ext3
+ name = Dummy Export [ primary ]
+ device [ inherit("device") ]
+ path [ inherit("mountpoint") ]
+ fsid [ inherit("fsid") ]
Resource type: script
Agent: script.sh
Attributes:
name = initscript [ primary unique ]
file = /etc/init.d/sshd [ unique required ]
+ service_name [ inherit("service%name") ]
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.3 [ primary unique ]
- monitor_link = yes
-
-Resource type: ip
-Instances: 1/1
-Agent: ip.sh
-Attributes:
- address = 192.168.1.4 [ primary unique ]
- monitor_link = yes
-
-Resource type: nfsexport
-Agent: nfsexport.sh
-Attributes:
- name = Dummy Export [ primary ]
- device [ inherit("device") ]
- path [ inherit("mountpoint") ]
-
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
name = test1 [ primary unique required ]
-Resource type: service [ROOT]
+Resource type: service
Instances: 1/1
Agent: service.sh
Attributes:
@@ -105,37 +116,38 @@
mountpoint = "/mnt/cluster";
device = "/dev/sdb8";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb8";
path = "/mnt/cluster";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.3";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test1";
}
}
service {
@@ -145,36 +157,37 @@
mountpoint = "/mnt/cluster2";
device = "/dev/sdb9";
fstype = "ext3";
- nfsexport {
+ nfsexport {
name = "Dummy Export";
device = "/dev/sdb9";
path = "/mnt/cluster2";
- nfsclient {
+ nfsclient {
name = "Admin group";
target = "@admin";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
nfsclient {
name = "User group";
target = "@users";
path = "/mnt/cluster2";
- options = "rw,sync";
+ options = "rw,sync";
}
nfsclient {
name = "red";
target = "red";
path = "/mnt/cluster2";
- options = "rw";
+ options = "rw";
}
}
}
ip {
address = "192.168.1.4";
monitor_link = "yes";
- }
+ }
script {
name = "initscript";
file = "/etc/init.d/sshd";
+ service_name = "test2";
}
}
More information about the Cluster-devel
mailing list