[sheepdog] [PATCH v2 1/4] tests/fucntional: add a function for invoking sheep with zone

[Hitoshi Mitake]

From: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>

Reported-by: Marcin Mirosław <marcin at mejor.pl>
Signed-off-by: Hitoshi Mitake <mitake.hitoshi at lab.ntt.co.jp>
---
 tests/functional/common.rc | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/tests/functional/common.rc b/tests/functional/common.rc
index 3785bae..f1ee432 100644
--- a/tests/functional/common.rc
+++ b/tests/functional/common.rc
@@ -282,7 +282,7 @@ _valgrind_dog()
     return $ret
 }
 
-_start_sheep()
+_do_start_sheep()
 {
     # ensure that sheep is not running
     local running=true
@@ -304,13 +304,23 @@ _start_sheep()
 	MD_STORE=",$STORE/$1/d0,$STORE/$1/d1,$STORE/$1/d2"
     fi
 
-    $SHEEP $STORE/$1$MD_STORE -z $1 -p $((7000+$1)) -c $DRIVER $SHEEP_OPTIONS $2
+    $SHEEP $STORE/$1$MD_STORE -z $2 -p $((7000+$1)) -c $DRIVER $SHEEP_OPTIONS $3
 
     if [ $? != 0 ]; then
         _die "cannot start sheep $1"
     fi
 }
 
+_start_sheep()
+{
+    _do_start_sheep $1 $1 $2
+}
+
+_start_sheep_with_zone()
+{
+    _do_start_sheep $1 $2 $3
+}
+
 _kill_all_dogs()
 {
     pkill -9 -f "$DOG_PROG (cluster|vdi|node|debug)"
-- 
1.8.1.2