From cc8b38ab564b86d13668a614d5c7fc83fd179ac9 Mon Sep 17 00:00:00 2001 From: Wesley Beary Date: Thu, 24 Sep 2009 19:18:20 -0700 Subject: [PATCH] cleanup in models --- lib/fog/aws/models/ec2/address.rb | 2 +- lib/fog/aws/models/ec2/volume.rb | 2 +- spec/aws/models/ec2/volume_spec.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/fog/aws/models/ec2/address.rb b/lib/fog/aws/models/ec2/address.rb index 5e857e1a7..58ad6c676 100644 --- a/lib/fog/aws/models/ec2/address.rb +++ b/lib/fog/aws/models/ec2/address.rb @@ -24,7 +24,7 @@ module Fog end def reload - new_attributes = addresses.all(@public_ip).first.attributes + new_attributes = addresses.get(@public_ip).attributes merge_attributes(new_attributes) end diff --git a/lib/fog/aws/models/ec2/volume.rb b/lib/fog/aws/models/ec2/volume.rb index 9b5171464..793a75892 100644 --- a/lib/fog/aws/models/ec2/volume.rb +++ b/lib/fog/aws/models/ec2/volume.rb @@ -27,7 +27,7 @@ module Fog end def reload - new_attributes = volumes.all(@volume_id).first.attributes + new_attributes = volumes.get(@volume_id).attributes merge_attributes(new_attributes) end diff --git a/spec/aws/models/ec2/volume_spec.rb b/spec/aws/models/ec2/volume_spec.rb index ef31e0b50..39afb5771 100644 --- a/spec/aws/models/ec2/volume_spec.rb +++ b/spec/aws/models/ec2/volume_spec.rb @@ -5,7 +5,7 @@ describe 'Fog::AWS::EC2::Volume' do describe "#initialize" do it "should remap attributes from parser" # do - # volume = Fog::AWS::EC2::Volume.new( + # volume = Fog::AWS::EC2::Address.new( # 'instanceId' => 'i-00000000', # 'publicIp' => '0.0.0.0' # )