Merge pull request #692 from SaiSuriya30/haproxy4

4 files haproxy changes

Author: mergify[bot]

rgw/v2/tests/s3_swift/configs/test_Mbuckets_with_Nobjects_compression.yaml

@@ -1,6 +1,7 @@
 # upload type: non multipart
 # script: test_Mbuckets_with_Nobjects.py
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 100

rgw/v2/tests/s3_swift/configs/test_Mbuckets_with_Nobjects_compression_snappy.yaml

@@ -1,6 +1,7 @@
 # upload type: non multipart
 # script: test_Mbuckets_with_Nobjects.py
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 100

rgw/v2/tests/s3_swift/configs/test_Mbuckets_with_Nobjects_compression_zstd.yaml

@@ -1,6 +1,7 @@
 # upload type: non multipart
 # script: test_Mbuckets_with_Nobjects.py
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 100

rgw/v2/tests/s3_swift/configs/test_Mbuckets_with_Nobjects_download.yaml

@@ -1,6 +1,7 @@
 # upload type: non multipart
 # script: test_Mbuckets_with_Nobjects.py
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 100

rgw/v2/tests/s3_swift/configs/test_Mbuckets_with_Nobjects_etag.yaml

@@ -1,4 +1,5 @@
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 1

rgw/v2/tests/s3_swift/configs/test_bucket_listing_flat_ordered.yaml

@@ -1,4 +1,5 @@
 config:
+     haproxy: true
      user_count: 1
      bucket_count: 2
      objects_count: 100

rgw/v2/tests/s3_swift/configs/test_bucket_radoslist.yaml

@@ -1,4 +1,5 @@
 config:
+     haproxy: true
      user_count: 1
      bucket_count: 2
      objects_count: 100

rgw/v2/tests/s3_swift/configs/test_dynamic_resharding_with_version_without_bucket_delete.yaml

@@ -1,5 +1,6 @@
 # test case id: CEPH-83571740
 config:
+  haproxy: true
   objects_count: 100
   objects_size_range:
     min: 15

rgw/v2/tests/s3_swift/configs/test_dynamic_resharding_without_bucket_delete.yaml

@@ -1,4 +1,5 @@
 config:
+  haproxy: true
   objects_count: 100
   objects_size_range:
     min: 15

rgw/v2/tests/s3_swift/configs/test_lc_transition_multiple_rules.yaml

@@ -1,5 +1,6 @@
 #test_bucket_lifecycle_object_expiration_transition.py
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 1
   objects_count: 10

rgw/v2/tests/s3_swift/configs/test_manual_resharding_without_bucket_delete.yaml

@@ -1,4 +1,5 @@
 config:
+  haproxy: true
   objects_count: 100
   objects_size_range:
     min: 15

rgw/v2/tests/s3_swift/multisite_configs/test_dynamic_resharding_with_version_without_bucket_delete.yaml

@@ -0,0 +1,12 @@
+# test case id: CEPH-83571740
+config:
+  objects_count: 100
+  objects_size_range:
+    min: 15
+    max: 20
+  sharding_type: dynamic
+  max_objects_per_shard: 5
+  version_count: 4
+  test_ops:
+    enable_verison: true
+    delete_bucket_object: false

rgw/v2/tests/s3_swift/multisite_configs/test_dynamic_resharding_with_version_without_bucket_delete.yaml

@@ -0,0 +1,9 @@
+config:
+  objects_count: 100
+  objects_size_range:
+    min: 15
+    max: 20
+  sharding_type: dynamic
+  max_objects_per_shard: 5
+  test_ops:
+    delete_bucket_object: false

rgw/v2/tests/s3_swift/multisite_configs/test_dynamic_resharding_without_bucket_delete.yaml

@@ -0,0 +1,9 @@
+config:
+  objects_count: 100
+  objects_size_range:
+    min: 15
+    max: 20
+  sharding_type: manual
+  shards: 97
+  test_ops:
+    delete_bucket_object: false

rgw/v2/tests/s3_swift/multisite_configs/test_dynamic_resharding_without_bucket_delete.yaml

@@ -74,7 +74,7 @@ def test_exec(config, ssh_con):
 
     for each_user in all_users_info:
         # authenticate
