From 2fa2c09b282325ac604089f0daa92d39eee47cb8 Mon Sep 17 00:00:00 2001 From: Shilpa Jagannath Date: Wed, 16 Aug 2017 15:16:35 +0530 Subject: [PATCH] Added changes to multisite task --- qa/tasks/multisite.py | 6 +++--- qa/tasks/util/{multisite-rados.py => multisite_rados.py} | 0 qa/tasks/util/{multisite-rgw.py => multisite_rgw.py} | 0 3 files changed, 3 insertions(+), 3 deletions(-) rename qa/tasks/util/{multisite-rados.py => multisite_rados.py} (100%) rename qa/tasks/util/{multisite-rgw.py => multisite_rgw.py} (100%) diff --git a/qa/tasks/multisite.py b/qa/tasks/multisite.py index ad6ac8e5a6c06..71034ce825bf4 100644 --- a/qa/tasks/multisite.py +++ b/qa/tasks/multisite.py @@ -4,7 +4,7 @@ import json import logging import os import errno -import util.rgw as rgw_utils +import util.multisite_rgw as rgw_utils from requests.packages.urllib3 import PoolManager from requests.packages.urllib3.util import Retry @@ -16,8 +16,8 @@ from teuthology import misc as teuthology from teuthology import contextutil from teuthology.orchestra.run import CommandFailedError # from util.rgw import rgwadmin -from util.multisite-rgw import rgwadmin, get_config_master_client, extract_zone_info, extract_region_info -from util.multisite-rados import (rados, create_ec_pool, +from util.multisite_rgw import rgwadmin, get_config_master_client, extract_zone_info, extract_region_info +from util.multisite_rados import (rados, create_ec_pool, create_replicated_pool, create_cache_pool) diff --git a/qa/tasks/util/multisite-rados.py b/qa/tasks/util/multisite_rados.py similarity index 100% rename from qa/tasks/util/multisite-rados.py rename to qa/tasks/util/multisite_rados.py diff --git a/qa/tasks/util/multisite-rgw.py b/qa/tasks/util/multisite_rgw.py similarity index 100% rename from qa/tasks/util/multisite-rgw.py rename to qa/tasks/util/multisite_rgw.py -- 2.39.5