qa/tasks/rgw_multisite.py: adjust zone init

zone is now a ZoneConn object. Also, change import to make it relative
so that qa task can locate it.

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>

diff --git a/qa/tasks/rgw_multisite.py b/qa/tasks/rgw_multisite.py
index 0cab6249325d2ce7bb6e0cee27bea34a66c2221c..cd120c4414060417973e434d4483033e0263d32a 100644 (file)
--- a/qa/tasks/rgw_multisite.py
+++ b/qa/tasks/rgw_multisite.py
@@ -10,6 +10,7 @@ from copy import deepcopy
 from util.rgw import rgwadmin, wait_for_radosgw
 from util.rados import create_ec_pool, create_replicated_pool
 from rgw_multi import multisite
+from rgw_multi.zone_rados import RadosZone as RadosZone
 
 from teuthology.orchestra import run
 from teuthology import misc
@@ -366,6 +367,7 @@ def create_zonegroup(cluster, gateways, period, config):
 def create_zone(ctx, cluster, gateways, creds, zonegroup, config):
     """ create a zone with the given configuration """
     zone = multisite.Zone(config['name'], zonegroup, cluster)
+    zone = RadosZone(config['name'], zonegroup, cluster)
 
     # collect Gateways for the zone's endpoints
     endpoints = config.get('endpoints')
@@ -389,6 +391,14 @@ def create_zone(ctx, cluster, gateways, creds, zonegroup, config):
     create_zone_pools(ctx, zone)
     if ctx.rgw.compression_type:
         configure_zone_compression(zone, ctx.rgw.compression_type)
+
+    zonegroup.zones_by_type.setdefault(zone.tier_type(), []).append(zone)
+
+    if zone.is_read_only():
+        zonegroup.ro_zones.append(zone)
+    else:
+        zonegroup.rw_zones.append(zone)
+
     return zone
 
 def create_zone_pools(ctx, zone):

diff --git a/src/test/rgw/rgw_multi/zone_es.py b/src/test/rgw/rgw_multi/zone_es.py
index d57ca742c6e0a3cc34df10b3db736c5f9e0b6d1d..dccab4093d152835e8aecc0708a58dba280ec7d6 100644 (file)
--- a/src/test/rgw/rgw_multi/zone_es.py
+++ b/src/test/rgw/rgw_multi/zone_es.py
@@ -13,8 +13,8 @@ try:
 except ImportError:
     from itertools import zip_longest
 
-from rgw_multi.multisite import *
-from rgw_multi.tools import *
+from .multisite import *
+from .tools import *
 
 log = logging.getLogger(__name__)
 

diff --git a/src/test/rgw/rgw_multi/zone_rados.py b/src/test/rgw/rgw_multi/zone_rados.py
index 4613a6d3d1225ecfdb0026af3e7896e7c03a0c84..8fae22ea8a997b24e47567991b887202696e89ae 100644 (file)
--- a/src/test/rgw/rgw_multi/zone_rados.py
+++ b/src/test/rgw/rgw_multi/zone_rados.py
@@ -7,7 +7,7 @@ except ImportError:
 
 from nose.tools import eq_ as eq
 
-from rgw_multi.multisite import *
+from .multisite import *
 
 log = logging.getLogger(__name__)