rgw/multisite: add zonegroup parameter to test-rgw-mulitisite.sh

Signed-off-by: Shilpa Jagannath <smanjara@redhat.com>

diff --git a/src/test/rgw/test-rgw-common.sh b/src/test/rgw/test-rgw-common.sh
index 9129092898e6406df3c4d965446357cea0c4b052..6798a15ba31f62126205bde58a41a5c37eeb4584 100644 (file)
--- a/src/test/rgw/test-rgw-common.sh
+++ b/src/test/rgw/test-rgw-common.sh
@@ -103,7 +103,7 @@ function init_first_zone {
 
 # create zonegroup, zone
   x $(rgw_admin $cid) zonegroup create --rgw-zonegroup=$zg --master --default
-  x $(rgw_admin $cid) zone create --rgw-zonegroup=$zg --rgw-zone=$zone --access-key=${access_key} --secret=${secret} --endpoints=$endpoints --default
+  x $(rgw_admin $cid) zone create --rgw-zonegroup=$zg --rgw-zone=$zone --access-key=${access_key} --secret=${secret} --endpoints=$endpoints --master --default
   x $(rgw_admin $cid) user create --uid=zone.user --display-name=ZoneUser --access-key=${access_key} --secret=${secret} --system
 
   x $(rgw_admin $cid) period update --commit
@@ -128,7 +128,7 @@ function init_zone_in_existing_zg {
   x $(rgw_admin $cid) period update --commit
 }
 
-function init_first_zone_in_slave_zg {
+function init_first_zone_in_peer_zg {
   [ $# -ne 8 ] && echo "init_first_zone_in_slave_zg() needs 8 params" && exit 1
 
   cid=$1

diff --git a/src/test/rgw/test-rgw-multisite.sh b/src/test/rgw/test-rgw-multisite.sh
index a005b19e3daca58994c96dfb94ed85e17264465c..d3a1b265ca61135163e0c89d935aafa3d0b1c173 100755 (executable)
--- a/src/test/rgw/test-rgw-multisite.sh
+++ b/src/test/rgw/test-rgw-multisite.sh
@@ -1,11 +1,12 @@
 #!/usr/bin/env bash
 
-[ $# -lt 1 ] && echo "usage: $0 <num-clusters> [rgw parameters...]" && exit 1
+[ $# -lt 1 ] && echo "usage: $0 <num-zones> <num-zonegroups>[rgw parameters...]" && exit 1
 
-num_clusters=$1
+num_zones=$1
+num_zonegroups=$2
 shift
 
-[ $num_clusters -lt 1 ] && echo "clusters num must be at least 1" && exit 1
+[ $num_zones -lt 1 ] && echo "clusters num must be at least 1" && exit 1
 
 . "`dirname $0`/test-rgw-common.sh"
 . "`dirname $0`/test-rgw-meta-sync.sh"
@@ -53,7 +54,7 @@ echo realm_status=$output
 
 endpoints=""
 i=2
-while [ $i -le $num_clusters ]; do
+while [ $i -le $num_zones ]; do
   x $(start_ceph_cluster c$i) -n $(get_mstart_parameters $i)
   j=1
   endpoints=""
@@ -74,10 +75,53 @@ while [ $i -le $num_clusters ]; do
   i=$((i+1))
 done
 
-i=2
-while [ $i -le $num_clusters ]; do
-  wait_for_meta_sync c1 c$i $realm_name
+endpoints=""
+k=2
+while [ $k -le $num_zonegroups ]; do
+  x $(start_ceph_cluster c$i) -n $(get_mstart_parameters $i)
+  j=1
+  endpoints=""
+  while [ $j -le $rgws ]; do
+    port=$((8000+i*100+j))
+    endpoints="$endpoints""$url:$port,"
+    j=$((j+1))
+  done
 
+  # create new zone, start rgw
+  init_first_zone_in_peer_zg c$i $realm_name zg${k} zg${k}-${i} 8101 $endpoints  $system_access_key $system_secret
+  j=1
+  while [ $j -le $rgws ]; do
+    port=$((8000+i*100+j))
+    x $(rgw c$i "$port" "$@")
+    j="$((j+1))"
+  done
+# bring up next clusters in zonegroup k
   i=$((i+1))
+
+  endpoints=""
+  l=2
+  while [ $l -le $num_zones ]; do
+    x $(start_ceph_cluster c$i) -n $(get_mstart_parameters $i)
+    j=1
+    endpoints=""
+    while [ $j -le $rgws ]; do
+      port=$((8000+i*100+j))
+      endpoints="$endpoints""$url:$port,"
+      j=$((j+1))
+    done
+
+    # create new zone, start rgw
+    init_zone_in_existing_zg c$i $realm_name zg${k} zg${k}-${i} 8101 $endpoints $zone_port $system_access_key $system_secret
+    j=1
+    while [ $j -le $rgws ]; do
+      port=$((8000+i*100+j))
+      x $(rgw c$i "$port" "$@")
+      j="$((j+1))"
+    done
+    l=$((l+1))
+    i=$((i+1))
+  done
+
+  k=$((k+1))
 done