svn commit: r1152029 - in /incubator/deltacloud/trunk: client/bin/deltacloudc client/lib/client_bucket_methods.rb client/lib/plain_formatter.rb server/lib/deltacloud/drivers/ec2/ec2_driver.rb

[ma...@apache.org]

Author: marios
Date: Thu Jul 28 22:46:55 2011
New Revision: 1152029

URL: http://svn.apache.org/viewvc?rev=1152029&view=rev
Log:
Fix to deltacloud ruby client so that it accepts the 'bucket_location' parameter
in the 'create_bucket' method.

Addresses bug https://bugzilla.redhat.com/show_bug.cgi?id=725646

client.create_bucket('id'=>"imagesbucket", 'bucket_location'=>"us-west-1")

Modified:
    incubator/deltacloud/trunk/client/bin/deltacloudc
    incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb
    incubator/deltacloud/trunk/client/lib/plain_formatter.rb
    incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb

Modified: incubator/deltacloud/trunk/client/bin/deltacloudc
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/bin/deltacloudc?rev=1152029&r1=1152028&r2=1152029&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/bin/deltacloudc (original)
+++ incubator/deltacloud/trunk/client/bin/deltacloudc Thu Jul 28 22:46:55 2011
@@ -61,6 +61,7 @@ BANNER
   opts.on( '-i', '--id ID', 'ID for operation') { |id| options[:id] = id }
   opts.on( '-d', '--image-id ID', 'Image ID') { |id| options[:image_id] = id }
   opts.on( '-b', '--bucket-id ID', 'Bucket ID') {|id| options[:bucket_id] = id }
+  opts.on( '-r', '--bucket-location NAME', 'Bucket location') {|name| options[:bucket_location] = name }
   opts.on( '-a', '--arch ARCH', 'Architecture (x86, x86_64)') { |id| options[:architecture] = id }
   opts.on( '-p', '--hardware-profile HARDWARE_PROFILE', 'Hardware Profile') { |id| options[:hwp_id] = id }
   opts.on( '-n', '--name NAME', 'Name (for instance eg.)') { |name| options[:name] = name }
@@ -217,7 +218,7 @@ if options[:collection] and options[:ope
   if options[:collection].eql?('buckets')
     if options[:operation].eql?('create')
         invalid_usage("Please specify an id for the new bucket with -i") unless options[:id]
-        bucket = client.create_bucket('id'=>options[:id])
+        bucket = client.create_bucket('id'=>options[:id], 'bucket_location'=>options[:bucket_location])
         puts format(bucket)
     elsif options[:operation].eql?('destroy')
         invalid_usage("Please specify the bucket you wish to destroy with -i") unless options[:id]

Modified: incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb?rev=1152029&r1=1152028&r2=1152029&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb (original)
+++ incubator/deltacloud/trunk/client/lib/client_bucket_methods.rb Thu Jul 28 22:46:55 2011
@@ -2,7 +2,7 @@ module ClientBucketMethods
 
   def create_bucket(params)
     obj = nil
-    request(:post, "#{api_uri.to_s}/buckets", {:name => params['id'] }) do |response|
+    request(:post, "#{api_uri.to_s}/buckets", {:name => params['id'],:location=>params['bucket_location'] }) do |response|
       handle_backend_error(response) if response.code!=201
       obj = base_object(:bucket, response)
     end

Modified: incubator/deltacloud/trunk/client/lib/plain_formatter.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/client/lib/plain_formatter.rb?rev=1152029&r1=1152028&r2=1152029&view=diff
==============================================================================
--- incubator/deltacloud/trunk/client/lib/plain_formatter.rb (original)
+++ incubator/deltacloud/trunk/client/lib/plain_formatter.rb Thu Jul 28 22:46:55 2011
@@ -100,7 +100,7 @@ module DeltaCloud
           @obj.id,
           @obj.name,
           @obj.size ? @obj.size : "0",
-          @obj.blob_list ? @obj.blob_list : ""
+          @obj.instance_variables.include?("@blob_list") ? @obj.blob_list : ""
           )
         end
       end

Modified: incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb?rev=1152029&r1=1152028&r2=1152029&view=diff
==============================================================================
--- incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb (original)
+++ incubator/deltacloud/trunk/server/lib/deltacloud/drivers/ec2/ec2_driver.rb Thu Jul 28 22:46:55 2011
@@ -351,7 +351,7 @@ module Deltacloud
           safely do
             s3_client = new_client(credentials, :s3)
             bucket_location = opts['location']
-            if bucket_location
+            if (bucket_location && bucket_location.size >0)
               bucket = Aws::S3::Bucket.create(s3_client, name, true, nil, :location => bucket_location)
             else
               bucket = Aws::S3::Bucket.create(s3_client, name, true)