diff --git a/shell/regression/testcases/BSC b/shell/regression/testcases/BSC index 32cc3694de..e3ce075c22 100644 --- a/shell/regression/testcases/BSC +++ b/shell/regression/testcases/BSC @@ -1,10 +1,11 @@ confbasic confbasic-xml +acl node resource file shadow ra edit commit delete diff --git a/shell/regression/testcases/Makefile.am b/shell/regression/testcases/Makefile.am index 7c17e4bdff..99be6d0bf1 100644 --- a/shell/regression/testcases/Makefile.am +++ b/shell/regression/testcases/Makefile.am @@ -1,32 +1,32 @@ # # Author: Sun Jiang Dong # Copyright (c) 2004 International Business Machines # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License # as published by the Free Software Foundation; either version 2 # of the License, or (at your option) any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. # MAINTAINERCLEANFILES = Makefile.in testcasesdir = $(datadir)/$(PACKAGE)/tests/shell/testcases testcases_SCRIPTS = confbasic-xml.filter ra.filter xmlonly.sh testcases_DATA = BSC basicset common.excl \ - confbasic confbasic-xml delete file node ra resource shadow \ + confbasic confbasic-xml delete file node ra resource shadow acl \ confbasic-xml.exp confbasic.exp delete.exp file.exp \ - node.exp ra.exp resource.exp shadow.exp + node.exp ra.exp resource.exp shadow.exp acl.exp confbasic-xml.filter: ln xmlonly.sh $@ # shouldn't need this next line... EXTRA_DIST = $(testcases_SCRIPTS) $(testcases_DATA) diff --git a/shell/regression/testcases/acl b/shell/regression/testcases/acl new file mode 100644 index 0000000000..83a288e879 --- /dev/null +++ b/shell/regression/testcases/acl @@ -0,0 +1,65 @@ +show ACL +node node1 +primitive st stonith:ssh \ + params hostlist='node1' \ + meta target-role="Started" \ + op start requires=nothing timeout=60s \ + op monitor interval=60m timeout=60s +primitive d0 ocf:pacemaker:Dummy +primitive d1 ocf:pacemaker:Dummy +role basic-read \ + read status \ + read node attribute:uname \ + read node attribute:type \ + read property +role basic-read-basic \ + read cib +role d0-admin \ + write meta:d0:target-role \ + write meta:d0:is-managed \ + write location:d0 \ + read ref:d0 +role silly-role \ + write meta:d0:target-role \ + write meta:d0:is-managed \ + write location:d0 \ + read ref:d0 \ + read status \ + read node attribute:uname \ + read node attribute:type \ + read utilization:d0 \ + write location:d0 \ + read property:stonith-enabled \ + write property \ + read node \ + read node:node1 \ + read nodeattr \ + read nodeattr:a1 \ + read nodeutil \ + read nodeutil:node1 \ + read status \ + read cib +role silly-role-2 \ + read xpath:"//nodes//attributes" \ + deny tag:nvpair \ + deny ref:d0 \ + deny tag:nvpair ref:d0 +user alice \ + role:basic-read-basic +user bob \ + role:d0-admin \ + role:basic-read-basic +user cyrus \ + write meta:d0:target-role \ + write meta:d0:is-managed \ + write location:d0 \ + read ref:d0 \ + read status \ + read node attribute:uname \ + read node attribute:type \ + read property + + +_test +verify +. diff --git a/shell/regression/testcases/acl.exp b/shell/regression/testcases/acl.exp new file mode 100644 index 0000000000..3a0871b2ce --- /dev/null +++ b/shell/regression/testcases/acl.exp @@ -0,0 +1,82 @@ +.TRY ACL +.INP: configure +.INP: _regtest on +.INP: erase +.INP: erase nodes +.INP: node node1 +.INP: primitive st stonith:ssh params hostlist='node1' meta target-role="Started" op start requires=nothing timeout=60s op monitor interval=60m timeout=60s +.INP: primitive d0 ocf:pacemaker:Dummy +.INP: primitive d1 ocf:pacemaker:Dummy +.INP: role basic-read read status read node attribute:uname read node attribute:type read property +.INP: role basic-read-basic read cib +.INP: role d0-admin write meta:d0:target-role write meta:d0:is-managed write location:d0 read ref:d0 +.INP: role silly-role write meta:d0:target-role write meta:d0:is-managed write location:d0 read ref:d0 read status read node attribute:uname read node attribute:type read utilization:d0 write location:d0 read property:stonith-enabled write property read node read node:node1 read nodeattr read nodeattr:a1 read nodeutil read nodeutil:node1 read status read cib +.INP: role silly-role-2 read xpath:"//nodes//attributes" deny tag:nvpair deny ref:d0 deny tag:nvpair ref:d0 +.INP: user alice role:basic-read-basic +.INP: user bob role:d0-admin role:basic-read-basic +.INP: user cyrus write meta:d0:target-role write meta:d0:is-managed write location:d0 read ref:d0 read status read node attribute:uname read node attribute:type read property +.INP: +.INP: +.INP: _test +.INP: verify +.INP: show +node node1 +primitive d0 ocf:pacemaker:Dummy +primitive d1 ocf:pacemaker:Dummy +primitive st stonith:ssh \ + params hostlist="node1" \ + meta target-role="Started" \ + op start interval="0" timeout="60s" requires="nothing" \ + op monitor interval="60m" timeout="60s" +role basic-read \ + read status \ + read node attribute:uname \ + read node attribute:type \ + read property +role basic-read-basic \ + read cib +role d0-admin \ + write meta:d0:target-role \ + write meta:d0:is-managed \ + write location:d0 \ + read ref:d0 +role silly-role \ + write meta:d0:target-role \ + write meta:d0:is-managed \ + write location:d0 \ + read ref:d0 \ + read status \ + read node attribute:uname \ + read node attribute:type \ + read utilization:d0 \ + write location:d0 \ + read property:stonith-enabled \ + write property \ + read node \ + read node:node1 \ + read nodeattr \ + read nodeattr:a1 \ + read nodeutil \ + read nodeutil:node1 \ + read status \ + read cib +role silly-role-2 \ + read xpath:"//nodes//attributes" \ + deny tag:nvpair \ + deny ref:d0 \ + deny tag:nvpair ref:d0 +user alice \ + role:basic-read-basic +user bob \ + role:d0-admin \ + role:basic-read-basic +user cyrus \ + write meta:d0:target-role \ + write meta:d0:is-managed \ + write location:d0 \ + read ref:d0 \ + read status \ + read node attribute:uname \ + read node attribute:type \ + read property +.INP: commit diff --git a/shell/regression/testcases/basicset b/shell/regression/testcases/basicset index 1d47f2f73a..5ec021702d 100644 --- a/shell/regression/testcases/basicset +++ b/shell/regression/testcases/basicset @@ -1,8 +1,9 @@ confbasic confbasic-xml delete node resource file shadow ra +acl