From 0b6909c1e9832d7a6f375f38f32bed58d1e161c2 Mon Sep 17 00:00:00 2001 From: Yuval Lifshitz Date: Mon, 10 Jun 2019 09:41:19 +0300 Subject: [PATCH] rgw/pubsub: make new PSZone parameters optional in test Signed-off-by: Yuval Lifshitz --- src/test/rgw/rgw_multi/zone_ps.py | 2 +- src/test/rgw/test_multi.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/rgw/rgw_multi/zone_ps.py b/src/test/rgw/rgw_multi/zone_ps.py index b0441f179446f..1fe4cbf1972f8 100644 --- a/src/test/rgw/rgw_multi/zone_ps.py +++ b/src/test/rgw/rgw_multi/zone_ps.py @@ -15,7 +15,7 @@ log = logging.getLogger('rgw_multi.tests') class PSZone(Zone): # pylint: disable=too-many-ancestors """ PubSub zone class """ - def __init__(self, name, full_sync, retention_days, zonegroup = None, cluster = None, data = None, zone_id = None, gateways = None): + def __init__(self, name, zonegroup=None, cluster=None, data=None, zone_id=None, gateways=None, full_sync='false', retention_days ='7'): self.full_sync = full_sync self.retention_days = retention_days super(PSZone, self).__init__(name, zonegroup, cluster, data, zone_id, gateways) diff --git a/src/test/rgw/test_multi.py b/src/test/rgw/test_multi.py index f80eea867f3f0..b65e320b073fe 100644 --- a/src/test/rgw/test_multi.py +++ b/src/test/rgw/test_multi.py @@ -312,10 +312,11 @@ def init(parse_args): elif ps_zone: zone_index = z - args.num_zones - num_es_zones - num_cloud_zones if num_ps_zones_from_conf == 0: - zone = PSZone(zone_name(zg, z), "false", "7", zonegroup, cluster) + zone = PSZone(zone_name(zg, z), zonegroup, cluster) else: pscfg = ps_cfg[zone_index] - zone = PSZone(zone_name(zg, z), pscfg.full_sync, pscfg.retention_days, zonegroup, cluster) + zone = PSZone(zone_name(zg, z), zonegroup, cluster, + full_sync=pscfg.full_sync, retention_days=pscfg.retention_days) else: zone = RadosZone(zone_name(zg, z), zonegroup, cluster) -- 2.39.5