qa/rgw/multisite: move append_query_arg() to zone_es.py

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/test/rgw/rgw_multi/tools.py b/src/test/rgw/rgw_multi/tools.py
index dd7f91ade2919b7e3072f5d33e78eae44290779c..1c6fa0cfdf62a9b38b66dc819742481fc12c8471 100644 (file)
--- a/src/test/rgw/rgw_multi/tools.py
+++ b/src/test/rgw/rgw_multi/tools.py
@@ -19,14 +19,6 @@ def get_attrs(k, attrs):
 
     return d
 
-def append_query_arg(s, n, v):
-    if not v:
-        return s
-    nv = '{n}={v}'.format(n=n, v=v)
-    if not s:
-        return nv
-    return '{s}&{nv}'.format(s=s, nv=nv)
-
 class KeyJSONEncoder(boto.s3.key.Key):
     @staticmethod
     def default(k, versioned=False):

diff --git a/src/test/rgw/rgw_multi/zone_es.py b/src/test/rgw/rgw_multi/zone_es.py
index f619394e12cb807580aa8c7a3b09919d9e15dfb6..5c4ce24d3ea971251de01a0011b41f7e35d54bd7 100644 (file)
--- a/src/test/rgw/rgw_multi/zone_es.py
+++ b/src/test/rgw/rgw_multi/zone_es.py
@@ -11,7 +11,6 @@ from nose.tools import eq_ as eq
 from itertools import zip_longest  # type: ignore
 
 from .multisite import *
-from .tools import *
 
 log = logging.getLogger(__name__)
 
@@ -49,6 +48,13 @@ def make_request(conn, method, bucket, key, query_args, headers):
         raise boto.exception.S3ResponseError(result.status, result.reason, result.read())
     return result
 
+def append_query_arg(s, n, v):
+    if not v:
+        return s
+    nv = '{n}={v}'.format(n=n, v=v)
+    if not s:
+        return nv
+    return '{s}&{nv}'.format(s=s, nv=nv)
 
 class MDSearch:
     def __init__(self, conn, bucket_name, query, query_args = None, marker = None):