Improve method names

Signed-off-by: Ben <belimele@redhat.com>

ocs_ci/ocs/resources/mcg.py

@@ -385,7 +385,7 @@ def create_new_aws_connection(self, conn_name=None):
             logger.error(f'Could not create connection {conn_name}')
             assert False
 
-    def create_new_backingstore_bucket(self, backingstore_info):
+    def create_new_backingstore_aws_bucket(self, backingstore_info):
         """
         Creates an S3 target bucket for NooBaa to use as a backing store
 
@@ -469,7 +469,7 @@ def oc_create_bucketclass(self, name, backingstores, placement):
         tiers['placement'] = placement
         return create_resource(**bc_data)
 
-    def toggle_bucket_readwrite(self, bucketname, block=True):
+    def toggle_aws_bucket_readwrite(self, bucketname, block=True):
         """
         Toggles a bucket's IO using a bucket policy
 

tests/manage/mcg/conftest.py

@@ -174,7 +174,7 @@ def resource_cleanup():
             mcg_obj.send_rpc_query('pool_api', 'delete_pool', {'name': backingstore.name})
 
         for aws_bucket_name in aws_buckets:
-            mcg_obj.toggle_bucket_readwrite(aws_bucket_name, block=False)
+            mcg_obj.toggle_aws_bucket_readwrite(aws_bucket_name, block=False)
             for _ in range(10):
                 try:
                     mcg_obj.aws_s3_resource.Bucket(aws_bucket_name).objects.all().delete()
@@ -206,8 +206,8 @@ def multiregion_mirror_setup(mcg_obj, multiregion_resources, bucket_factory):
         'region': f'us-east-2'
     }
     # Create target buckets for them
-    mcg_obj.create_new_backingstore_bucket(backingstore1)
-    mcg_obj.create_new_backingstore_bucket(backingstore2)
+    mcg_obj.create_new_backingstore_aws_bucket(backingstore1)
+    mcg_obj.create_new_backingstore_aws_bucket(backingstore2)
     aws_buckets.extend((backingstore1['name'], backingstore2['name']))
     # Create a backing store secret
     backingstore_secret = mcg_obj.create_aws_backingstore_secret(backingstore1['name'] + 'secret')

tests/manage/mcg/test_multi_region.py

@@ -86,7 +86,7 @@ def test_multiregion_mirror(self, mcg_obj, awscli_pod, multiregion_mirror_setup)
         mcg_obj.check_if_mirroring_is_done(bucket_name)
 
         # Bring bucket A down
-        mcg_obj.toggle_bucket_readwrite(backingstore1['name'])
+        mcg_obj.toggle_aws_bucket_readwrite(backingstore1['name'])
         mcg_obj.check_backingstore_state('backing-store-' + backingstore1['name'], BS_AUTH_FAILED)
 
         # Verify integrity of B
@@ -105,9 +105,9 @@ def test_multiregion_mirror(self, mcg_obj, awscli_pod, multiregion_mirror_setup)
 
         # Bring B down, bring A up
         logger.info('Blocking bucket B')
-        mcg_obj.toggle_bucket_readwrite(backingstore2['name'])
+        mcg_obj.toggle_aws_bucket_readwrite(backingstore2['name'])
         logger.info('Freeing bucket A')
-        mcg_obj.toggle_bucket_readwrite(backingstore1['name'], block=False)
+        mcg_obj.toggle_aws_bucket_readwrite(backingstore1['name'], block=False)
         mcg_obj.check_backingstore_state('backing-store-' + backingstore1['name'], BS_OPTIMAL)
         mcg_obj.check_backingstore_state('backing-store-' + backingstore2['name'], BS_AUTH_FAILED)
 
@@ -122,5 +122,5 @@ def test_multiregion_mirror(self, mcg_obj, awscli_pod, multiregion_mirror_setup)
                 result_object_path=f'{local_temp_path}/{obj}', awscli_pod=awscli_pod
             ), 'Checksum comparision between original and result object failed'
         # Bring B up
-        mcg_obj.toggle_bucket_readwrite(backingstore2['name'], block=False)
+        mcg_obj.toggle_aws_bucket_readwrite(backingstore2['name'], block=False)
         mcg_obj.check_backingstore_state('backing-store-' + backingstore2['name'], BS_OPTIMAL)