Re: [PATCH] Adds get and set (user-defined) blob metadata for azure and cloudfiles drivers

[Michal Fojtik]

On 02/02/11 22:05 +0200, mar...@redhat.com wrote:

ACK. Code looks good, just small inline comment about returning some
content / status code from HEAD and POST blocks.

  -- Michal

From: marios <mar...@redhat.com>

---
.../lib/deltacloud/drivers/azure/azure_driver.rb   |   28 +++++++++++++++++++
.../drivers/rackspace/rackspace_driver.rb          |   29 +++++++++++++++++--
server/lib/deltacloud/helpers/blob_stream.rb       |    7 ++---
server/server.rb                                   |   27 ++++++++++++++++++
4 files changed, 84 insertions(+), 7 deletions(-)

diff --git a/server/lib/deltacloud/drivers/azure/azure_driver.rb 
b/server/lib/deltacloud/drivers/azure/azure_driver.rb
index f17e11e..704fbc5 100644
--- a/server/lib/deltacloud/drivers/azure/azure_driver.rb
+++ b/server/lib/deltacloud/drivers/azure/azure_driver.rb
@@ -128,6 +128,34 @@ class AzureDriver < Deltacloud::BaseDriver
    the_blob.destroy!
  end

+#-
+# Blob Metadada
+#-
+  def blob_metadata(credentials, opts = {})
+    azure_connect(credentials)
+    all_meta = {}
+    safely do
+      all_meta = WAZ::Blobs::Container.find(opts['bucket'])[opts[:id]].metadata
+    end
+    user_meta = {}
+    all_meta.inject({}){|result_hash, (k,v)| user_meta[k]=v if 
k.to_s.match(/x_ms_meta/i)}
+    user_meta.gsub_keys('x_ms_meta_','')
+  end
+
+#-
+# Update Blob Metadata
+#-
+  def update_blob_metadata(credentials, opts={})
+    azure_connect(credentials)
+    meta_hash = opts['meta_hash']
+    meta_hash.gsub_keys("HTTP_X_Deltacloud_Blobmeta_", "x-ms-meta-")
+    safely do
+      the_blob = WAZ::Blobs::Container.find(opts['bucket'])[opts[:id]]
+      the_blob.put_metadata!(meta_hash)
+    end
+  end
+
+
  private

  def azure_connect(credentials)
diff --git a/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb 
b/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
index eba8f8f..c09e36a 100644
--- a/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
+++ b/server/lib/deltacloud/drivers/rackspace/rackspace_driver.rb
@@ -147,9 +147,6 @@ class RackspaceDriver < Deltacloud::BaseDriver
    true
  end

-
-
-
  define_instance_states do
    start.to( :pending )          .on( :create )

@@ -262,6 +259,32 @@ class RackspaceDriver < Deltacloud::BaseDriver
    cf.container(bucket_id).delete_object(blob_id)
  end

+#-
+# Blob Metadada
+#-
+  def blob_metadata(credentials, opts = {})
+    cf = cloudfiles_client(credentials)
+    meta = {}
+    safely do
+      meta = cf.container(opts['bucket']).object(opts[:id]).metadata
+    end
+    meta
+  end
+
+#-
+# Update Blob Metahash
+#-
+  def update_blob_metadata(credentials, opts={})
+    cf = cloudfiles_client(credentials)
+    meta_hash = opts['meta_hash']
+    #the set_metadata method actually places the 'X-Object-Meta-' prefix for 
us:
+    meta_hash.gsub_keys('HTTP_X_Deltacloud_Blobmeta_', '')
+    safely do
+      blob = cf.container(opts['bucket']).object(opts[:id])
+      blob.set_metadata(meta_hash)
+    end #safely
+  end
+
private

  def convert_srv_to_instance(srv)
diff --git a/server/lib/deltacloud/helpers/blob_stream.rb 
b/server/lib/deltacloud/helpers/blob_stream.rb
index 985bbc6..a0dfd42 100644
--- a/server/lib/deltacloud/helpers/blob_stream.rb
+++ b/server/lib/deltacloud/helpers/blob_stream.rb
@@ -66,12 +66,11 @@ end
class Hash

  def gsub_keys(pattern, replacement)
-    pattern.upcase!
-    replacement.upcase!
+    rgx_pattern = Regexp.compile(pattern, true)
    remove = []
    self.each_key do |key|
-      if key.to_s.match(pattern)
-         new_key = key.to_s.gsub(pattern, replacement)
+      if key.to_s.match(rgx_pattern)
+         new_key = key.to_s.gsub(rgx_pattern, replacement)
         self[new_key] = self[key]
         remove << key
      end #key.match
diff --git a/server/server.rb b/server/server.rb
index a801bea..3f092e4 100644
--- a/server/server.rb
+++ b/server/server.rb
@@ -655,6 +655,33 @@ delete '/api/buckets/:bucket/:blob' do
  redirect(bucket_url(bucket_id))
end

+#get blob metadata
+head '/api/buckets/:bucket/:blob' do
+  @blob_id = params[:blob]
+  @blob_metadata = driver.blob_metadata(credentials, {:id => params[:blob], 
'bucket' => params[:bucket]})
+  if @blob_metadata
+      @blob_metadata.each do |k,v|
+        headers["X-Deltacloud-Blobmeta-#{k}"] = v
+      end
+   else
+    report_error(404, 'not_found')
+  end

Please return something here, otherwise the 'each' return value will be
sent ;-) I'm used to return '[200, '']' on HEAD calls.

+end
+
+#update blob metadata
+post '/api/buckets/:bucket/:blob' do
+  meta_hash = {}
+  request.env.inject({}){|current, (k,v)| meta_hash[k] = v if 
k.match(/^HTTP[-_]X[-_]Deltacloud[-_]Blobmeta[-_]/i)}
+  success = driver.update_blob_metadata(credentials, {'bucket'=>params[:bucket], :id 
=>params[:blob], 'meta_hash' => meta_hash})
+  if(success)
+    meta_hash.each do |k,v|
+      headers["X-Deltacloud-Blobmeta-#{k}"] = v
+    end
+  else
+    report_error(404, 'not_found') #FIXME is this the right error code?
+  end
+end

Same stuff as above.

+
#Get a particular blob's particulars (not actual blob data)
get '/api/buckets/:bucket/:blob' do
  @blob = driver.blob(credentials, { :id => params[:blob], 'bucket' => 
params[:bucket]})
--
1.7.3.4

--
--------------------------------------------------------
Michal Fojtik, mfoj...@redhat.com
Deltacloud API: http://deltacloud.org
--------------------------------------------------------