Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: attach volume on #save, remove #server= #443

Merged
merged 2 commits into from
Apr 23, 2018
Merged

fix: attach volume on #save, remove #server= #443

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82e36a2
fix: attach volume on #save, remove #server=
lanej Apr 19, 2018
1c938fb
doc: provide useful error message when using Volume#server=
lanej Apr 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/fog/aws/models/compute/volume.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Volume < Fog::Model

def initialize(attributes = {})
# assign server first to prevent race condition with persisted?
self.server = attributes.delete(:server)
@server = attributes.delete(:server)
super
end

Expand Down Expand Up @@ -70,19 +70,17 @@ def save
service.create_tags(identity, tags)
end

attach(@service, device) if @server

true
attach(@server, device) if @server && device
end

true
end

def server
requires :server_id
service.servers.get(server_id)
end

attr_writer :server

def snapshots
requires :id
service.snapshots(:volume => self)
Expand Down
34 changes: 14 additions & 20 deletions tests/models/compute/volume_tests.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,34 @@
availability_zone: @server.availability_zone,
size: 1,
tags: { 'key' => 'value' },
type: 'gp2'
type: 'gp2',
server: @server,
device: '/dev/sdz1'
},
true
) do

@instance.wait_for { ready? }

tests('#attach(server, device)').succeeds do
@instance.attach(@server, '/dev/sdz1')
end

@instance.wait_for { state == 'in-use' }

tests('#server').succeeds do
@instance.server.id == @server.id
tests('attached').succeeds do
@instance.server == @server
end

tests('#detach').succeeds do
@instance.detach
@instance.wait_for { ready? }
@instance.server.nil?
end

@instance.wait_for { ready? }

@instance.attach(@server, '/dev/sdz1')
@instance.wait_for { state == 'in-use' }
tests('#attach(server, device)').succeeds do
@instance.attach(@server, '/dev/sdz1')
@instance.server == @server
end

tests('#force_detach').succeeds do
@instance.force_detach
@instance.wait_for { ready? }
@instance.server.nil?
end

@instance.wait_for { ready? }

@instance.type = 'io1'
@instance.iops = 5000
@instance.size = 100
Expand All @@ -56,10 +51,9 @@
returns(5000) { @instance.iops }
returns(100) { @instance.size }

tests('@instance.reload.tags').returns({'key' => 'value'}) do
@instance.reload.tags
tests('@instance.tags').returns({'key' => 'value'}) do
@instance.tags
end

end

@server.destroy
Expand Down