Merge pull request #260 from NCAS-CMS/add_wacasoft_active_server

Add Wacasoft Reductionist server and use it for tests

Author: valeriupredoi

activestorage/active.py

@@ -636,7 +636,7 @@ def _process_chunk(self, session, ds, chunks, chunk_coords, chunk_selection,
                 # special case for "anon=True" buckets that work only with e.g.
                 # fs = s3fs.S3FileSystem(anon=True, client_kwargs={'endpoint_url': S3_URL})
                 # where file uri = bucketX/fileY.mc
-                print("S3 Storage options to Reductionist:", self.storage_options)
+                # print("S3 Storage options to Reductionist:", self.storage_options)
                 if self.storage_options.get("anon", None) == True:
                     bucket = os.path.dirname(parsed_url.path)  # bucketX
                     object = os.path.basename(parsed_url.path)  # fileY
@@ -670,7 +670,7 @@ def _process_chunk(self, session, ds, chunks, chunk_coords, chunk_selection,
 
             # Reductionist returns "count" as a list even for single elements
             tmp, count = reductionist.reduce_chunk(session,
-                                                   "https://192.171.169.113:8080",
+                                                   "https://reductionist.jasmin.ac.uk/",  # Wacasoft
                                                    self.filename,
                                                    bucket, self.filename, offset,
                                                    size, compressor, filters,

tests/test_real_s3.py

@@ -20,7 +20,8 @@ def test_s3_dataset():
         'secret': "$/'#M{0{/4rVhp%n^(XeX$q@y#&(NM3W1->~N.Q6VP.5[@bLpi='nt]AfH)>78pT",
         'client_kwargs': {'endpoint_url': "https://uor-aces-o.s3-ext.jc.rl.ac.uk"},
     }
-    active_storage_url = "https://192.171.169.113:8080"
+    # active_storage_url = "https://192.171.169.113:8080"  # Bryan VM
+    active_storage_url = "https://reductionist.jasmin.ac.uk/"  # Wacasoft
     # bigger_file = "ch330a.pc19790301-bnl.nc"  # 18GB 3400 HDF5 chunks
     bigger_file = "ch330a.pc19790301-def.nc"  # 17GB 64 HDF5 chunks
     # bigger_file = "da193a_25_day__198808-198808.nc"  # 3GB 30 HDF5 chunks