-        auth = Auth(each_user, ssh_con, ssl=config.ssl)
+        auth = Auth(each_user, ssh_con, ssl=config.ssl, haproxy=config.haproxy)
         if config.use_aws4 is True:
             rgw_conn = auth.do_auth(**{"signature_version": "s3v4"})
         else:

rgw/v2/tests/s3_swift/multisite_configs/test_manual_resharding_without_bucket_delete.yaml

@@ -83,7 +83,7 @@ def test_exec(config, ssh_con):
     config.user_count = 1
     user_info = s3lib.create_users(config.user_count)
     user_info = user_info[0]
-    auth = Auth(user_info, ssh_con, ssl=config.ssl)
+    auth = Auth(user_info, ssh_con, ssl=config.ssl, haproxy=config.haproxy)
     rgw_conn = auth.do_auth()
     verification = True
     if config.test_with_bucket_index_shards:
@@ -310,7 +310,7 @@ def test_exec(config, ssh_con):
         log.info("Create new user and change bucket ownership")
         new_user = s3lib.create_users(1)
         new_user = new_user[0]
-        new_auth = Auth(new_user, ssh_con, ssl=config.ssl)
+        new_auth = Auth(new_user, ssh_con, ssl=config.ssl, haproxy=config.haproxy)
         new_conn = new_auth.do_auth()
         new_name = new_user["user_id"]
         out = reusable.unlink_bucket(user_info["user_id"], bucket_name)
@@ -545,7 +545,9 @@ def test_exec(config, ssh_con):
         log.info(f"Bucket list output from secondary: {bucket_list_sec}")
 
         # List objects from sec site using boto3 rgw client
-        other_site_auth = Auth(user_info, sec_site_ssh_con, ssl=config.ssl)
+        other_site_auth = Auth(
+            user_info, sec_site_ssh_con, ssl=config.ssl, haproxy=config.haproxy
+        )
         sec_site_rgw_conn = other_site_auth.do_auth_using_client()
         resp = sec_site_rgw_conn.list_objects(Bucket=bucket.name)
         log.info(f"List objects output using rgw client from sec site: {resp}")

rgw/v2/tests/s3_swift/multisite_configs/test_manual_resharding_without_bucket_delete.yaml

@@ -1,6 +1,7 @@
 # polarion_id: CEPH-83575477
 # script: test_s3cmd.py
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 100

rgw/v2/tests/s3_swift/test_bucket_listing.py

@@ -2,6 +2,7 @@
 # Bugs: 2188557
 # Polarian: CEPH-83575470
 config:
+  haproxy: true
   user_count: 1
   bucket_count: 2
   objects_count: 100

rgw/v2/tests/s3_swift/test_dynamic_bucket_resharding.py

@@ -0,0 +1,9 @@
+# script: test_rgw_ops_log.py
+# Bugs: 2188557
+# Polarian: CEPH-83575470
+config:
+  user_count: 1
+  bucket_count: 2
+  objects_count: 100
+  test_ops:
+    rgw_log_detail: true

rgw/v2/tests/s3cmd/configs/test_get_s3cmd.yaml

@@ -128,7 +128,7 @@ def test_exec(config, ssh_con):
         )
         user_info = resource_op.create_users(no_of_users_to_create=1)
         s3_auth.do_auth(user_info[0], ip_and_port)
-        auth = Auth(user_info[0], ssh_con, ssl=config.ssl)
+        auth = Auth(user_info[0], ssh_con, ssl=config.ssl, haproxy=config.haproxy)
         rgw_conn = auth.do_auth()
         bucket_name = utils.gen_bucket_name_from_userid(
             user_info[0]["user_id"], rand_no=1
@@ -179,7 +179,7 @@ def test_exec(config, ssh_con):
         )
         user_info = resource_op.create_users(no_of_users_to_create=1)
         s3_auth.do_auth(user_info[0], ip_and_port)
-        auth = Auth(user_info[0], ssh_con, ssl=config.ssl)
+        auth = Auth(user_info[0], ssh_con, ssl=config.ssl, haproxy=config.haproxy)
         rgw_conn = auth.do_auth()
         rgw_conn2 = auth.do_auth_using_client()
         bucket_name = utils.gen_bucket_name_from_userid(