test/rgw: ssl support for test_rgw_reshard.py

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

diff --git a/qa/workunits/rgw/test_rgw_reshard.py b/qa/workunits/rgw/test_rgw_reshard.py
index 03b2d9c0e28a0969341708997dc0efa853235606..9a9bbfee853c1bc2205602590de6eedc46263891 100755 (executable)
--- a/qa/workunits/rgw/test_rgw_reshard.py
+++ b/qa/workunits/rgw/test_rgw_reshard.py
@@ -6,8 +6,6 @@ import time
 import subprocess
 import json
 import boto3
-from pprint import pprint
-import re
 
 """
 Rgw manual and dynamic resharding  testing against a running instance
@@ -153,22 +151,16 @@ def main():
     _, ret = exec_cmd('radosgw-admin user create --uid {} --display-name {} --access-key {} --secret {}'.format(USER, DISPLAY_NAME, ACCESS_KEY, SECRET_KEY), check_retcode=False)
     assert(ret == 0 or errno.EEXIST)
 
-    def boto_connect(portnum, ssl, proto):
-        endpoint = proto + '://localhost:' + portnum
-        conn = boto3.resource('s3',
-                              aws_access_key_id=ACCESS_KEY,
-                              aws_secret_access_key=SECRET_KEY,
-                              use_ssl=ssl,
-                              endpoint_url=endpoint,
-                              verify=False,
-                              config=None,
-                              )
-        return conn
-
     port = get_radosgw_port()
-
-    proto = ('https' if port == '443' else 'http')
-    connection = boto_connect(port, ssl=False, proto='http')
+    secure = (port == '443')
+    proto = ('https' if secure else 'http')
+    endpoint = proto + '://localhost:' + port
+    connection = boto3.resource('s3',
+                          aws_access_key_id=ACCESS_KEY,
+                          aws_secret_access_key=SECRET_KEY,
+                          use_ssl=secure,
+                          endpoint_url=endpoint,
+                          verify=False)
 
     # create a bucket
     bucket = connection.create_bucket(Bucket=BUCKET_NAME)