From: Yehuda Sadeh <yehuda@redhat.com>
Date: Thu, 1 Jun 2017 18:28:22 +0000 (-0700)
Subject: qa/tasks/rgw_multisite.py: adjust zone init
X-Git-Tag: ses5-milestone6~9^2~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F14351%2Fhead;p=ceph.git

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 0cab6249325d..cd120c441406 100644
--- 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 d57ca742c6e0..dccab4093d15 100644
--- 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 4613a6d3d122..8fae22ea8a99 100644
--- 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__)