kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

fix up collections/reloads

Browse source
This commit is contained in:
Wesley Beary 2009-09-19 12:31:15 -07:00
parent a9797d45a5
commit 2c68ac75af
6 changed files with 40 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/fog/aws/models/ec2/address.rb
View file

@ -16,6 +16,11 @@ module Fog
true
end
def reload
new_attributes = addresses.all(@public_ip).first.attributes
merge_attributes(new_attributes)
end
def save
data = connection.allocate_address
@public_ip = data.body['publicIp']

19
lib/fog/aws/models/ec2/instance.rb
View file

@ -73,13 +73,9 @@ module Fog
end
end
def volumes
connection.volumes.all.select {|volume| volume.instance_id == @instance_id}
end
def volume=(new_volume)
new_volume.instance_id = @instance_id
connection.attach_volume(@instance_id, new_volume.volume_id, new_volume.device)
def reload
new_attributes = instances.all(@instance_id).first.attributes
merge_attributes(new_attributes)
end
def save
@ -113,6 +109,15 @@ module Fog
true
end
def volumes
connection.volumes.all.select {|volume| volume.instance_id == @instance_id}
end
def volume=(new_volume)
new_volume.instance_id = @instance_id
connection.attach_volume(@instance_id, new_volume.volume_id, new_volume.device)
end
private
def instance_state=(new_instance_state)

5
lib/fog/aws/models/ec2/key_pair.rb
View file

@ -17,6 +17,11 @@ module Fog
@key_pairs
end
def reload
new_attributes = key_pairs.all(@name).first.attributes
merge_attributes(new_attributes)
end
def save
data = connection.create_key_pair(@name).body
new_attributes = data.reject {|key,value| !['keyFingerprint', 'keyMaterial', 'keyName'].include?(key)}

11
lib/fog/aws/models/ec2/security_group.rb
View file

@ -14,17 +14,18 @@ module Fog
true
end
def reload
new_attributes = security_groups.all(@public_ip).first.attributes
merge_attributes(new_attributes)
end
def save
data = connection.create_create_security_group(@group_name, @group_description).body
true
end
def security_groups
@security_groups ||= begin
Fog::AWS::S3::SecurityGroups.new(
:connection => connection
)
end
@security_groups
end
private

12
lib/fog/aws/models/ec2/snapshot.rb
View file

@ -15,6 +15,11 @@ module Fog
true
end
def reload
new_attributes = snapshots.all(@snapshot_id).first.attributes
merge_attributes(new_attributes)
end
def save
data = connection.create_snapshot(@volume.volume_id).body
new_attributes = data.reject {|key,value| key == 'requestId'}
@ -23,12 +28,7 @@ module Fog
end
def snapshots
@snapshots ||= begin
Fog::AWS::S3::Snapshots.new(
:connection => connection,
:volume => self.volume
)
end
@snapshots
end
def volume

12
lib/fog/aws/models/ec2/volume.rb
View file

@ -26,6 +26,11 @@ module Fog
true
end
def reload
new_attributes = volumes.all(@volume_id).first.attributes
merge_attributes(new_attributes)
end
def save
data = connection.create_volume(@availability_zone, @size, @snapshot_id).body
new_attributes = data.reject {|key,value| key == 'requestId'}
@ -34,12 +39,7 @@ module Fog
end
def snapshots
@snapshots ||= begin
Fog::AWS::S3::Snapshots.new(
:connection => connection,
:volume => self
)
end
connection.snapshots.all.select {|snapshot| snapshot.volume_id == @volume_id}
end
def volumes