These are two very simple patches. For whitespace, we should really get a hook on the git repo installed that will force us to stay clean.
David
From: David Lutterkort lutter@redhat.com
Remove trailing whitespace on lines and trailing blank lines --- .../lib/deltacloud/drivers/ec2/ec2_driver.rb | 3 +-- .../drivers/rackspace/rackspace_driver.rb | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/server/libexec/lib/deltacloud/drivers/ec2/ec2_driver.rb b/server/libexec/lib/deltacloud/drivers/ec2/ec2_driver.rb index cb839d2..93e798a 100644 --- a/server/libexec/lib/deltacloud/drivers/ec2/ec2_driver.rb +++ b/server/libexec/lib/deltacloud/drivers/ec2/ec2_driver.rb @@ -189,7 +189,7 @@ class EC2Driver < Deltacloud::BaseDriver unless ( flavor_id ) image = image(credentials, :id=>image_id ) flavor = flavor( credentials, :architecture=>image.architecture ) - ( flavor_id = flavor.id ) if ( flavor ) + ( flavor_id = flavor.id ) if ( flavor ) end flavor_id.gsub!( /-/, '.' ) if flavor_id ec2_instances = ec2.run_instances( @@ -355,4 +355,3 @@ end end end end - diff --git a/server/libexec/lib/deltacloud/drivers/rackspace/rackspace_driver.rb b/server/libexec/lib/deltacloud/drivers/rackspace/rackspace_driver.rb index 995b28b..3bb1714 100644 --- a/server/libexec/lib/deltacloud/drivers/rackspace/rackspace_driver.rb +++ b/server/libexec/lib/deltacloud/drivers/rackspace/rackspace_driver.rb @@ -32,7 +32,7 @@ class RackspaceDriver < Deltacloud::BaseDriver :memory=>flav["ram"].to_f/1024, :storage=>flav["disk"].to_i, :architecture=>'x86_64' - } ) + } ) end results = filter_on( results, :id, opts ) results = filter_on( results, :architecture, opts ) @@ -51,11 +51,11 @@ class RackspaceDriver < Deltacloud::BaseDriver } ) end results.sort_by{|e| [e.description]} - results = filter_on( results, :id, opts ) + results = filter_on( results, :id, opts ) results end
- #rackspace does not at this stage have realms... its all US/TX, all the time (at least at time of writing) + #rackspace does not at this stage have realms... its all US/TX, all the time (at least at time of writing) def realms(credentials, opts=nil) [Realm.new( { :id=>"us", @@ -81,15 +81,15 @@ class RackspaceDriver < Deltacloud::BaseDriver
# # create instance. Default to flavor 1 - really need a name though... - # In rackspace, all flavors work with all images. - # + # In rackspace, all flavors work with all images. + # def create_instance(credentials, image_id, opts) racks = new_client( credentials ) flavor_id = 1 if (opts[:flavor_id]) then flavor_id = opts[:flavor_id] end name = Time.now.to_s if (opts[:name]) then name = opts[:name] end - convert_srv_to_instance(racks.start_server(image_id, flavor_id, name)) + convert_srv_to_instance(racks.start_server(image_id, flavor_id, name)) end
# @@ -99,10 +99,10 @@ class RackspaceDriver < Deltacloud::BaseDriver racks = new_client(credentials) instances = [] if (opts.nil?) - instances = racks.list_servers.map do |srv| + instances = racks.list_servers.map do |srv| convert_srv_to_instance(srv) end - else + else instances << convert_srv_to_instance(racks.load_server_details(opts[:id])) end instances = filter_on( instances, :id, opts ) @@ -110,7 +110,7 @@ class RackspaceDriver < Deltacloud::BaseDriver end
- def convert_srv_to_instance(srv) + def convert_srv_to_instance(srv) Instance.new( { :id=>srv["id"], :state=>srv["status"] == "ACTIVE" ? "RUNNING" : "PENDING", @@ -133,7 +133,7 @@ class RackspaceDriver < Deltacloud::BaseDriver RackspaceClient.new(credentials[:name], credentials[:password]) end
- define_instance_states do + define_instance_states do start.to( :pending ) .on( :create )
pending.to( :running ) .automatically
On Wed, Jan 20, 2010 at 8:25 PM, lutter@redhat.com wrote:
From: David Lutterkort lutter@redhat.com
Remove trailing whitespace on lines and trailing blank lines
.../lib/deltacloud/drivers/ec2/ec2_driver.rb | 3 +-- .../drivers/rackspace/rackspace_driver.rb | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 12 deletions(-)
Since there is no code change, don't know that we even really need an ack for this, but ACK anyway.
From: David Lutterkort lutter@redhat.com
--- server/libexec/config/environment.rb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/server/libexec/config/environment.rb b/server/libexec/config/environment.rb index ae62985..d2e3f14 100644 --- a/server/libexec/config/environment.rb +++ b/server/libexec/config/environment.rb @@ -104,4 +104,6 @@ case DRIVER DRIVER_CLASS_NAME = "Deltacloud::Drivers::RHEVM::RHEVMDriver" when :rimu DRIVER_CLASS_NAME = "Deltacloud::Drivers::Rimu::RimuHostingDriver" + else + raise Exception.new( "Unknown driver #{DRIVER}" ) end
On Wed, Jan 20, 2010 at 8:25 PM, lutter@redhat.com wrote:
From: David Lutterkort lutter@redhat.com
server/libexec/config/environment.rb | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
ACK, throws error on invalid driver, as expected.
deltacloud-devel@lists.fedorahosted.org