qa/rgw: workunits use real dns name instead of localhost

for vhost-style access, the client needs to use the configured dns name
instead of localhost. qa/tasks/rgw.py writes the fully-qualified http
endpoint url to a file under $TESTDIR, so try that first before falling
back to localhost endpoints

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

Author: cbodley

qa/workunits/rgw/common.py

@@ -31,14 +31,19 @@ def exec_cmd(cmd, wait = True, **kwargs):
 def create_user(uid, display_name, access_key, secret_key):
     _, ret = exec_cmd(f'radosgw-admin user create --uid {uid} --display-name "{display_name}" --access-key {access_key} --secret {secret_key}', check_retcode=False)
     assert(ret == 0 or errno.EEXIST)
-    
+
+def read_local_endpoint():
+    """
+    in teuthology, the rgw task writes the local rgw's endpoint url to this file
+    """
+    return exec_cmd('cat ${TESTDIR}/url_file')
+
 def boto_connect(access_key, secret_key, config=None):
-    def try_connect(portnum, ssl, proto):
-        endpoint = proto + '://localhost:' + portnum
+    def try_connect(endpoint):
         conn = boto3.resource('s3',
                               aws_access_key_id=access_key,
                               aws_secret_access_key=secret_key,
-                              use_ssl=ssl,
+                              use_ssl=endpoint.startswith('https'),
                               endpoint_url=endpoint,
                               verify=False,
                               config=config,
@@ -50,14 +55,22 @@ def try_connect(portnum, ssl, proto):
             raise
         print('connected to', endpoint)
         return conn
+
+    try:
+        endpoint = read_local_endpoint()
+        return try_connect(endpoint)
+    except:
+        # fall back to localhost
+        pass
+
     try:
-        return try_connect('80', False, 'http')
+        return try_connect('http://localhost:80')
     except botocore.exceptions.ConnectionError:
         try: # retry on non-privileged http port
-            return try_connect('8000', False, 'http')
+            return try_connect('http://localhost:8000')
         except botocore.exceptions.ConnectionError:
             # retry with ssl
-            return try_connect('443', True, 'https')
+            return try_connect('https://localhost:443')
 
 def put_objects(bucket, key_list):
     objs = []

qa/workunits/rgw/test_rgw_admin_pagination.py

@@ -12,6 +12,7 @@
 import subprocess
 import unittest
 from urllib.parse import urljoin
+from common import read_local_endpoint
 
 import typing as ty
 
@@ -127,20 +128,27 @@ def get_boto3_session(self, user: ty.Dict) -> boto3.session.Session:
 
     def get_boto3_client(self, session: boto3.session.Session):
         """Get a boto3 s3 client from a session."""
-        def _try_client(portnum: str, ssl: bool, proto: str):
-            endpoint = proto + '://localhost:' + portnum
+        def _try_client(endpoint):
+            ssl = endpoint.startswith('https')
             client = session.client(
                 's3', use_ssl=ssl, endpoint_url=endpoint, verify=False)
             list(client.list_buckets(MaxBuckets=1))
             return endpoint, client
 
         try:
-            return _try_client('80', False, 'http')
+            endpoint = read_local_endpoint()
+            return _try_client(endpoint)
+        except:
+            # fall back to localhost
+            pass
+
+        try:
+            return _try_client('http://localhost:80')
         except Exception:
             try:
-                return _try_client('8000', False, 'http')
+                return _try_client('http://localhost:8000')
             except Exception:
-                return _try_client('443', True, 'https')
+                return _try_client('https://localhost:443')
 
 
 class TestRGWAdminBucket(unittest.TestCase):