From 0d8e35227c627531fa7240ebf522c99bf9bca6f9 Mon Sep 17 00:00:00 2001 From: Shay Bergmann Date: Tue, 30 Jul 2013 18:22:41 +0300 Subject: [PATCH] Fix #server so that it returns the right server instead of all servers --- lib/fog/aws/models/compute/volume.rb | 2 +- tests/aws/models/compute/volume_tests.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/aws/models/compute/volume.rb b/lib/fog/aws/models/compute/volume.rb index c642f1d0f..944a5d02a 100644 --- a/lib/fog/aws/models/compute/volume.rb +++ b/lib/fog/aws/models/compute/volume.rb @@ -71,7 +71,7 @@ module Fog def server requires :server_id - service.servers('instance-id' => server_id) + service.servers.get(server_id) end def server=(new_server) diff --git a/tests/aws/models/compute/volume_tests.rb b/tests/aws/models/compute/volume_tests.rb index 243e4bb38..fd902c7fb 100644 --- a/tests/aws/models/compute/volume_tests.rb +++ b/tests/aws/models/compute/volume_tests.rb @@ -14,7 +14,7 @@ Shindo.tests("Fog::Compute[:aws] | volume", ['aws']) do @instance.wait_for { state == 'in-use' } tests('#server').succeeds do - @instance.server + @instance.server.id == @server.id end tests('#server = nil').succeeds do