Merge branch 'azure-blob-objectstore' into dev

Author: dannon

config/object_store_conf.xml.sample

@@ -32,16 +32,26 @@
         -->
 
         <!--  Sample Swift Object Store
-         <object_store type="swift">
-             <auth access_key="...." secret_key="....." />
-             <bucket name="unique_bucket_name" use_reduced_redundancy="False" max_chunk_size="250"/>
-             <connection host="" port="" is_secure="" conn_path="" multipart="True"/>
-             <cache path="database/object_store_cache" size="1000" />
-             <extra_dir type="job_work" path="database/job_working_directory_swift"/>
-             <extra_dir type="temp" path="database/tmp_swift"/>
-         </object_store>
-         -->
+        <object_store type="swift">
+            <auth access_key="...." secret_key="....." />
+            <bucket name="unique_bucket_name" use_reduced_redundancy="False" max_chunk_size="250"/>
+            <connection host="" port="" is_secure="" conn_path="" multipart="True"/>
+            <cache path="database/object_store_cache" size="1000" />
+            <extra_dir type="job_work" path="database/job_working_directory_swift"/>
+            <extra_dir type="temp" path="database/tmp_swift"/>
+        </object_store>
+        -->
+
+        <!-- Sample Azure Object Store
+        <object_store type="azure_blob">
+            <auth account_name="..." account_key="...." />
+            <container name="unique_container_name" max_chunk_size="250"/>
+            <cache path="database/object_store_cache" size="100" />
+            <extra_dir type="job_work" path="database/job_working_directory_azure"/>
+            <extra_dir type="temp" path="database/tmp_azure"/>
+        </object_store>
+        -->
+
 
     </backends>
 </object_store>
-

doc/source/lib/galaxy.objectstore.rst

@@ -41,4 +41,12 @@ galaxy.objectstore.s3_multipart_upload module
     :undoc-members:
     :show-inheritance:
 
+galaxy.objectstore.azure_blob module
+---------------------------------------------
+
+.. automodule:: galaxy.objectstore.azure_blob
+    :members:
+    :undoc-members:
+    :show-inheritance:
+
 

lib/galaxy/dependencies/__init__.py

@@ -16,6 +16,7 @@ def __init__( self, config_file ):
         self.config = None
         self.job_runners = []
         self.authenticators = []
+        self.object_stores = []
         self.conditional_reqs = []
         self.parse_configs()
         self.get_conditional_requirements()
@@ -31,6 +32,15 @@ def parse_configs( self ):
                     self.job_runners.append( plugin.attrib['load'] )
         except (OSError, IOError):
             pass
+        object_store_conf_xml = self.config.get(
+            "object_store_config_file",
+            join( dirname( self.config_file ), 'object_store_conf.xml' ) )
+        try:
+            for store in ElementTree.parse( object_store_conf_xml ).iter( 'object_store' ):
+                if 'type' in store.attrib:
+                    self.object_stores.append( store.attrib['type'] )
+        except (OSError, IOError):
+            pass
 
         # Parse auth conf
         auth_conf_xml = self.config.get(
@@ -93,6 +103,9 @@ def check_python_ldap( self ):
         return ('ldap' in self.authenticators or
                 'activedirectory' in self.authenticators)
 
+    def check_azure_storage( self ):
+        return 'azure_blob' in self.object_stores
+
 
 def optional( config_file ):
     rval = []

lib/galaxy/dependencies/conditional-requirements.txt

@@ -9,5 +9,6 @@ raven
 pbs_python
 drmaa
 statsd
+azure-storage==0.32.0
 # PyRods not in PyPI
 python-ldap==2.4.25

lib/galaxy/objectstore/__init__.py

@@ -721,6 +721,9 @@ def build_object_store_from_config(config, fsmon=False, config_xml=None):
     elif store == 'irods':
         from .rods import IRODSObjectStore
         return IRODSObjectStore(config=config, config_xml=config_xml)
+    elif store == 'azure_blob':
+        from .azure_blob import AzureBlobObjectStore
+        return AzureBlobObjectStore(config=config, config_xml=config_xml)
     # Disable the Pulsar object store for now until it receives some attention
     # elif store == 'pulsar':
     #    from .pulsar import PulsarObjectStore