You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2012/07/20 17:45:16 UTC
[PATCH core 5/6] Mock: Fixed opts parameter to be Hash on some methods
From: Michal Fojtik <mf...@redhat.com>
Signed-off-by: Michal fojtik <mf...@redhat.com>
---
server/lib/deltacloud/drivers/mock/mock_driver.rb | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/server/lib/deltacloud/drivers/mock/mock_driver.rb b/server/lib/deltacloud/drivers/mock/mock_driver.rb
index 5dbd730..4249a95 100644
--- a/server/lib/deltacloud/drivers/mock/mock_driver.rb
+++ b/server/lib/deltacloud/drivers/mock/mock_driver.rb
@@ -258,9 +258,8 @@ module Deltacloud::Drivers::Mock
volumes
end
- def create_storage_volume(credentials, opts=nil)
+ def create_storage_volume(credentials, opts={})
check_credentials(credentials)
- opts ||= {}
opts[:capacity] ||= "1"
id = "Volume#{Time.now.to_i}"
volume = {
@@ -274,13 +273,13 @@ module Deltacloud::Drivers::Mock
StorageVolume.new(volume)
end
- def destroy_storage_volume(credentials, opts=nil)
+ def destroy_storage_volume(credentials, opts={})
check_credentials(credentials)
@client.destroy(:storage_volumes, opts[:id])
end
#opts: {:id=,:instance_id,:device}
- def attach_storage_volume(credentials, opts)
+ def attach_storage_volume(credentials, opts={})
check_credentials(credentials)
attach_volume_instance(opts[:id], opts[:device], opts[:instance_id])
end
@@ -320,9 +319,10 @@ module Deltacloud::Drivers::Mock
:fingerprint => Key::generate_mock_fingerprint,
:pem_rsa_key => Key::generate_mock_pem
}
-
- raise "KeyExist" if @client.load(:keys, key_hash[:id])
- @client.store(:keys, key_hash)
+ safely do
+ raise "KeyExist" if @client.load(:keys, key_hash[:id])
+ @client.store(:keys, key_hash)
+ end
return Key.new(key_hash)
end
--
1.7.10.2