import ceph quincy 17.2.6

[ceph.git] / ceph / src / test / rgw / test_multi.py

diff --git a/ceph/src/test/rgw/test_multi.py b/ceph/src/test/rgw/test_multi.py
index e32d00f0da31740cbeb584388c791ed4f803b5eb..57d27343efc335219d54533a83e5314e88b69d12 100644 (file)
--- a/ceph/src/test/rgw/test_multi.py
+++ b/ceph/src/test/rgw/test_multi.py
@@ -18,15 +18,12 @@ from rgw_multi.zone_es import ESZone as ESZone
 from rgw_multi.zone_es import ESZoneConfig as ESZoneConfig
 from rgw_multi.zone_cloud import CloudZone as CloudZone
 from rgw_multi.zone_cloud import CloudZoneConfig as CloudZoneConfig
-from rgw_multi.zone_ps import PSZone as PSZone
-from rgw_multi.zone_ps import PSZoneConfig as PSZoneConfig
 from rgw_multi.zone_az import AZone as AZone
 from rgw_multi.zone_az import AZoneConfig as AZoneConfig
 
 # make tests from rgw_multi.tests available to nose
 from rgw_multi.tests import *
 from rgw_multi.tests_es import *
-from rgw_multi.tests_ps import *
 from rgw_multi.tests_az import *
 
 mstart_path = os.getenv('MSTART_PATH')
@@ -172,7 +169,6 @@ def init(parse_args):
     cfg = configparser.RawConfigParser({
                                          'num_zonegroups': 1,
                                          'num_zones': 3,
-                                         'num_ps_zones': 0,
                                          'num_az_zones': 0,
                                          'gateways_per_zone': 2,
                                          'no_bootstrap': 'false',
@@ -213,13 +209,11 @@ def init(parse_args):
     parser.add_argument('--checkpoint-retries', type=int, default=cfg.getint(section, 'checkpoint_retries'))
     parser.add_argument('--checkpoint-delay', type=int, default=cfg.getint(section, 'checkpoint_delay'))
     parser.add_argument('--reconfigure-delay', type=int, default=cfg.getint(section, 'reconfigure_delay'))
-    parser.add_argument('--num-ps-zones', type=int, default=cfg.getint(section, 'num_ps_zones'))
     parser.add_argument('--use-ssl', type=bool, default=cfg.getboolean(section, 'use_ssl'))
 
 
     es_cfg = []
     cloud_cfg = []
-    ps_cfg = []
     az_cfg = []
 
     for s in cfg.sections():
@@ -227,8 +221,6 @@ def init(parse_args):
             es_cfg.append(ESZoneConfig(cfg, s))
         elif s.startswith('cloud'):
             cloud_cfg.append(CloudZoneConfig(cfg, s))
-        elif s.startswith('pubsub'):
-            ps_cfg.append(PSZoneConfig(cfg, s))
         elif s.startswith('archive'):
             az_cfg.append(AZoneConfig(cfg, s))
 
@@ -267,12 +259,9 @@ def init(parse_args):
 
     num_es_zones = len(es_cfg)
     num_cloud_zones = len(cloud_cfg)
-    num_ps_zones_from_conf = len(ps_cfg)
     num_az_zones = cfg.getint(section, 'num_az_zones')
 
-    num_ps_zones = args.num_ps_zones if num_ps_zones_from_conf == 0 else num_ps_zones_from_conf 
-
-    num_zones = args.num_zones + num_es_zones + num_cloud_zones + num_ps_zones + num_az_zones
+    num_zones = args.num_zones + num_es_zones + num_cloud_zones + num_az_zones
 
     use_ssl = cfg.getboolean(section, 'use_ssl')
 
@@ -333,8 +322,7 @@ def init(parse_args):
 
             es_zone = (z >= args.num_zones and z < args.num_zones + num_es_zones)
             cloud_zone = (z >= args.num_zones + num_es_zones and z < args.num_zones + num_es_zones + num_cloud_zones)
-            ps_zone = (z >= args.num_zones + num_es_zones + num_cloud_zones and z < args.num_zones + num_es_zones + num_cloud_zones + num_ps_zones)
-            az_zone = (z >= args.num_zones + num_es_zones + num_cloud_zones + num_ps_zones)
+            az_zone = (z >= args.num_zones + num_es_zones + num_cloud_zones)
 
             # create the zone in its zonegroup
             zone = multisite.Zone(zone_name(zg, z), zonegroup, cluster)
@@ -346,16 +334,8 @@ def init(parse_args):
                 ccfg = cloud_cfg[zone_index]
                 zone = CloudZone(zone_name(zg, z), ccfg.endpoint, ccfg.credentials, ccfg.source_bucket,
                                  ccfg.target_path, zonegroup, cluster)
-            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), zonegroup, cluster)
-                else:
-                    pscfg = ps_cfg[zone_index]
-                    zone = PSZone(zone_name(zg, z), zonegroup, cluster,
-                                  full_sync=pscfg.full_sync, retention_days=pscfg.retention_days)
             elif az_zone:
-                zone_index = z - args.num_zones - num_es_zones - num_cloud_zones - num_ps_zones
+                zone_index = z - args.num_zones - num_es_zones - num_cloud_zones
                 zone = AZone(zone_name(zg, z), zonegroup, cluster)
             else:
                 zone = RadosZone(zone_name(zg, z), zonegroup, cluster)
@@ -402,7 +382,7 @@ def init(parse_args):
                     arg += admin_creds.credential_args()
                     admin_user.create(zone, arg)
                     # create test user
-                    arg = ['--display-name', '"Test User"']
+                    arg = ['--display-name', '"Test User"', '--caps', 'roles=*']
                     arg += user_creds.credential_args()
                     user.create(zone, arg)
                 else: